DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6854 commits 89 branches 265 tags 290 MiB
Commit graph

1996 commits

Author SHA1 Message Date
snipe 4fccf4ddc4 Few more log lines 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:27:42 -07:00
snipe 646166b2b6 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:16:07 -07:00
snipe f4e737eaf3 More SAML debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:14:22 -07:00
snipe f572eaa421 Added debugging for SAML login 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:07:07 -07:00
snipe b20921cb62 Removed duplicate session regenerate 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 21:35:05 -07:00
snipe a859eac4a0
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null 
Fixes QueryException Integrity constraint violation:  Column 'order' cannot be null
 2022-05-05 13:27:45 -07:00
Ivan Nieto Vivanco 01232d9a54 Adds an integer casting to the order input field so it cannot be null 2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco 1cbbf8f976 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:11:05 -05:00
snipe 2e9cf8fa87 Added access gate to the requested assets index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 15:45:37 +01:00
snipe f623d05d0c Escape checkout target name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-24 15:27:11 +01:00
snipe b2087a9947 Adds validator to make sure the status ID is deployable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:55 +01:00
snipe 6b1329133b Adds status ID to asset checkout API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:35 +01:00
snipe 698c7f4904 Fixes potential XSS vuln in user requestable results 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 12:22:20 +01:00
snipe 1441cf9f4f Ports #10494 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-12 21:04:57 +01:00
snipe 7b891f0952
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations 
Fixes Bulk user edit not updating checked out asset locations
 2022-04-07 19:41:01 +01:00
Godfrey M 3eb7a87a66 fixes action_date for check-in not including H:i:s 2022-04-07 11:24:12 -07:00
Ivan Nieto Vivanco 6529a75683 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:12:02 -05:00
snipe bdabbbd4e9 Logout user when their activated status is switched to off 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 13:44:53 +01:00
snipe 639409fb3f Backporting #10829 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-25 13:00:16 +00:00
snipe e9d297e97d Added cache comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 19:37:06 -08:00
snipe 9269d5945e Added QR and alt barcode urls to asset transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 19:32:18 -08:00
snipe 3e2fe10480 Fixed getAssetBySerial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-05 09:03:29 -08:00
snipe f840652395 Suppress errors for missing signatures 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 03:18:28 -08:00
snipe 29a2e80984
Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display 
Retry fix bad metadata display
 2022-03-03 20:49:30 -08:00
snipe 6fca8350f9 Added notes field to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:35 -08:00
snipe 9acb5413f6 Added notes field to controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:25 -08:00
snipe 08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api 
Features/adds ldap import and assets count to user api
 2022-03-03 19:15:14 -08:00
snipe 6abe8f296b We don’t need the users table here 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:12:03 -08:00
snipe a53a67be4a Added consumables, licenses, accessories count filters too 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:08:08 -08:00
snipe b72cac3511 Adds ldap_import and assets_count filter to user API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:03:35 -08:00
snipe c940d36fff Updated maintenance gate in API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 18:49:54 -08:00
snipe cd12028845 Use “update” instead of edit in gate 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 18:47:20 -08:00
Brady Wetherington 3225605ef3 Handling the old weirdly-formatted data wasn't quite working. 2022-03-03 18:17:29 -08:00
Brady Wetherington 31dde20a2b Actually, re-introduce this code comment as it's still relevant and tricky 2022-03-03 15:48:04 -08:00
Brady Wetherington aa36ebc947 Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display 2022-03-03 15:46:19 -08:00
Brady Wetherington 92434fa943 Revert "Revert "refactor and clean up attribute-changing logic for assets"" 
This reverts commit bdc737ce0c.
 2022-03-03 15:45:54 -08:00
Brady Wetherington 0164354463 Fix for the weird error that blew up the demo when my PR got merged 2022-03-02 15:15:16 -08:00
snipe bdc737ce0c Revert "refactor and clean up attribute-changing logic for assets" 
This reverts commit 290baf1c8d.

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-02 14:45:14 -08:00
snipe 733b3a7550
Merge pull request #10682 from uberbrady/fix_bad_metadata_display 
Fixed weird JSON-handling on log_meta updates
 2022-03-02 14:36:38 -08:00
snipe 3339a691e1
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint 
Added consumables endpoint to user API
 2022-03-02 14:33:45 -08:00
snipe 50f55b4308 Fixes broken API throttling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:10 -08:00
snipe a8028e7dd0
Merge pull request #10727 from uberbrady/master 
Fix for negative CORS/SAML interaction
 2022-02-23 11:17:17 -08:00
Brady Wetherington 15abc84ab0 Migrate to Fruitcake/laravel-cors which has path-exclusion built-in 2022-02-23 11:06:19 -08:00
snipe 42fcd29200 Fixed #10436 on master, applies #10449 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 21:06:54 -08:00
snipe dc2e6c2b06 Adds consumables endpoint to user API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 20:44:34 -08:00
Brady Wetherington 64f83f9a5f Move HandleCors middleware to be universal 2022-02-22 17:43:40 -08:00
snipe d1b45a83b8 Blergh, one more linebreak 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:51:06 -08:00
snipe 01a8701a8c Removed extra linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:50:38 -08:00
snipe 67fe53e32a Removed debugging, added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:50:07 -08:00
snipe 7f6b8cc43d Removed carbon, since we went with PHP's datetime instead 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:48:12 -08:00