DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
8075 commits 101 branches 268 tags 320 MiB
Commit graph

8075 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 937472feb0 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2022-05-18 13:37:31 -07:00
snipe f14a4d3bc7 Recompiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 13:35:38 -07:00
snipe 9e9d371e1c
Merge pull request #11157 from uberbrady/fix_select2_autofocus 
Downgrade jQuery to 3.5.1 from 3.6.0 to re-enable select2 autofocus
 2022-05-18 13:34:22 -07:00
Brady Wetherington 9e2bcfe168 Downgrade jQuery to 3.5.1 from 3.6.0 to re-enable select2 autofocus 2022-05-18 13:24:02 -07:00
Godfrey M eaeb74c576 readded comment 2022-05-18 13:13:38 -07:00
Godfrey M 23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00
Godfrey M cfc4c58da3 fixes the Settings Tree menu to remain active when opened 2022-05-18 13:06:06 -07:00
snipe 5f187f71c8 Merge remote-tracking branch 'origin/develop' 2022-05-18 13:05:47 -07:00
snipe b2250ecb7a
Merge pull request #11156 from inietov/fixes/error_500_on_unaccepeted_assets_report 
Fixes error 500 on Unaccepted Assets Report
 2022-05-18 13:04:54 -07:00
Ivan Nieto Vivanco 1453b36484 Add filter to only get Assets for the unaccepted assets report 2022-05-18 14:46:48 -05:00
snipe 4b21d9e7f4 Rebuild production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 11:13:18 -07:00
snipe 4644f1479b
Merge pull request #11154 from inietov/fixes/username_required_on_import 
Fixes Username required on import process
 2022-05-18 11:12:07 -07:00
snipe 3bf2328db2 Regenerated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 11:11:34 -07:00
snipe 7d637eaa5a
Merge pull request #11153 from Godmartinz/gh11146_license_detail_formatting 
updated less files for license details to adhere to dark skin themes
 2022-05-18 11:09:26 -07:00
Ivan Nieto Vivanco 32111a863b Call User::generateFormattedNameFromFullName() in the UserImporter 2022-05-18 13:02:44 -05:00
Godfrey M 0ed59753da updated less files for license details to adhere to dark skin themes 2022-05-18 10:55:57 -07:00
Godfrey M 75f5f3a0a8 fixes inconsistencies with links styling 2022-05-18 09:37:53 -07:00
Godfrey M 07679aa376 settings treeview won't stay active. still experimenting with potential solutions 2022-05-18 08:40:37 -07:00
snipe b7b21689f2 Merge remote-tracking branch 'origin/develop' 2022-05-18 04:25:23 -07:00
snipe b426fa352e
Merge pull request #11147 from inietov/fixes/argument_passed_to_ItemImportRequest_is_null 
FixesArgument 1 passed to App\Http\Requests\ItemImportRequest::import() must be an instance of App\Models\Import, null given
 2022-05-18 04:24:46 -07:00
Ivan Nieto Vivanco a771984619 Add an early return if for some reason the import record is not found 2022-05-18 06:15:46 -05:00
snipe 71828d5461 One more trim…. sigh.. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:53:42 -07:00
snipe d9817ec696 Added a trim 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:51:53 -07:00
snipe 33ded3f18a More debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:48:09 -07:00
snipe 004d567253 Added some debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:31:00 -07:00
snipe e2fd5199c3 Merge remote-tracking branch 'origin/develop' 2022-05-18 02:43:14 -07:00
snipe b7b3b1a776
Merge pull request #11144 from snipe/fixes/add_spinner_to_backup_upload_icon 
Added spinner onClick for file upload button on backups
 2022-05-18 02:42:40 -07:00
snipe 4078e4e323 Added spinner onClick for file upload button on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 02:40:32 -07:00
snipe 64d457425e Merge remote-tracking branch 'origin/develop' 2022-05-18 01:06:53 -07:00
snipe 524ef8261b
Merge pull request #11142 from snipe/fixes/11141_fixed_accessories_api_endpoint 
Fixed #11141 - accessories endpoint missing from API
 2022-05-18 01:06:29 -07:00
snipe 344dcc10c1 Fixed #11141 - accessories endpoint missing from API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 01:04:50 -07:00
snipe 2ad97ca040 Merge remote-tracking branch 'origin/develop' 2022-05-18 00:59:33 -07:00
snipe 7880e15672
Merge pull request #11140 from snipe/fixes/11120_textarea_on_fieldset 
Fixed #11120 - custom fields not showing when textarea is present as field type
 2022-05-18 00:59:13 -07:00
snipe ceffbb950f Fixed #11120 - custom fields not showing when textarea is present as field type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 00:47:22 -07:00
snipe b941ea6950 Merge remote-tracking branch 'origin/develop' 2022-05-17 20:07:41 -07:00
snipe 54c1659210
Merge pull request #11139 from uberbrady/reduce_saml_debugging 
Reduce saml debugging
 2022-05-17 20:07:09 -07:00
Brady Wetherington b4a0d33ba8 Reduce logging further; we know the main error condition now 2022-05-17 19:57:42 -07:00
Brady Wetherington 4e65a8d755 Reduce SAML debugging output to actual error conditions 2022-05-17 19:54:14 -07:00
snipe bf028adcc3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:33:50 -07:00
snipe 137b558bef
Merge pull request #11138 from snipe/fixes/updated_packages 
Bumped packages
 2022-05-17 19:32:18 -07:00
snipe be5be7a8b9 Bumped packages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:30:57 -07:00
snipe 2b3a1ee120
Merge pull request #11137 from snipe/fixes/removed_weird_file_in_upgrader 
Delete vendor/symfony/translation/TranslatorInterface.php in upgrader
 2022-05-17 19:13:20 -07:00
snipe d316a3f044 Added trailing comma per convention 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:13:07 -07:00
snipe 105750bfde Delete vendor/symfony/translation/TranslatorInterface.php in upgrader 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:11:03 -07:00
snipe 3e34027ae0
Merge pull request #11136 from snipe/fixes/new_maintenance_page 
Fixed #11124 - updated maintenance page
 2022-05-17 19:03:54 -07:00
snipe 0f9559c1ff Fixed #11124 - updated maintenance page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:01:37 -07:00
snipe 11db243514
Merge pull request #11135 from uberbrady/improve_restore_erroring 
Do some better erroring if you can't launch the mysql binary
 2022-05-17 18:16:40 -07:00
Brady Wetherington d391980b06 Do some better erroring if you can't launch the mysql binary 2022-05-17 17:01:23 -07:00
snipe a8eb138ae0
Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect 
Fixes #11096 Backup created_at time is incorrect
 2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco 72493d54aa Show the date and time as the user select in their settings 2022-05-17 16:36:05 -05:00