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
11410 commits 101 branches 268 tags 320 MiB
Commit graph

11410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 74c7f106ce Reset assigned_x values when changing check out to type 2023-09-13 13:43:35 -07:00
Marcus Moore 11208ee064 Guard against attempting to send notification to model that isn't notifiable 2023-09-13 12:56:27 -07:00
snipe f6a11ac0ed
Merge pull request #13586 from inietov/fixes/call_to_member_function_checkedOutToUser 
Fixed Call to a member function checkedOutToUser() on null [rollbar-3598]
 2023-09-12 08:35:30 +01:00
Ivan Nieto Vivanco 9cbd2d032c Add a boolean variable and condition to handle the call to checkedOutToUser() method 2023-09-11 17:40:59 -06:00
snipe a49d3fe131
Merge pull request #13526 from Godmartinz/asset-model-notifs 
Added threshold notifications and min qty for Asset models
 2023-09-11 17:55:34 +01:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
Godfrey M 0eb50ceb3d removes commented code 2023-09-11 09:36:38 -07:00
snipe dc74fb133f
Merge pull request #13577 from marcusmoore/fixes/improve-testcase 
Fixed failing test
 2023-09-08 07:08:21 +01:00
Marcus Moore 093bf57448 Update assertion and add failure messages 2023-09-07 16:42:49 -07:00
snipe 06836663c8
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging 
Added validation around department_id in API patch request
 2023-09-07 21:36:20 +01:00
Marcus Moore c6c1c64c1e Remove todo 2023-09-07 13:30:05 -07:00
Marcus Moore 4caa501996 Relax property type check 2023-09-07 13:28:32 -07:00
Marcus Moore a7a70f6981 Test permissions update 2023-09-07 13:21:27 -07:00
Marcus Moore 39ff575ac1 Remove unused test cases 2023-09-07 13:16:08 -07:00
snipe 02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link 
Fixed #13562 - Added inline file link
 2023-09-07 20:50:13 +01:00
snipe 7f892bf5ef
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect 
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
 2023-09-07 20:49:40 +01:00
Marcus Moore 56e6205667 Formatting 2023-09-07 12:45:03 -07:00
Ivan Nieto Vivanco abd2ed3b81 Filter unaccepted assets that are not assigned to users 2023-09-07 13:39:16 -06:00
Marcus Moore 899c2eb19b Implement test case 2023-09-07 12:34:50 -07:00
snipe 894c34ff4f Update to only use relative paths 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-07 20:22:14 +01:00
snipe b7c2b9374c
Merge pull request #13573 from snipe/upgrade_scim_server 
Upgrade to new branch for our fork of laravel-scim-server
 2023-09-07 20:07:59 +01:00
Brady Wetherington 3184f795c2 Upgrade to new branch for our fork of laravel-scim-server 2023-09-07 18:29:23 +01:00
snipe 67cad9c751
Merge pull request #13571 from inietov/fixes/require_acceptance_on_null 
Fixed Attempt to read property require_acceptance on null [rollbar-3557]
 2023-09-07 18:11:42 +01:00
snipe ec5238ff06
Merge pull request #13548 from marcusmoore/update-testing-documentation 
Updated testing documentation
 2023-09-07 11:25:53 +01:00
Marcus Moore 1c3c36f2a0 Begin to implement patch test 2023-09-06 16:14:14 -07:00
Ivan Nieto Vivanco 1509c512a5 Add guard clauses around some License and LicenseSeat models functions 2023-09-06 11:54:11 -06:00
snipe e920199626
Merge pull request #13567 from johnson-yi/fixes/add_default_location_to_checkin_actionlog 
Add default location to tracked changes on checkin actionlog
 2023-09-06 09:37:04 +01:00
johnson-yi 5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog 2023-09-06 00:36:48 +00:00
snipe a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag 
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541)
 2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco 91b1cc7121 Move the early return to the controller instead of the Label model 2023-09-05 13:23:51 -06:00
snipe d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog 
Added/Fixed: track changes on asset checkin/out
 2023-09-05 19:08:49 +01:00
snipe 65a76c599c Added inline=true to image preview modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:35:07 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:28:01 +01:00
snipe e486fe2794 Removed soft-delete query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:10:20 +01:00
snipe 26452a8a29
Merge pull request #13565 from snipe/fixes/asset_history_500_on_hard_deleted_models 
Account for hard-deleted models, suppliers
 2023-09-05 16:06:40 +01:00
snipe f85df6bb8c Use same method of accessing companies as others 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:02:28 +01:00
snipe 2acf2b880e Account for hard-deleted models, suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 15:58:21 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
Johnson Yi 09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
Marcus Moore da7d6f6f77
Merge branch 'develop' into update-testing-documentation 2023-08-31 10:36:06 -07:00
snipe f08cef8664
Merge pull request #13556 from snipe/feature/sc-23684 
Added model name and number to dynamic url
 2023-08-31 18:23:33 +01:00
snipe e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk 
Removed Dusk
 2023-08-31 18:06:04 +01:00
snipe 83b178f5b2 Added model name and number to dynamic url 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-31 18:03:32 +01:00
snipe c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes 
Added eager loading for `changedinfo` and removed encrypted values from Asset history
 2023-08-31 13:04:39 +01:00
snipe 9a0f691f05
Merge pull request #13546 from snipe/fixes/make_boolean_user_fields_more_consistant 
Don’t cast as boolean, do validate as boolean for User validation
 2023-08-31 12:01:20 +01:00
Marcus Moore a799659610 Scaffold tests and add context 2023-08-30 17:33:23 -07:00
Marcus Moore 999605f832 Add failing test 2023-08-30 17:10:50 -07:00
Marcus Moore 5828d29952 Remove Dusk 2023-08-30 16:43:18 -07:00
Marcus Moore 417b2c8331 Update testing documentation 2023-08-30 11:27:26 -07:00