DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11054 commits 96 branches 267 tags 296 MiB
Commit graph

11054 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d871a14687 Added fa-fw for nicer display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:40 -07:00
snipe 00a9591c4c Added autoassign_licenses in view, added fa-fw 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:29 -07:00
snipe 4d9d75379f Improved translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:39:16 -07:00
snipe 41358eba85 Updated label 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:29:28 -07:00
snipe 59f4fe67d6 Removed duplicate tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:28:35 -07:00
Brady Wetherington 71fa6d765f Update to Latest Livewire files 2023-04-18 11:05:35 -07:00
Brady Wetherington 9793130f6c Merge branch 'develop' into laravel_v9 2023-04-18 11:01:00 -07:00
snipe 2c5c4ab974 Nicer layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:40:06 -07:00
snipe 95767c46ac Fixed delete modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:13 -07:00
snipe 0eadc00f4d Removed unneeded css class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:04 -07:00
snipe df7b19bc1e Removed unused validations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:35:06 -07:00
snipe 7aab4290c7 Updated tooltips with data-tooltip=true from old method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:50 -07:00
snipe 3a808aa806 Updated method for available seat count 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:33 -07:00
snipe 4d09021e9c Compact tooltip for un-deletable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:19 -07:00
snipe beba31afbf Added tooltip for disabled delete buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:09 -07:00
snipe 41490f1e3a Use “name” instead of “license” for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:43:59 -07:00
snipe 9da36833be Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:43:44 -07:00
snipe dc6eb6f104 Throw a warning if there were no users affected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:07:17 -07:00
snipe a8a3ca3624 Use count on availSeats 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:06:42 -07:00
snipe e84ba0c7a0 Revert back to old method name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:06:32 -07:00
snipe 3e53870b37 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:13 -07:00
snipe 8a41f37054 Persists buttons through tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:06 -07:00
snipe 9f7058a128 Revert "Renamed/refactorered licenses method" 
This reverts commit de78f8d41f.

Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:36:34 -07:00
snipe ec0413254e Removed action menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:09:40 -07:00
snipe f21d9c27e6 Use new translations for logs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:26 -07:00
snipe 725adebffe Translate log message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:12 -07:00
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