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

3977 commits

Author SHA1 Message Date
snipe ef9b6e3b07 Code cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:54 +01:00
snipe c01190fac2 Conditionally add content-type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:18:34 +01:00
snipe c49921f50f Removed unused (maybe?) API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:08:54 +01:00
snipe c49abb6aea Refactor the UserFilesController show method for simpler inlining 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:08:38 +01:00
snipe ccd2019448 Removed unusded use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:08:04 +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
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
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 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 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
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 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
Marcus Moore fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories 2024-09-30 12:59:27 -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
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
Marcus Moore 4b02db5031
Add authorization check in bulk users controller 2024-09-23 16:26:22 -07:00