DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
17192 commits 59 branches 275 tags 321 MiB
Commit graph

360 commits

Author SHA1 Message Date
snipe 6928b1b273 Added eol date to bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-10 17:47:10 +00:00
spencerrlongg a57fffe696 a few fixes, tests pass 2024-11-04 13:39:42 -06:00
spencerrlongg b00f8b5c40 a couple more tests passing 2024-10-30 19:37:51 -05:00
spencerrlongg c0ea1fbe78 delete done 2024-10-30 15:19:34 -05:00
spencerrlongg 698434dcf8 no more base action, scaffolded update and delete 2024-10-30 13:48:14 -05:00
spencerrlongg 34886ee69a almost wrapped up StoreAssetAction.php 2024-10-29 19:04:57 -05:00
spencerrlongg eaa10249c2 alright, this mostly works. 2024-10-29 16:16:01 -05:00
snipe dfc63641dc
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
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 
Fix multi create partial failure (fixes: [RB-18591])
 2024-10-24 11:40:50 +01:00
spencerrlongg 6e8ab3723c bs 2024-10-23 13:56:01 -05:00
spencerrlongg 10d4c4b92e just a little scaffolding 2024-10-23 12:55:47 -05:00
snipe a05c33febf Squashed commit of the following: 
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 15:12:55 2024 +0100

    Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs

    Fix user creation with FullMultipleCompanySupport enabled over API

commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 14:55:42 2024 +0100

    Merge pull request #15703 from marcusmoore/bug/sc-27188

    Linked accessory files in activity report

commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 11:47:06 2024 +0100

    Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing

    Removed brianium/paratest

commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 11:46:04 2024 +0100

    Merge pull request #15705 from marcusmoore/tests/icon-component-test

    Added test to ensure icon component does not end in newline

commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 17:07:40 2024 -0700

    Add test to ensure icon component does not end in newline

commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date:   Mon Oct 21 22:38:26 2024 +0100

    Merge pull request #15704 from marcusmoore/bug/remove-extra-icon

    Removed second icon in accessory file list

commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 13:57:04 2024 -0700

    Remove brianium/paratest dependency

commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 13:48:25 2024 -0700

    Remove extra icon in accessory file upload list

commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 12:40:24 2024 -0700

    Display file in activity report for accessories

commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Oct 17 18:01:48 2024 -0700

    Remove --parallel flag

commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 17 15:29:47 2024 +0100

    Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions

    Bulk checkout to bulk actions

commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 17 10:20:13 2024 +0100

    Merge pull request #15683 from Toreg87/fixes/outdated_comment

    Fix outdated comment in CompanyableTrait

commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date:   Thu Oct 17 11:07:28 2024 +0200

    Fix outdated comment in CompanyableTrait

    As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment

commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Oct 16 23:13:32 2024 +0100

    Rework the bulk checkout to not change how all checkouts work

commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Thu Oct 10 13:28:23 2024 +0100

    Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar

commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date:   Wed Oct 16 11:18:24 2024 +0200

    Fix user creation with FullMultipleCompanySupport enabled over API

    It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
    Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.

    Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.

Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 15:43:19 +01:00
snipe 787e651778 Fixed todos with log message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:52:21 +01:00
snipe ef9b6e3b07 Code cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:54 +01:00
snipe 5823197e6f Added checkin action on delete for checked out assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:29:02 +01:00
Godfrey M 44447b85c9 Merge branch 'develop' into barcode_settings_hide 2024-09-26 11:27:05 -07:00
Brady Wetherington b6340532d7 Improve the error and success messages and linking 2024-09-24 17:15:39 +01:00
Brady Wetherington c71411465a First pass at better-handling those annoying Rollbars we keep getting 2024-09-24 15:17:35 +01:00
snipe bc540b6564 Requestable status not saving with manual [sc-26848] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 14:02:28 +01:00
snipe b21c303e56 Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by 2024-09-20 13:43:50 +01:00
snipe 4f7c8e0c3d
Merge pull request #14671 from Robert-Azelis/patch-6 
[FIX] Update EOL date when used bulk update of purchase date
 2024-09-19 21:36:09 +01:00
Godfrey M b33c0fc4dd updates getbarcode method and labels view 2024-09-17 16:15:56 -07:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
Godfrey M 033a56fe6d change variables in hardware labels edit post methods 2024-09-17 12:22:05 -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
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 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
snipe 371afde52d Bulk edit asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 09:52:25 +01:00
Florent Bervas ad794248fe add a warning message if asset tag not found 2024-08-05 13:54:33 +00:00
Florent Bervas b804791ff6 feature: extend search capabilities to other assets attributes 2024-08-05 12:26:29 +00:00
snipe 037cc4d098 More tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:27:07 +01:00
snipe b6d9f736e3 Pulled use session 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:41:28 +01:00
snipe 08f4fe5f35 Add status messages to redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:02:34 +01:00
snipe 73a80a5fbc Use blade component for redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 21:35:13 +01:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe 175862d3c9 Added route param to message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 16:37:01 +01:00
snipe 94619e3284 Fixed #15121 - bulk delete restore logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:56:58 +01:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
snipe 595408d21f On more binaryfile response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:54:07 +01:00
snipe bf060d43a7 Fixed typehint on assets controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:02:11 +01:00
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe eba24b9242 Removed custom fieldsets on auditing - it’s not used 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 13:19:05 +01:00
snipe 96d1aea54a More cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 00:54:50 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
akemidx ca57f6de85 adding in item=>asset, missed in first commit 2024-07-03 17:07:50 -04:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe cf45e7536f Redirect with error if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:51:58 +01:00
snipe ca8d478e87 Redirect if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:32 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
snipe df1cef59d5 Fixes path for redirect response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:01:40 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
snipe 54b24434e1 Set file name variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 19:56:58 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe 09914f508f Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:16:52 +01:00
snipe 55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug 
Fixed user assets not updating when a user changes location
 2024-05-15 19:20:14 +01:00
snipe cb22a3d556 Updated comments again :-/ 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:52:50 +01:00
snipe c7accb4599 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:38:42 +01:00
snipe c1d5b8713b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 8310b91e00 Use UploadFileRequest for audit files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe e5653eaa93 Save new data 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912 
Bulk Edit Tests and Tweaks
 2024-05-15 11:22:31 +01:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
Godfrey Martinez 5272824d85
Merge branch 'develop' into asset-location-update-bug 2024-05-13 10:47:25 -07:00
snipe 9bce0f2ff7 Format fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 18:19:14 +01:00
spencerrlongg ad2ba252ee two new test 2024-05-07 15:11:33 -05:00
spencerrlongg 17ef20ea92 alright, in a working place 2024-05-07 14:08:47 -05:00
Godfrey M c94a7613ca dropdown redirect options, helper function and session variable added 2024-05-02 12:16:20 -07:00
Robert-Azelis 3ea5d4ee40
Update BulkAssetsController.php 
Fix for bulk updarte of purchase date to calculate new EOL
 2024-05-02 12:55:17 +02:00
spencerrlongg e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg 25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
snipe 3f04afee5c Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:26 +01:00
snipe 2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
snipe e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
Godfrey M 633249b08a user assets get updated when a user changes location 2024-03-21 15:15:40 -07:00
Marcus Moore 0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -07:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
Godfrey M c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
snipe a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788 
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
 2024-02-28 11:47:46 +00:00
Marcus Moore a5516e3511
Improve trait name 2024-02-27 12:06:29 -08:00
Marcus Moore 0e460baf82
Improve readability 2024-02-27 12:03:36 -08:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
Marcus Moore dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
snipe 111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146 
Fixes Default Location Being Set During Asset Creation and Checkout
 2024-02-10 11:47:46 +00:00
snipe 3868e711f4 Return null if asset was hard-deleted/purged 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 21:08:07 +00:00
snipe 55b3050ca8 Re-applied previous withTrashed PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:37:18 +00:00
snipe 84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe fa47707974 Use withTrashed() to get the barcode on deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:26:49 +00:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
spencerrlongg d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
snipe 105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
snipe ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00