DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14895 commits 96 branches 267 tags 295 MiB
Commit graph

3598 commits

Author SHA1 Message Date
snipe 62655be2d0 Fixed BYOD label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 18:41:37 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
snipe 9b422e5c97 Baremetrics BMPay breaks with CSP turned [sc-25011] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 21:42:20 +01:00
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Godfrey M f05d8281f3 fixes alignment for error msg 2024-07-24 12:06:56 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe 466ab1e3c0 Removed the banner since we already warn 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:40:24 +01:00
snipe 95a0f3dbe5 Cleaned up UI on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:26:55 +01:00
snipe 6f8ccd4e10 Fixes #15103 - Added EOL and audit into to user profile assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:54:33 +01:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
snipe 20868b9ede Load the english file again in case BS table doesn’t have a translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:30:42 +01:00
snipe e08acb851c Removed env part, just check for the remote user login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:18:33 +01:00
snipe bbad84c6cc Hides the “Disable Other Login Mechanisms” option via env 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:13:59 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe c08bd8f88b Nicer consumables layout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:11:45 +01:00
snipe ffd2687734 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:46 +01:00
snipe be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +01:00
snipe fc86eefeac Show existing images on user edit page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:27:28 +01:00
snipe 8b05ef6db4 Updated url checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:48:03 +01:00
snipe c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe 4465aef991
Merge pull request #15114 from snipe/checkout_multiple_accessories 
Checkout multiple of an accessory in one checkout
 2024-07-18 17:38:19 +01:00
snipe ee589ca112
Merge pull request #15088 from mauro-miatello/develop 
Added EULAs in print user's assets
 2024-07-18 09:09:34 +01:00
snipe 05e278d08b Added qty to email 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:21 +01:00
snipe c21821a864 Added new form fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:12 +01:00
snipe 239824681d
Merge pull request #15075 from akemidx/checkintranslation 
FIXED: Missing Translation on a Tooltip
 2024-07-17 18:16:02 +01:00
snipe 65dcb2a9bd
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page 
Small layout tweaks to oauth page
 2024-07-16 21:36:17 +01:00
snipe d53a032402 More consistent UI for indented checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:07:03 +01:00
snipe bb00edda4e Added basic jquery validation translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 20:54:48 +01:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
snipe 4895023f3b Translate import button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:56:02 +01:00
snipe 0ed637f0ce Translate importer header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:41:47 +01:00
snipe e6f2c457a8 Handle localization better, clearer indenting on addresses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:01:50 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:40:10 +01:00
snipe eb9e276ba7 Fixed #15094 - wrong translation string for model on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 17:14:13 +01:00
MrM e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
snipe 2d1aeca949 Re-use existing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:24:56 +01:00
snipe e06e4db4b7 Small layout tweaks to oauth page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:16:03 +01:00
akemidx ad818cf886 missing translation 2024-07-11 17:13:47 -04:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
snipe 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets 
Fixed inconsistent attributes order in Print All Assigned report
 2024-07-11 17:30:41 +01:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe 23f1489b2b Added history tab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:46:49 +01:00
snipe 58bc84436c Fixed incorrect jquery validation class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:41 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:04 +01:00
snipe d9a114090b Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:33 +01:00
snipe e123eeea9e Added error message if category type is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:20 +01:00
Florent Bervas d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
snipe 8be44f9cf2 Check for time until depreciated 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 10:07:58 +01:00
snipe 71a5d07698 Fixes #15056 - only try to load avatars if one exists or default is set 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 08:56:14 +01:00
Godfrey M 624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
snipe f4ffbcf76e Fixed wonky layout on accessory files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:38:50 +01:00
snipe 5597992d63 Fixed API key missing translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:17:46 +01:00
snipe 09cc9b92d1 Fixed #15050 - erroneous deleted remark 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:13:07 +01:00
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe 4c19b4d831 Added aria-hidden="true" to error icon for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:39:38 +01:00
snipe 86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:12:37 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 3f20e29901 Moved gthe settings for remote loading to the branding section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:55:47 +01:00
snipe 44bcc157e5 Updated icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:46 +01:00
snipe e372527d13 Added default_avatar to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:36 +01:00
snipe 96be1e1275 Removed duplicate locale directive 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 02:14:10 +01:00
snipe 708d7b5fc5 Use icons for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:43:44 +01:00
snipe 62b5a159a9 Added files column 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:31:09 +01:00
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 0071596274 Added upload count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:43 +01:00
spencerrlongg a6690493b0 resolved 2024-07-03 16:12:55 -05:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
snipe f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades 
Use more modern reference for input text
 2024-07-02 08:43:34 +01:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
Marcus Moore d481850d4c
Add @can around Edit Your Profile button on view assets page 2024-07-01 10:11:27 -07:00
snipe d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
snipe 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
snipe f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms 
WIP - First start at switching to regular html labels
 2024-06-27 13:12:29 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe 4d55765e28 Added checkbox to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:53 +01:00
snipe aa5fe52e89 Added gate in blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:56 +01:00
snipe f47bc5ea7d Updated hardware checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 19:40:52 +01:00
snipe 427615f627 Fiest start at switching to regular html labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 18:24:23 +01:00
snipe 114769c2d9 Made requestable items more generic in translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:26:45 +01:00
snipe 6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit 
Added some  style changes in label field selector for the `DefaultLabel` template
 2024-06-20 13:51:49 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
Marcus Moore a3dea99bbb
Fix category edit form component 2024-06-17 14:24:16 -07:00
Marcus Moore fc351a1896
Remove .live from oauth clients 2024-06-17 13:03:27 -07:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07:00
snipe 27063d5bae Fix weird layout in admin oauth [sc-25673] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 15:44:07 +01:00
snipe 891a0a0965 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-06-17 13:05:31 +01:00
snipe 50f0797850 Added aria hidden to icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:05:27 +01:00
snipe d9cc3c3ec7 Removed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:52:23 +01:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window 
Fixed label preview window position
 2024-06-07 18:09:56 +01:00
Godfrey M 77e6058e4c remembers chosen label 2024-06-06 13:55:15 -07:00
Godfrey M 4a60026162 moves preview down by field definitions 2024-06-06 13:42:06 -07:00