lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
15644 commits 1 branch 0 tags 220 MiB
Commit graph

15644 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
147fcfb8eb
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs 
Fix user creation with FullMultipleCompanySupport enabled over API
 2024-10-22 15:12:55 +01:00
snipe
58a3d09b5f
Merge pull request #15703 from marcusmoore/bug/sc-27188 
Linked accessory files in activity report
 2024-10-22 14:55:42 +01:00
snipe
30a06a5942
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing 
Removed brianium/paratest
 2024-10-22 11:47:06 +01:00
snipe
6c6af78e08
Merge pull request #15705 from marcusmoore/tests/icon-component-test 
Added test to ensure icon component does not end in newline
 2024-10-22 11:46:04 +01:00
Marcus Moore
3f79fd7ea7
Add test to ensure icon component does not end in newline 2024-10-21 17:07:40 -07:00
snipe
9b06bbb6c3
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon 
Removed second icon in accessory file list
 2024-10-21 22:38:26 +01:00
Marcus Moore
ce30863177
Remove brianium/paratest dependency 2024-10-21 13:57:04 -07:00
Marcus Moore
d7f70146f4
Remove extra icon in accessory file upload list 2024-10-21 13:48:25 -07:00
Marcus Moore
867fa2f36e
Display file in activity report for accessories 2024-10-21 12:40:24 -07:00
Marcus Moore
0933a2d4ea
Remove --parallel flag 2024-10-17 18:01:48 -07:00
snipe
46ad1d072f
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions 
Bulk checkout to bulk actions
 2024-10-17 15:29:47 +01:00
snipe
bcb4bd9eb4
Merge pull request #15683 from Toreg87/fixes/outdated_comment 
Fix outdated comment in CompanyableTrait
 2024-10-17 10:20:13 +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
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
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
snipe
2500375400
Merge pull request #15672 from uberbrady/ldap_location_fixes 
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 
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 
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 
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 
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 
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