DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 19:14:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15662 commits 96 branches 267 tags 296 MiB
Commit graph

15662 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c661d732b3 Refactored sidenav links for audit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:44 +01:00
snipe fbe9daace6 Use pattern in API route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:29 +01:00
snipe 651001bf6e Removed duplicate routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:15 +01:00
snipe 9167f8a3ba Cleaned up tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:57:07 +01:00
snipe 6dc9ccffcd Refactor api for handling audit/expected checkins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:56:57 +01:00
snipe 4b4e3badb7 Removed hardware audit overdue blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:53:36 +01:00
snipe fe4dd23d39 Removed “all” text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:49:12 +01:00
snipe de6d71cc3b Use plural api endpoints in blades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:47:19 +01:00
snipe 9e44052709 Switch to plural route name for API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:46:58 +01:00
snipe 2d112f227a Call the asset factory directly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:44:37 +01:00
snipe bd8737d986 Changed sidenav badge class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:44:21 +01:00
snipe 4b6d236eb7 Added class for sidebar menu badges 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:44:06 +01:00
snipe bf058bd5c6 Use updated scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:56 +01:00
snipe dfaf01e8aa Updated asset counters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:47 +01:00
snipe 2888dd6fd8 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:37 +01:00
snipe 2e92ee8eee Switch to whereBetween so tests run on sqlite 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:23 +01:00
snipe 14b6a75507 Updated routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:38 +01:00
snipe 2484a9db2c Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:29 +01:00
snipe bfc30794c5 Updated badge styling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:22 +01:00
snipe 27bc7a847b Updated routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:11 +01:00
Marcus Moore 2a71877bec
Add additional condition 2024-04-25 17:04:07 -07:00
Marcus Moore 30bd920497
Add conditional 2024-04-25 16:24:12 -07:00
Marcus Moore 1d5b48b88d
Add comment and improve method 2024-04-25 16:22:15 -07:00
spencerrlongg 97a6152ea9 update comment per @uberbrady 2024-04-25 17:47:55 -05:00
spencerrlongg 03f091a77f ammended note, got real rule in there 2024-04-25 17:17:42 -05:00
Marcus Moore 4295bad12f
Separate test cases 2024-04-25 14:07:56 -07:00
Marcus Moore 3a2eeaea7a
WIP: Future-proof rules being converted to array syntax 2024-04-24 17:40:40 -07:00
Marcus Moore 12418ae91b
WIP: allow EU style purchase cost via api 2024-04-24 17:18:29 -07:00
Marcus Moore 783a24eb68
Add test for ParseCurrencyMethod 2024-04-24 17:17:42 -07:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
spencerrlongg 8696a423b0 another option 2024-04-23 17:38:40 -05:00
spencerrlongg 107f8db9bc another option 2024-04-23 17:35:33 -05:00
spencerrlongg b11c900a4c fix bracket, + overwrite required rulesets 2024-04-23 16:29:07 -05:00
akemidx ac4aa97103 develop reheading 2024-04-23 17:05:50 -04:00
akemidx 0bc93c6a1e space 2024-04-23 15:31:37 -04:00
Spencer Long 53ccd196d7
Merge branch 'develop' into bug/sc-24884 2024-04-23 13:57:59 -05:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +01:00
snipe e2d1e6b0c5
Merge pull request #14608 from akemidx/bug/sc-25232 
Left Sidebar Was Not Respecting Theme
 2024-04-23 12:32:48 +01:00
snipe 56cb9a0f4e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2024-04-23 10:28:50 +01:00
snipe c8c81a360c Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-23 10:26:43 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
snipe c50d5a678a
Merge pull request #14616 from akemidx/bug/sc-25235 
REMOVED: Dark Theme Button Text Coloring
 2024-04-23 09:20:57 +01:00
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey Martinez 9e7bbc968d
Merge pull request #15 from Godmartinz/License-export-button_p2 
adds licenses available, updated teranslations
 2024-04-22 17:59:52 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
akemidx 0d049a0be7 conflict resolution 2024-04-22 20:09:40 -04:00
akemidx 01c24ab4cd translating text 2024-04-22 19:16:14 -04:00
Marcus Moore 155f5f35cd
Remove todo 2024-04-22 15:47:05 -07:00
snipe 7ad6caf30a
Merge pull request #14632 from marcusmoore/bug/sc-25384 
Added "select" option to top of data sources in new label engine
 2024-04-22 20:40:31 +01:00