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

2108 commits

Author SHA1 Message Date
snipe 7363d4e223 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:35 -08:00
snipe c8c5dddcc1 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:19 -08:00
snipe 51f3857a31 Fixed something I think I broke 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 15:32:45 -08:00
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe 2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues 
Fixed Invalid date value on assets acceptance mail notification
 2023-01-31 19:14:51 -08:00
lukasfehling cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Ivan Nieto Vivanco ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
snipe 22b0b9b090 Fixed gates on fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:05:41 -08:00
snipe 583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08:00
snipe dc155846ca Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:49:17 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
snipe 02dcb0fbd7 Shorten the additiona form request invocation to just ImageUploadRequest 
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:37:35 -08:00
Jeremy Price d3bcc48ae5 [imports] fix "Backup before importing?" checkbox on import page 
We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
 2023-01-23 15:08:59 -08:00
snipe cd8cb445ba Corrected fieldname for user fieldname for avatar in Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:53 -08:00
snipe f77d871dff Use the imageHandler for profile avatar changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:20 -08:00
snipe 60eab08735 Added ->with(‘users as users_count’) in Accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:41:07 -08:00
snipe 378dc968b7 Derp. Copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 15:44:28 -08:00
snipe 0c39c7a53d Updated blades to add byod as a “status” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:25:46 -08:00
snipe b80d52a9c3 Added byod to asset controller for create and update methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:51 -08:00
snipe ee4b8f4694 Added byod to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:31 -08:00
snipe dbda288a44 Formatting changes only for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:20 -08:00
snipe eaf9332096 Added filterability to 2FA fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:03 -08:00
snipe 151719a91c Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:24:46 -08:00
snipe 825df2cf75 Load up the item counts with the individual API methods for accurate numbers without n+1 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:17:03 -08:00
snipe 529b005d1e We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:05:51 -08:00
snipe 7846251d25 Re-added return for no results (derp) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:43:57 -08:00
snipe cc665d50ed One more refactor, hopefully simplifying 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:40:12 -08:00
snipe ae76d46f87 Small refactor to ALWAYS return deleted assets in a collection transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:23:05 -08:00
snipe bf849128fc Replicate the response behavior in the bySerial endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:57:47 -08:00
snipe 44be8c8f60 Determine which transformer to use based on number of assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:54:21 -08:00
Ivan Nieto Vivanco 3a9b8a4993 Calculate the proper amount of people in the dashboard if Full Company Support is enabled 2022-12-20 18:39:17 -06:00
snipe 399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
 2022-12-15 14:19:41 -08:00
snipe 29c2ff56ec
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled 
Removed extra logging case that was very noisy
 2022-12-15 11:26:49 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
snipe 775df0ab60
Merge pull request #12221 from snipe/fixes/throttles_reset_password_form 
Add throttle for password reset form
 2022-12-08 14:51:22 -08:00
snipe f7da87520c
Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing 
fixes a regression with the csv assigned to fields
 2022-12-07 16:18:32 -08:00
snipe c3a6874b16 Add throttle for password reset form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco eb67d1b064 Filter items from the report if null returned 2022-12-06 18:00:16 -06:00
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
snipe 1fe0bfe17e Removed extra logging case that was very noisy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:27:42 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 489895a5fa Added comments and spacing for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:48:28 +00:00
snipe 1122562b4e Handle use case where there are no custom fields for any assigned models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:45:50 +00:00
snipe 5df76155ce Check for the format index in the $data array when creating a new custom field via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 15:53:16 +00:00
snipe 6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag 
Added ability to include deleted items in tag search endpoint
 2022-11-15 17:54:34 +00:00
snipe ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification 
Added: API endpoint to trigger a user email notification with their assigned assets
 2022-11-15 17:51:15 +00:00
snipe 7fcf6f2463 Removed deleted parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:47:21 +00:00