DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 08:47:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11725 commits 89 branches 265 tags 290 MiB
Commit graph

11725 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe dcae5503c8 Use $attributes array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 13:52:57 +01:00
snipe d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping 
Added `CompanyableTrait` to `Department` model
 2023-09-14 12:52:53 +01:00
snipe b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
snipe c7b24821b3
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null 
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541)
 2023-09-14 12:50:54 +01:00
snipe a37df8ce9d
Merge pull request #13581 from snipe/updates/upgrade_checkout_actions 
Upgraded actions/checkout to v4 (via #13580)
 2023-09-14 12:40:34 +01:00
snipe 104219ed76
Merge pull request #13597 from marcusmoore/bug/sc-23681 
Reset checkout to value when navigating away from type
 2023-09-14 12:39:04 +01:00
snipe 56c7da7b06
Merge pull request #13595 from Godmartinz/correct-nullable_on_asset_model_min_qty 
Fixed nullability on asset model `min qty` column
 2023-09-14 08:52:33 +01:00
spencerrlongg 7c9a4ac161 immutable 2023-09-13 18:15:13 -05:00
spencerrlongg 64a9859efd cleanup 2023-09-13 17:58:33 -05:00
spencerrlongg ef64843d2f chunk migration, needs to be tested 2023-09-13 17:41:45 -05:00
Ivan Nieto Vivanco 439e031911 Evaluate if the event properties exists before run the CheckoutAcceptance query 2023-09-13 16:35:10 -06:00
spencerrlongg 0368b9df43 viola 2023-09-13 17:16:17 -05:00
Marcus Moore 74c7f106ce Reset assigned_x values when changing check out to type 2023-09-13 13:43:35 -07:00
Godfrey M f283a5f755 changed the down method change 2023-09-13 13:24:26 -07:00
spencerrlongg 951521dc81 push 2023-09-13 15:20:55 -05:00
Godfrey M 0c504fed49 fixed nullability of on Asset Models 2023-09-13 13:13:41 -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
spencerrlongg 70a251de55 fix up gui edit 2023-09-13 13:51:14 -05:00
spencerrlongg e21a8b6717 fix up this file 2023-09-12 18:11:36 -05:00
spencerrlongg 7047869367 cleanup 2023-09-12 18:03:13 -05:00
spencerrlongg 53d4fd1d0b purchase_date 2023-09-12 18:01:33 -05: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
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