DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15285 commits 102 branches 268 tags 288 MiB
Commit graph

3874 commits

Author SHA1 Message Date
Marcus Moore 636c776620
Remove dead code 2024-09-18 11:27:37 -07:00
Marcus Moore c021609c13
Merge branch 'develop' into testing/fmcs-accessories 2024-09-18 10:42:58 -07:00
snipe fcefcc8184
Merge pull request #15512 from marcusmoore/testing/fmcs 
Added tests for delete methods in api
 2024-09-18 13:44:44 +01:00
Marcus Moore eb35608bb5
Remove call handled by form request 2024-09-16 16:35:33 -07:00
Marcus Moore 60a54cee79
Add tests for delete license endpoint 2024-09-16 12:33:30 -07:00
snipe 4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
Marcus Moore 5299b3e9f0
Remove code handled by CompanyableChildTrait 2024-09-12 13:29:44 -07:00
snipe a97530367d Fixed tests again 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 17:29:22 +01:00
snipe 43250ae881 Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 17:04:09 +01:00
snipe 98323185de Null and warn if editing asset to a non-deployabe state 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 16:43:33 +01:00
Marcus Moore dc6a5bf998
Reflash session so login message is displayed 2024-09-09 14:54:19 -07:00
snipe c5dbc5f6b8 Correctly save user’s city on bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 10:01:07 +01:00
snipe 7d9a0eba04 Added ability to sort on qty and remaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 03:49:58 +01:00
snipe 12fa505972 Disabmiguate licenses company_id
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:07:30 +01:00
snipe abb4221539 Validation rules to prevent switchng user companies if assets are assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 14:55:18 +01:00
Brady Wetherington da1e383295 Use the null-safe property accessor for new-user creation 2024-08-29 14:09:23 +01:00
Brady Wetherington ec2ea955d8 Fix PATCH of purchase_cost for assets for comma as decimal separator 2024-08-29 12:35:14 +01:00
snipe c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584 
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
 2024-08-29 11:38:15 +01:00
snipe b06c527767 Check that the user exists before trying to print 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 11:06:30 +01:00
snipe 94c981e22c Set image to null if model is deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 14:23:49 +01:00
snipe c6ddc501c5 Filter by depreciation_id 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:40:12 +01:00
snipe 4839181beb Added counts to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:40:01 +01:00
snipe 63a05c89a7 Added counts to show method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:39:52 +01:00
snipe 385c4f69f7 Added counts to depreciation transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-28 12:39:43 +01:00
snipe 22bc088f6f Added start_date and end_date to user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-27 07:21:19 +01:00
snipe 78d355f136
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error 
Fixed custom field defaults being prematurely updated
 2024-08-23 07:20:23 +01:00
setpill 1d7853cbfe fixed #15374: load TrustProxies middleware in Kernel.php 2024-08-22 23:41:27 +02:00
Marcus Moore d67975cb62
Implement fix 2024-08-22 10:18:23 -07:00
snipe 56e31d2303 Fixed #15366 - use permission for encrypted custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 14:58:09 +01:00
snipe ec0b9b198f
Merge pull request #15296 from uberbrady/expose_restore_sanitize 
Expose the 'sanitize' system for backup restores to the web GUI
 2024-08-22 12:43:07 +01:00
r-xyz cd7db5c4a8
Fix some typos in models file handler. 2024-08-21 22:24:08 +02:00
r-xyz 4ec361c718
Add AssetModel files endpoints to API 2024-08-21 19:49:51 +02:00
spencerrlongg a8cd1027f3 rm commented code 2024-08-20 11:40:15 -05:00
snipe 74136761df Added TrimStrings middleware 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-20 11:45:13 +01:00
snipe 84f14a05bd Fixed logging for asset model restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:20:19 +01:00
snipe 229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
snipe 4253acad4c Prevent passing an array as login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 04:51:36 +01:00
snipe 318aff1ef0 Fixed behavior for null model numbers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 00:27:44 +01:00
snipe 9b6a36c8aa Removed unusued parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:45:57 +01:00
spencerrlongg 70e5e0f9df get rid of dd 2024-08-16 12:52:06 -05:00
snipe 856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
snipe de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
snipe 4356cb7b9b Added confetti option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 11:32:42 +01:00
Glukose1 d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
snipe d8038ac483 Removed status label list 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:17:08 +01:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
spencerrlongg f031309f8f set up api controller for route/model binding 2024-08-14 16:09:15 -05:00
spencerrlongg 20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
spencerrlongg a70b94e707 Merge branch 'refs/heads/develop' into bug/sc-26584 2024-08-14 11:36:19 -05:00
Brady Wetherington cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00