DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
11680 commits 95 branches 267 tags 294 MiB
Commit graph

11680 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
spencerrlongg ccf3fe40ec rm additional row 2023-09-11 17:35:13 -05:00
spencerrlongg 3a63bcab73 temporarily show on its own line 2023-09-11 17:35:13 -05:00
spencerrlongg 30dade1fba cleanup 2023-09-11 17:35:12 -05:00
spencerrlongg 97d6a34b8c some changes to sample csv 2023-09-11 17:34:05 -05:00
spencerrlongg 431af5f530 this works!!!! 2023-09-11 17:34:05 -05:00
spencerrlongg 3e3bb594ea some import stuff 2023-09-11 17:34:04 -05:00
spencerrlongg fb001caee4 fix conflicts 2023-09-11 17:33:31 -05:00
spencerrlongg b73f20cadf immutable when things are looping, just in case 2023-09-11 17:22:46 -05:00
spencerrlongg 3fb62874f0 quick push to check something else 2023-09-11 17:22:46 -05:00
spencerrlongg c66804bcee a little cleanup 2023-09-11 17:22:46 -05:00
spencerrlongg e1af69f6ae typo 2023-09-11 17:22:46 -05:00
slong753 27bea2abb9 just some more wip on the importer 2023-09-11 17:21:51 -05:00
slong753 1b18cd7fe6 added asset_eol_date and explicit to factory 2023-09-11 17:21:51 -05:00
slong753 78c400e948 fix conflicts 2023-09-11 17:21:50 -05:00
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
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 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
Brady Wetherington aacfed40f8 Switch back to our fork of laravel-scim-server 2023-09-07 20:16:03 +01:00
Brady Wetherington ec1059e74c Merge branch 'develop' into snipeit_v7_laravel10 2023-09-07 20:11:41 +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