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
15867 commits 96 branches 267 tags 295 MiB
Commit graph

6244 commits

Author SHA1 Message Date
Godfrey M c24f79c025 update method comment 2024-10-28 14:58:43 -07:00
Godfrey M e7c4343c90 readd checkin accessory format 2024-10-28 14:56:48 -07:00
Godfrey M c0620c27ff adds back laravels channel formats 2024-10-28 14:30:34 -07:00
Godfrey M ed81973fe6 adds notifications for deprecation 2024-10-28 13:57:42 -07:00
Godfrey M b987b3dc00 adds back the laravel channels package and applies a deprecated check 2024-10-28 10:57:48 -07:00
snipe 86d784bd59 Fixed #15740 - use non-translated strings for icons
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 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-28 13:37:59 +00:00
Godfrey M 58ff641f82 removed unused variables 2024-10-24 22:53:53 -07:00
Godfrey M ce68f550d8 remove alert emails from cc 2024-10-24 16:01:17 -07:00
Godfrey M 6f0c1b12b1 this adds check out message for consumables 2024-10-24 15:04:54 -07:00
Godfrey M 278bc5e52a ads check in and checkout message for license seats 2024-10-24 14:59:10 -07:00
Godfrey M cce75a8185 adds check in and checkout messag for accessories 2024-10-24 14:48:23 -07:00
Godfrey M e27ff13377 adds check in and checkout message for assets 2024-10-24 14:39:40 -07:00
Godfrey M 56365495a1 remove unnecessary fields in accessory checkout mail 2024-10-24 14:26:42 -07:00
Godfrey M 18da80e6de fix checkoutable listener for microsoft teams 2024-10-24 14:24:00 -07:00
Godfrey M 18760e3fa1 replaces teams notification package, passes integration test 2024-10-24 12:21:51 -07: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
Godfrey M ab3b9c4510 remove unnecessary code from checkinasset notification 2024-10-23 16:24:01 -07:00
Godfrey M 2cc2b2b1df apply array_filter to cc emails to prevent errors 2024-10-23 16:06:27 -07:00
Godfrey M 62d06b44d6 set fallback from email address to service.snipe-it.io 2024-10-23 15:43:42 -07:00
Godfrey M f29a383179 Merge branch 'develop' into seperating_notification_n_mail 
# Conflicts:
#	app/Notifications/CheckoutConsumableNotification.php
 2024-10-23 15:15:14 -07:00
Godfrey M fd74c35102 remove old notify by mail from consumable notification 2024-10-23 15:08:29 -07:00
Godfrey M c681946b1d added component markdown changes 2024-10-23 15:05:39 -07:00
Godfrey M 6c34a5c52c conditionally check cc emails, initiate variables 2024-10-23 14:54:21 -07:00
Godfrey M 1b5f4415ae corrected cc email behavior 2024-10-23 14:44:45 -07:00
snipe 3ee76be7e3 Added manufacturer and model_number to components 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 17:50:22 +01:00
snipe 0b6859c491 Added ability to checkout consumables in variable qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 15:05:35 +01:00
Godfrey M 1e9922a0b0 fix moar tests 2024-10-22 16:14:36 -07:00
Godfrey M ead27accac fixed accessory tests and notifiable target 2024-10-22 15:45:52 -07:00
Marcus Moore 5ecd2b6293
Default checkbox elements to an empty array 2024-10-22 14:04:05 -07:00
Godfrey M 1e31592c55 messing with the tests 2024-10-22 11:49:06 -07:00
Marcus Moore d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
snipe 9cf71976f6 Fixed #15706 - Removed purchase order number from asset import 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 16:51:42 +01:00
snipe 15745d9737
Merge pull request #15566 from Godmartinz/status-label-error-message 
Fixed Status Labels Error Message
 2024-10-22 16:39:44 +01:00
snipe 252d99421c
Merge pull request #15689 from snipe/better_handle_inline_files 
Better handle inline files in file listing
 2024-10-22 16:26:48 +01:00
snipe 5767a98ad8
Merge pull request #15649 from bryanlopezinc/ImproveImporting 
Improve import performance
 2024-10-22 16:26:23 +01:00
snipe 0c820cbc0d
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue 
Custom Field Existence Validation Issue
 2024-10-22 15:56:12 +01: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 147fcfb8eb
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
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 
Fix user creation with FullMultipleCompanySupport enabled over API
 2024-10-22 15:12:55 +01:00
Marcus Moore 867fa2f36e
Display file in activity report for accessories 2024-10-21 12:40:24 -07:00
Marcus Moore e1882ee6d2
Add comment 2024-10-21 12:21:45 -07:00
Marcus Moore 7eee239378
use is_numeric instead of is_int 2024-10-21 12:20:28 -07: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 06c599cc17 Added method to show or download file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:03 +01:00
Marcus Moore 7e1b47708e
Fix failing test ensuring company id is an integer 2024-10-17 15:18:41 -07:00
Marcus Moore 979e4502ff
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company 2024-10-17 15:14:39 -07:00
Godfrey M ff113ef523 typo fix 2024-10-17 14:56:58 -07:00
Godfrey M 123cdeb858 add email check to listener 2024-10-17 12:39:48 -07:00
Godfrey M 285d6897cf added a coulple test adjustments and moved mail send logic to listener 2024-10-17 12:05:36 -07:00
snipe d1149730be Apply blade component to files views 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 16:31:17 +01:00
snipe 46ad1d072f
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
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 
Bulk checkout to bulk actions
 2024-10-17 15:29:47 +01:00
Tobias Regnery f50ccbcc49 Fix outdated comment in CompanyableTrait 
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
 2024-10-17 11:07:28 +02:00
Godfrey M a7754c1a7f fixed asset checkout markdown, and notifiable variable 2024-10-16 16:46:52 -07:00
snipe 02c80ff18a Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:18:40 +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 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