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

15649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 123cdeb858 add email check to listener 2024-10-17 12:39:48 -07:00
Godfrey M 496b44e887 merged composer lock from dev 2024-10-17 12:28:57 -07:00
Godfrey M a690cc3582 removing my composer stuff again..for the last time 2024-10-17 12:26:55 -07:00
Godfrey M ceb3f5cea6 added mail-gun and http-client to 8.1 2024-10-17 12:19:50 -07:00
Godfrey M 65735a31f1 removed symfony/mailgun-mailer symfony/http-client 2024-10-17 12:18:34 -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
Godfrey M 9a79483375 removed namespaces from routing 2024-10-16 16:59:18 -07:00
Godfrey M ed6034065b removed test route 2024-10-16 16:47:36 -07:00
Godfrey M a7754c1a7f fixed asset checkout markdown, and notifiable variable 2024-10-16 16:46:52 -07: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 f1d83a3f28 forgot to add asset checkout markdown to projet 2024-10-16 15:30:53 -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
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
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
snipe 2500375400
Merge pull request #15672 from uberbrady/ldap_location_fixes
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 
Clean up how we use the '$location' in LDAP sync command
 2024-10-15 17:34:35 +01:00
Brady Wetherington e4e1d0d50a Clean up how we use the '$location' in LDAP sync command 2024-10-15 17:26:31 +01:00
snipe 16c8264e76
Merge pull request #15671 from snipe/bug/sc-27147 
Bug/sc 27147
 2024-10-15 16:42:34 +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 914a647204
Merge pull request #15669 from snipe/remlove_ou_requirenedess 
Fixed #15663 - remove requiredness for OU
 2024-10-15 12:47:15 +01:00
snipe e9225ff3ea Switch to regular HTML for input form field 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:43:10 +01:00
snipe d0d4159088 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:42:09 +01:00
snipe 69b6080bd8
Merge pull request #15666 from snipe/updated_readme_llm
Some checks failed
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Details 
Added LLM note
 2024-10-15 10:31:29 +01:00
snipe b997d728fb Added LLM note 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 10:30:34 +01:00
snipe ddead359d0
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
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 
Refactor asset creation with API
 2024-10-14 14:29:34 +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 feaa714304 Nicer disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 14:23:57 +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
snipe 12bda8fc7b
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances 
Fixed #15651 - admin user now displaying on maintenances page
 2024-10-11 11:27:18 +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 1f34657734 Fixed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 12:30:35 +01:00
snipe 0856ee648e
Merge pull request #15648 from snipe/update_packages 
Updated livewire to 3.5.2
 2024-10-10 12:23:14 +01:00
snipe 1dafc970df Updated livewire to 3.5.2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 12:19:57 +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 2d49e1eff2
Merge pull request #15637 from akemidx/bug/sc-26614 
FIXED: Badge counter showing deleted assets on User page
 2024-10-10 01:09:11 +01:00
snipe 705bc6f0c0
Merge pull request #15642 from uberbrady/fix_bulk_checkout 
Fix bulk checkout to users, assets, and locations
 2024-10-10 01:08:25 +01:00
snipe b5b93fdd3a Make ldap username required 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 00:27:00 +01:00