DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7800 commits 97 branches 266 tags 291 MiB
Commit graph

7800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ivan Nieto Vivanco 91c7a89f93 Change to use the date() function instead of Helper::getFormattedDateObject() 2022-05-17 16:24:52 -05:00
snipe 11f540daaf Added debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 09:41:35 -07:00
snipe 700b4ef058
Merge pull request #11127 from trav-c/bugfix/issue-11126-custom-css-encoding 
Fixed #11126: don't entitise custom CSS on the labels view
 2022-05-17 07:22:21 -07:00
Travers Carter 1fc0adf7b7 Fixed #11126: don't entitise custom CSS on the labels view 2022-05-18 00:16:18 +10:00
snipe 58875d5606 Added gitgnore to eula-pdfs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 04:28:18 -07:00
snipe 0dfc98a493 Force db:wipe 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 04:27:48 -07:00
snipe 15a1db480a
Merge pull request #11115 from snipe/fixes/update_constraints_to_php82 
Update constraints to allow up to 8.2
 2022-05-16 17:42:50 -07:00
snipe 3dc4f56fb4 Update constraints to allow up to 8.2 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 17:23:41 -07:00
snipe 7da8ec8448 Merge remote-tracking branch 'origin/develop' 2022-05-16 17:02:54 -07:00
snipe a973c0626e
Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups 
We inadvertently used the wrong label for one of the headers
 2022-05-16 17:02:31 -07:00
Brady Wetherington 213d990e47 We inadvertently used the wrong label for one of the headers on the backups page 2022-05-16 17:00:22 -07:00
snipe a5fbfdbab4 Merge remote-tracking branch 'origin/develop' 2022-05-16 16:51:46 -07:00
snipe b705878318
Merge pull request #11113 from snipe/fixes/11112_correct_formatter_for_locations 
Fixed #11112 - use correct formatter for locations on dashboard
 2022-05-16 16:51:22 -07:00
snipe 925529923a Fixed #11112 - use correct formatter for locations on dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 16:50:47 -07:00
snipe 13ce7513f0 Merge remote-tracking branch 'origin/develop' 2022-05-16 15:59:54 -07:00
snipe 7a1b17ff6a Backslash log:: (we shouldn’t have to do this tho?) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:59:41 -07:00
snipe b32fba7f8a Switch to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:33:26 -07:00
snipe 7573a03cc5 Bumped minor version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:32:57 -07:00