DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13323 commits 96 branches 267 tags 296 MiB
Commit graph

13323 commits

This branch
This branch
All branches
Author SHA1 Message Date
slong753 75d7e3e1a0 fix conflicts 2023-09-11 17:20:21 -05:00
slong753 5948679a4a fix purchase date update 2023-09-11 17:17:59 -05:00
slong753 774f21bb7f some more cleanup 2023-09-11 17:17:59 -05:00
slong753 20367eecc9 fix conflicts 2023-09-11 17:17:59 -05:00
slong753 cda9dd57dd asset update logic 2023-09-11 17:15:25 -05:00
slong753 41b65bd9a2 small changes 2023-09-11 17:15:25 -05:00
slong753 17a83129b9 this all needs to be tested tediously 2023-09-11 17:15:25 -05:00
slong753 0e60184e95 i think this migration makes sense 2023-09-11 17:15:25 -05:00
slong753 1ea0de8bca prevent injection, fix asset update 2023-09-11 17:15:25 -05:00
slong753 17ccfa9ada resolve some conflicts 2023-09-11 17:15:24 -05:00
slong753 c1daabef08 progress 2023-09-11 17:10:41 -05:00
slong753 dc39d2c567 notes 2023-09-11 17:10:41 -05:00
slong753 321e7c93ec carbon thing 2023-09-11 16:51:40 -05:00
slong753 8456b3ec0c wip stuff 2023-09-11 16:51:40 -05:00
Godfrey M e73b16846e adds an option to bulk edit actual location for bulk edit and fixes update issue 2023-09-11 11:21:56 -07: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 c2fe9d490b Upgraded actions/checkout to v4 (via #13580) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-11 13:25:44 +01: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 9c608dd6ff Merge remote-tracking branch 'origin/develop' 2023-09-07 21:36:39 +01: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 5b88089ffc Merge remote-tracking branch 'origin/develop' 2023-09-07 20:50:35 +01: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 cf36c31eac Merge remote-tracking branch 'origin/develop' 2023-09-07 20:22:33 +01: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 2a94fd17ee Merge remote-tracking branch 'origin/develop' 2023-09-06 09:37:35 +01: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 32407b531b Merge remote-tracking branch 'origin/develop' 2023-09-05 16:10:30 +01:00