DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
15630 commits 95 branches 267 tags 294 MiB
Commit graph

15630 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe d9432baf7a Mlore ldap style improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 23:51:20 +01:00
snipe 90be2a4498 Use newer naming convention for errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:26:30 +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 4361a10818 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:30 +01:00
snipe aa8048ac15 Blade changes for ldap 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:25 +01:00
snipe 710e738e8e Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:16 +01:00
snipe 3705b91439 Added more validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:51:34 +01:00
snipe 707bdad192 Updated test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:56 +01:00
snipe 242fe33f97 Switch to regular HTML input 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:42 +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 2cb9ac26cd Renamed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:57:04 +01:00
snipe 185bc966e6 Cleaned up use statements in tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:46:47 +01:00
snipe a7f7e4938f Added form action 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:31:56 +01:00
snipe 2883e79193 Removed unecessary assets creation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:30:55 +01:00
snipe 9c4191ae0a Basic tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 19:30:42 +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