DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 00:37:39 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10773 commits 89 branches 265 tags 290 MiB
Commit graph

10773 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe bfcbd9628a Refactored license controller with new counts 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:58 -07:00
snipe 220e20d208 Changed tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:36 -07:00
snipe d3b087b5da Clearer padding between buttons, added tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:19 -07:00
snipe 25a83c2915 Removed moved translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:01 -07:00
snipe 3f4159f058 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:52 -07:00
snipe de78f8d41f Renamed/refactorered licenses method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:44 -07:00
snipe 6ab4314221 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:13 -07:00
snipe 087f0e596a Fixed has to where 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 22:44:05 -07:00
snipe 0dd967cf2b Merge remote-tracking branch 'origin/develop' 2023-04-17 21:05:09 -07:00
snipe 912f6c45ee Reverted #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 21:04:47 -07:00
snipe 9a73f5eca3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	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
 2023-04-17 20:27:49 -07:00
snipe 9698c3b07b Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 20:14:50 -07:00
snipe 3153013715 Fixed semicolon parse error from #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 20:14:45 -07:00
snipe c12ac9912c
Merge pull request #12832 from Godmartinz/fix_footer_space 
Fixed footer space when customized
 2023-04-17 20:11:15 -07:00
snipe 2b10357c4e Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 19:06:27 -07:00
Marcus Moore f6cff90829
Migrate to new test settings interface 2023-04-17 17:31:12 -07:00
Marcus Moore 2d56675ade
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	database/factories/SettingFactory.php
 2023-04-17 17:22:55 -07:00
snipe c70cb36c80
Merge pull request #12828 from Godmartinz/bug/sc-20783 
Fixed dark themes pagination and notification drop menu
 2023-04-17 16:26:36 -07:00
Godfrey M 247f47ce69 adjusts button color 2023-04-17 15:29:53 -07:00
snipe 99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui 2023-04-17 14:54:30 -07:00
Godfrey M aabd5e92a8 surrounding text aligns correctly 2023-04-17 12:44:06 -07:00
Godfrey M 247c881d87 add back casts 2023-04-17 12:10:54 -07:00
Godfrey M 1001b52c4f removes unncessary files 2023-04-17 12:01:09 -07:00
Godfrey M 0cca45d858 footer now uses flex 2023-04-17 11:57:35 -07:00
snipe b22cad9ced
Merge pull request #12855 from koelle25/fixes/last_component_checkout 
Allow checkout of available components down to zero stock (fixes #12854)
 2023-04-17 09:49:14 -07:00
snipe 071a620144 Merge remote-tracking branch 'origin/develop' 2023-04-17 09:36:07 -07:00
snipe 920711dd16
Merge pull request #12857 from snipe/fixes/wtf_datetime_stuff 
Remove start/end dates form casts array
 2023-04-17 09:35:03 -07:00
snipe e0c53d8d09 Remove start/end dates form casts array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 09:33:31 -07:00
Kevin Köllmann 04f3c4bf69
Fixed #12854: Allow checkout of available components down to zero stock 2023-04-17 11:45:11 +02:00
snipe a83991041a Better placement for errors 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 16:08:06 -07:00
snipe 0afaaa4a6b Added autoassign_licenses option to create admin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:28:08 -07:00
snipe 16ab2bec06 Added sorting and searching on autoassign_licenses via user API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:27:39 -07:00
snipe 4b66ca6ac5 Added method to bulk checkin (much simpler than checking out) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:27:15 -07:00
snipe 844ad83431 Added method to bulk checkout license seats 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:26:59 -07:00
snipe 9833d861d4 Added autoassign_licenses tp bulk users conditional 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:26:33 -07:00
snipe 03cc55cb6a Set autoassign_licenses to false if unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:52 -07:00
snipe 6a94a2f515 Return true/false for autoassign_licenses in the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:26 -07:00
snipe f40bef8f9b Added autoassign_licenses to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:08 -07:00
snipe 6acce098c9 Added autoassign_licenses on user model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:56 -07:00
snipe 73cf62e060 Added autoassign_licenses to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:00 -07:00
snipe dd78d2fc66 Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:51 -07:00
snipe add9e561f9 Added buttons on license page, greyed out where appriate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:42 -07:00
snipe ff9af7ea74 Added genetic modal partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:15 -07:00
snipe bc7c0aa80d Fixed clone tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:00 -07:00
snipe 73188df090 Added autoassign_licenses to bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:22:37 -07:00
snipe cf7f244942 Added (clarified?) edit autoassign_licenses in user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:19:37 -07:00
snipe 06d46a4523 Indenting change for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:17:55 -07:00
snipe 8e5042418a Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:32 -07:00
snipe 79ff6a8fc2 Disallow deleting in the API view if there are things checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:23 -07:00
snipe 8183b8deba Added stub method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:02 -07:00