DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
15767 commits 96 branches 267 tags 295 MiB
Commit graph

6181 commits

Author SHA1 Message Date
snipe 96191a5e93 Added method to decide if the file should be inlinable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:07:54 +01:00
snipe c56affd663 Added SVG icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:07:37 +01:00
Godfrey M 02bda3cd95 adds Checkout Consumable mailable and slackwebhook channel to notifs 2024-10-16 15:53:05 -07:00
Godfrey M 02ff646da4 adds checkin license mailable 2024-10-16 15:44:45 -07:00
Godfrey M 4becdca8aa removes toMail from license notificaqtion 2024-10-16 15:39:20 -07:00
Godfrey M 2584d60344 adds Licenses seat checkout Mailable 2024-10-16 15:38:49 -07:00
Godfrey M c39df34bdf forgot to add accessory mail to project 2024-10-16 15:29:50 -07:00
Godfrey M dcdf600b78 adds Checkin and Checkout mailables and listner logic 2024-10-16 15:27:34 -07:00
Brady Wetherington 3cf746d7df Rework the bulk checkout to not change how all checkouts work 2024-10-16 23:13:32 +01:00
Brady Wetherington 6b7af802af Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar 2024-10-16 22:02:45 +01:00
Godfrey M 9710436d54 adds Mailables for asset checkin and out 2024-10-16 13:12:07 -07:00
Godfrey M 16cffe9a9d simplified checkout webhook call 2024-10-16 12:53:35 -07:00
Godfrey M 9e1b86f586 sends checkout notification via webhook 2024-10-16 12:51:19 -07:00
Godfrey M 3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07:00
Tobias Regnery fdcc17ca2c 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.
 2024-10-16 11:47:18 +02:00
Godfrey M 9f06a0e441 handle some edge cases, null values clean up variable names 2024-10-15 14:01:28 -07:00
Godfrey M f8476f7133 finished the construct and mail call in the listner 2024-10-15 12:49:52 -07:00
Godfrey M b29d032bf0 adds checkoutAssetMail class, and content method 2024-10-15 11:28:27 -07:00
Brady Wetherington e4e1d0d50a Clean up how we use the '$location' in LDAP sync command 2024-10-15 17:26:31 +01:00
snipe 0ae9ce0aa9 Cannot sort by updated at on Users [sc-27147] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:45 +01:00
snipe 50b8f180b3 More logical grouping in allow_columns 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:39 +01:00
snipe d0d4159088 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:42:09 +01:00
Tobias Regnery f3c4e55667 Refactor asset creation with API 
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
 2024-10-14 15:14:41 +02:00
snipe 0d35335da7 Removed debugging
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-10-11 16:06:17 +01:00
snipe e1a70023b1
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs 
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
 2024-10-11 11:45:48 +01:00
snipe de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories 
Added tests for accessory api controller
 2024-10-11 11:29:34 +01:00
Tobias Regnery fb4fe30049 Fix asset creation with API and FullMultipleCompanySupport 
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
 2024-10-11 12:19:20 +02:00
snipe b054017c9f Fixed #15651 - admin user now displaying on maintenances page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 11:16:24 +01:00
bryanlopezinc 524a442724 Improved import performance 2024-10-10 23:32:07 +01:00
snipe 8aa298f6b0
Merge pull request #15644 from snipe/form_requests_for_settings
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Form requests for settings
 2024-10-10 12:30:53 +01:00
snipe 94a074a193
Merge pull request #15601 from snipe/check_db_on_healthcheck
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Fixed #15439 - check database on healthcheck
 2024-10-10 01:11:10 +01:00
snipe 3886da8941 Remove form request from get LDAP method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:49 +01:00
snipe 130e0c6242 More validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:37 +01:00
snipe 3705b91439 Added more validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:51:34 +01:00
snipe ded79469c1 Remove unused controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:29 +01:00
snipe d9fbf330e5 Fixed translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:15 +01:00
snipe 3a77b83e9c Added space 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:30:34 +01:00
snipe d9be2b5a5e Trying to use the email_array translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:30:25 +01:00
snipe 4f957bcf71 Required flag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:34:53 +01:00
snipe 5cda7cce48 Only accept a positive number for thresholds 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:21:40 +01:00
snipe aa55fa6ff4 Switch to form requests for settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:16:34 +01:00
snipe 3ee5713740
Merge pull request #15631 from snipe/test/importer-tests
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 
Add importer tests
 2024-10-07 23:13:15 +01:00
snipe 26d7572bcc
Merge pull request #15603 from marcusmoore/fixes/add-reguard 
Added `Model::reguard()` to importer
 2024-10-07 22:28:53 +01:00
Marcus Moore e213053775
Swap factory syntax 2024-10-03 13:59:58 -07:00
Marcus Moore 32551d55d7
Merge pull request #15579 from bryanlopezinc/ImportTests 
Add Import data tests
 2024-10-03 11:39:21 -07:00
snipe 7461c3e0ca Change controller to assume a collection. (This is dumb, but whatever) 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:27 +01:00
Brady Wetherington 350b627ce1 Fix numeric sort 'ambiguous order clause' error 2024-10-03 14:23:40 +01:00
Marcus Moore ee046a8688
Add matching Model::reguard() 2024-10-02 10:50:40 -07:00
snipe b34a7c8aad Removed die() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:48:35 +01:00
snipe f92bf5dc20 Updated language for failure 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:39:27 +01:00
snipe 4d9e85026a Fixed #15439 - check database on healthcheck 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:36:01 +01:00
snipe 4db7358086
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug 
Fixed divide by zero bug in depreciation transformer
 2024-10-02 12:38:46 +01:00
spencerrlongg 3153bbb13f dumb fix 2024-10-01 17:04:18 -05:00
spencerrlongg 8232618a9f change the other one too 2024-10-01 14:26:32 -05:00
spencerrlongg 9a651b567d change error to warning 2024-10-01 14:24:03 -05:00
Godfrey M b9cfdf2e54 reworked monthly depreciation variable value 2024-10-01 11:41:59 -07:00
spencerrlongg 1139acd9f3 catch errors around request notifications 2024-10-01 13:36:47 -05:00
Godfrey M b7ad80bd31 fix monthly depreciation value 2024-10-01 11:24:24 -07:00
Godfrey M 5ffd1b8daa fixes if statement in transformer 2024-10-01 11:02:39 -07:00
snipe 27ba641aa5 Added checkin on delete to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:30:34 +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
snipe cae8aa7840 Added maxlengths to additional fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:02:54 +01:00
Marcus Moore fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories 2024-09-30 12:59:27 -07:00
snipe b964ce1025
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations 
Removed sortablity for current value column in depreciations report
 2024-09-30 19:25:05 +01:00
snipe 6217cba201
Merge pull request #15524 from Godmartinz/double-notif-bug 
Fixed double webhook notifications // Separated email and webhook notifications.
 2024-09-30 19:24:19 +01:00
Godfrey M 68e3f375fc removes sortablity from current value column 2024-09-30 11:15:49 -07:00
bryanlopezinc e807cfab86 Merge branch 'develop' into importTests 2024-09-30 12:47:52 +01:00
bryanlopezinc 0b3f458561 Added tests for Import feature 2024-09-30 12:42:41 +01:00
Godfrey M 3f74ff25d2 fixed error message 2024-09-25 16:19:09 -07:00
snipe 3f0245f88f Make controller gate match dropdown gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 20:33:00 +01:00
snipe f6d7ea19e4 Set view as base permission, drill down for more intrusive actions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 19:44:39 +01:00
snipe 9b03f46490
Merge pull request #15534 from marcusmoore/bulk-print-users 
Added the ability to bulk print users
 2024-09-25 19:32:01 +01:00
snipe cb6e5042d9
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status 
Fixed #13396 - do not allow checkout to undeployable status types
 2024-09-25 18:32:59 +01:00
snipe 658c94ad8b Changed action_date to created_at 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 17:25:15 +01:00
snipe 1c3babacaf Fixed case on logAction for usewr file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 15:46:57 +01:00
snipe 0ce5832b6c Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 17:29:40 +01:00
Brady Wetherington b6340532d7 Improve the error and success messages and linking 2024-09-24 17:15:39 +01:00
snipe 5fb43dd159 Handle audit *and* audits for urls 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:55:56 +01:00
snipe de57d71bf1 Fixed #15548 - unify audit due/overdue APIs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:30:24 +01:00
snipe ba69259f2d Fixed #13396 - do not allow checkout to undeployable status types 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 15:35:00 +01:00
Brady Wetherington c71411465a First pass at better-handling those annoying Rollbars we keep getting 2024-09-24 15:17:35 +01:00
Marcus Moore 4b02db5031
Add authorization check in bulk users controller 2024-09-23 16:26:22 -07:00
Marcus Moore ab90c0cf05
Add missing eager load in bulk users controller 2024-09-23 16:10:40 -07:00
Marcus Moore cef7ddc719
Add eager loads to userscontroller 2024-09-23 16:10:21 -07:00
Marcus Moore a2d4dcf6e8
Use bulk actions menu 2024-09-23 12:49:36 -07:00
Marcus Moore 54044bfa5e
Add eager loads 2024-09-23 10:57:57 -07:00
Marcus Moore 29af210f4f
Merge branch 'develop' into bulk-print-users 2024-09-23 10:26:20 -07:00
snipe b68805cf83 Small fix for notifications checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 19:11:52 +01:00
snipe b84a634ec7 Corrected comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 14:33:35 +01:00
snipe 2fc88a0e08 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-20 14:33:26 +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
Marcus Moore 5128fd49e6
Allow printing all users 2024-09-19 17:27:25 -07:00
Marcus Moore 2d2d5bdc7e
Pass user in array 2024-09-19 17:23:47 -07:00
Marcus Moore e95703cb18
Use eager load 2024-09-19 17:10:07 -07:00
Marcus Moore 7ad4a29970
Add eager loading 2024-09-19 16:54:39 -07:00
snipe cdb7ccb8f3
Merge pull request #15532 from spencerrlongg/bug/15253
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Catch Exceptions on Checkout Notification
 2024-09-19 21:54:03 +01:00
snipe 8270947ed2
Merge pull request #13291 from akemidx/eol_date_range_for_reports 
Added date range for EOL in custom reports
 2024-09-19 21:49:27 +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
Marcus Moore d609ed50a4
Merge branch 'develop' into testing/fmcs-accessories 2024-09-19 13:20:55 -07:00