-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Better handle inline files in file listing #15689
Conversation
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
PR Summary
|
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
Signed-off-by: snipe <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks GREAT - I love that we have all this duplicated code - most of which I don't think I even noticed since it's in a place that generally doesn't give us too much trouble. And now we shrank it down into something small and simple, and I think that's just wonderful. Spectacular work.
Signed-off-by: snipe <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks really nice. This is my third pass looking through it, and just looking at it, it looks much, much cleaner. I think we need to give it a real, serious QA pass, but then I think it seems really solid, and I love how much cleaner this all is. Really, genuinely, wonderful work.
* | ||
* @return string | ||
*/ | ||
public static function generateEncyrptedPassword(): string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I guess we're sure that we don't need this, yeah?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Grep told me we didn't.
|
||
|
||
// The file exists and is allowed to be displayed inline | ||
if (Storage::exists($file_with_path) && (in_array(pathinfo($file_with_path, PATHINFO_EXTENSION), $allowed_inline))) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there's a way to do this with a Storage::
method which will give you the same results and keep us working OK if people choose S3 or some other storage engine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Storage:: should be doing that already - that's the point of the facade
@@ -106,50 +106,29 @@ public function destroy($accessoryId = null, $fileId = null) : RedirectResponse | |||
* @param int $accessoryId | |||
* @param int $fileId | |||
*/ | |||
public function show($accessoryId = null, $fileId = null, $download = true) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse | |||
public function show($accessoryId = null, $fileId = null) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Route-model binding is an option here, if you wanted it. Might help with the indentation level.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, but out of scope for this PR
@@ -61,43 +61,30 @@ public function store(UploadFileRequest $request, $assetId = null) : RedirectRes | |||
*/ | |||
public function show($assetId = null, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse | |||
{ | |||
$asset = Asset::find($assetId); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, you could do R-M-B here - but I could also see not wanting to muck around with the 'shape' of the code too much, so probably a bit of a 'nit' if anything.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, that's a different PR ;)
commit 147fcfb Merge: 58a3d09 fdcc17c Author: snipe <[email protected]> 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 58a3d09 Merge: 30a06a5 867fa2f Author: snipe <[email protected]> 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 30a06a5 Merge: 6c6af78 ce30863 Author: snipe <[email protected]> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit 6c6af78 Merge: 9b06bbb 3f79fd7 Author: snipe <[email protected]> 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 3f79fd7 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit 9b06bbb Merge: 46ad1d0 d7f7014 Author: snipe <[email protected]> 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 ce30863 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commit d7f7014 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit 867fa2f Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit 0933a2d Author: Marcus Moore <[email protected]> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit 46ad1d0 Merge: bcb4bd9 3cf746d Author: snipe <[email protected]> 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 bcb4bd9 Merge: 2500375 f50ccbc Author: snipe <[email protected]> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commit f50ccbc Author: Tobias Regnery <[email protected]> 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 3cf746d Author: Brady Wetherington <[email protected]> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit 6b7af80 Author: Brady Wetherington <[email protected]> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commit fdcc17c Author: Tobias Regnery <[email protected]> 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 <[email protected]>
commit 6bec573956922013dc19cee4840fcb14bcbb74f1 Merge: b6ad69fac 1fc5bb54e Author: snipe <[email protected]> Date: Mon Nov 11 13:54:09 2024 +0000 Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance Check that the file exists before trying to download stored EULA commit 1fc5bb54e1ac036c44e4a6096b958f7e86674248 Author: snipe <[email protected]> Date: Mon Nov 11 13:50:53 2024 +0000 Check that the file exists before trying to download Signed-off-by: snipe <[email protected]> commit b6ad69fac248658a964ea60dc8d3e909e32795f6 Merge: 357ef7e37 47b2cdb84 Author: snipe <[email protected]> Date: Sun Nov 10 18:05:20 2024 +0000 Merge pull request #15793 from snipe/allow_eol_explicit Allow user to specify null for calculation or explicit on bulk edit commit 47b2cdb8469e6d4904f9ad3ffb34bdc6d9a196db Author: snipe <[email protected]> Date: Sun Nov 10 18:04:13 2024 +0000 Allow user to specify null for calculation or explicit on bulk edit Signed-off-by: snipe <[email protected]> commit 357ef7e3757712307417b5533785d839c0fb58a9 Merge: 000f3171e 6928b1b27 Author: snipe <[email protected]> Date: Sun Nov 10 17:48:25 2024 +0000 Merge pull request #15792 from snipe/edit_eol_from_bulk Added EOL date to bulk asset edit commit 6928b1b273667f1b36c97183e167da0418c39dd6 Author: snipe <[email protected]> Date: Sun Nov 10 17:47:10 2024 +0000 Added eol date to bulk asset edit Signed-off-by: snipe <[email protected]> commit 000f3171e39bcdbbb79a12296aa3f6326101d22f Author: snipe <[email protected]> Date: Fri Nov 8 10:28:01 2024 +0000 Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786 Signed-off-by: snipe <[email protected]> commit 5ef3183a5261bfe74df7e5616bb2d54b9c64f37c Merge: a41529dbc 050831868 Author: snipe <[email protected]> Date: Thu Nov 7 11:44:06 2024 +0000 Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes Improved indexes on manager_id for locations and users, including del… commit 050831868e96722753ef15228d794f8343da5548 Author: Brady Wetherington <[email protected]> Date: Thu Nov 7 11:39:27 2024 +0000 Improved indexes on manager_id for locations and users, including deleted_at commit a41529dbc4798d635739bdb77b8ffb8955049c89 Merge: aa168fcb5 4fcf5ac7d Author: snipe <[email protected]> Date: Wed Nov 6 21:22:45 2024 +0000 Merge pull request #15780 from uberbrady/add_manager_indexes Add new indexes to locations and users for faster manager lookups commit 4fcf5ac7dae2819e6b19d1d63d7d865d08d056be Author: Brady Wetherington <[email protected]> Date: Wed Nov 6 21:19:41 2024 +0000 Add new indexes to locations and users for faster manager lookups commit aa168fcb5b7d9c9d0c600ca2d7160985ce1a240f Author: snipe <[email protected]> Date: Wed Nov 6 18:41:52 2024 +0000 Updated BS table to 1.23.5 Signed-off-by: snipe <[email protected]> commit 9c1c93ad52112a53c7c1e4d502f04091b118c125 Merge: b96a31253 ad99b8b45 Author: snipe <[email protected]> Date: Wed Nov 6 18:40:35 2024 +0000 Merge pull request #15774 from marcusmoore/feature/sc-27350 Added Checkout ID column to user accessory table commit ad99b8b456968c2385f288b20d20d30d41d847b6 Author: Marcus Moore <[email protected]> Date: Wed Nov 6 10:37:31 2024 -0800 Use generic ID translation commit b96a31253902a4d702de318b381098f66e474fb8 Merge: 654f67b6a bab1e58ea Author: snipe <[email protected]> Date: Wed Nov 6 18:29:22 2024 +0000 Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345 Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736 commit bab1e58ea4dc0715478e8feef1aa562d1ab9ce82 Author: Joël Pittet <[email protected]> Date: Wed Nov 6 09:46:11 2024 -0800 symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736 commit 654f67b6ac4537794ec134fa96ee924075875b5e Author: snipe <[email protected]> Date: Wed Nov 6 14:05:42 2024 +0000 Updated webpack Signed-off-by: snipe <[email protected]> commit 3965bcd7c116bdde2649e38d96531808d811962b Merge: 287f4addf 2362cb5e5 Author: snipe <[email protected]> Date: Wed Nov 6 14:02:44 2024 +0000 Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests Fixed notifications for licenses and asset to asset checkoutables commit 2362cb5e5221ecae78c6aaf28bf8380f5ae20de2 Author: Godfrey M <[email protected]> Date: Mon Nov 4 16:32:46 2024 -0800 refactor to getNotifiables commit e7cb4a75eb5cd0d32524bcae0d53d184415acff5 Author: Marcus Moore <[email protected]> Date: Mon Nov 4 15:56:53 2024 -0800 Show accessory checkout id in user accessory table commit 93494ac55447b062b80918d84a80e38c5dbd2c3d Author: Godfrey M <[email protected]> Date: Mon Nov 4 15:17:58 2024 -0800 put dataprovider back in for tests commit 0d707a18512aa8e01c242d6d5486b675754ed5ed Author: Godfrey M <[email protected]> Date: Mon Nov 4 15:13:10 2024 -0800 fixes notifications for licenses and asset to asset checkouables commit 287f4addf026f44467376bada0222aa4e489eb0f Merge: f32ebdc7a 2e96d478f Author: snipe <[email protected]> Date: Mon Nov 4 20:06:24 2024 +0000 Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging Revert "Added the display of logs when tests fail in GitHub Actions" commit 2e96d478f15c433c5628e3307cd323fcd8a765ac Author: Marcus Moore <[email protected]> Date: Mon Nov 4 11:04:17 2024 -0800 Revert "Added the display of logs when tests fail in GitHub Actions" commit f32ebdc7acc370ab8d6f0e07a3f8ee59981d1491 Merge: 5897d37fc d6c7dc8e1 Author: snipe <[email protected]> Date: Thu Oct 31 22:39:58 2024 +0000 Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file Added missing Livewire file commit d6c7dc8e1c99c5421c149543a22b8cec0784ba7f Author: Marcus Moore <[email protected]> Date: Thu Oct 31 15:37:01 2024 -0700 Add missing livewire file commit 5897d37fcfd3c79afeef72e095d32145e90798bc Merge: 49de07045 21a27dcac Author: snipe <[email protected]> Date: Thu Oct 31 20:54:01 2024 +0000 Merge pull request #15763 from Godmartinz/no_to_email_check Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent. commit 21a27dcac11a696a28d35a20d32e5381faa10e43 Merge: 379138076 49de07045 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:55:46 2024 -0700 fixed conflicts commit 3791380764fa0ddffeb94d5c5b14d1ae2357bab6 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:52:47 2024 -0700 remove unused uses commit 7a0f79ecd222b23f9e874c354b5881dcaba9d2db Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:51:22 2024 -0700 remove test route commit 97a449e80ece3e553ec12064e74eae9e291f30f6 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:50:13 2024 -0700 removes instanceof User check commit e65942064e3b555885e575aa22315ff02801bde9 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:45:29 2024 -0700 send emails even if target has no email commit 49de07045ad48893daad9ea116b517145a711433 Merge: 7e996c40f 73772a013 Author: snipe <[email protected]> Date: Thu Oct 31 17:53:17 2024 +0000 Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs Fixed MS Team Notifications to utilize workflows after deprecation commit 7e996c40f5770b608b36af035c0118c83fd07864 Merge: 73e8f160c 69e74bbdd Author: snipe <[email protected]> Date: Thu Oct 31 02:51:42 2024 +0000 Merge pull request #15758 from snipe/jerm/fix-deprecation-warning Fix ${var} deprecation warning in License model commit 69e74bbdd39201fad43216a0520d771a58554021 Author: Jeremy Price <[email protected]> Date: Wed Oct 30 19:43:54 2024 -0700 Fix ${var} deprecation warning in License model When upgrading to php8.3 i started getting deprecation warning about using ${var} instead of {$var} in 2 places in License.php PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187 PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219 This simple fix switches the offending statements to {$var} syntax. commit 73e8f160cf078e3dbc69cf032a899cf6fa8d8739 Merge: f68df1fa0 bd23772fe Author: snipe <[email protected]> Date: Wed Oct 30 19:29:09 2024 +0000 Merge pull request #15756 from Godmartinz/cc-email-array changes `admin_cc_email` validation to allow an array commit bd23772fe96dc33db62c0fd286a095d4c99e2067 Author: Godfrey M <[email protected]> Date: Wed Oct 30 11:42:15 2024 -0700 changes cc_email validation to allow array commit 73772a01381ea654bf7cca48860e61551f363295 Author: Godfrey M <[email protected]> Date: Wed Oct 30 11:12:31 2024 -0700 change button text commit b26cae372cad814dac2a40467aaa122c58c93787 Author: Godfrey M <[email protected]> Date: Wed Oct 30 10:40:23 2024 -0700 merged in develop commit d6ba303f39c6b5d00aabfdc61a8aadd74c7ca7bf Merge: 9a0eee8f0 f68df1fa0 Author: Godfrey M <[email protected]> Date: Wed Oct 30 10:27:45 2024 -0700 Merge branch 'develop' into refacto_ms_teams_notifs # Conflicts: # app/Listeners/CheckoutableListener.php commit f68df1fa063125eb1b3f6e5a44b7e5156148c1e4 Author: snipe <[email protected]> Date: Wed Oct 30 13:21:13 2024 +0000 Made type searchable in action logs Signed-off-by: snipe <[email protected]> commit f0813e03bf95f3ab53e650ebb8f7128b7fc90164 Merge: 05875ebd1 58ff641f8 Author: snipe <[email protected]> Date: Wed Oct 30 12:18:41 2024 +0000 Merge pull request #15681 from Godmartinz/seperating_notification_n_mail Separated Notifications and Emails: Check ins and Check outs commit 05875ebd1fcea7366288de8833adfcedd66a309c Author: snipe <[email protected]> Date: Mon Oct 28 22:04:35 2024 +0000 Updated translations Signed-off-by: snipe <[email protected]> commit 9a0eee8f03fa06ba67476996741faffe5cf248e7 Author: Godfrey M <[email protected]> Date: Mon Oct 28 15:03:43 2024 -0700 revert testing variables commit 6128765d1f88215c9aa0e528ae2def74cba9bf4c Author: Godfrey M <[email protected]> Date: Mon Oct 28 15:03:03 2024 -0700 change wording on notification button commit c24f79c025cde958335981252d47285e347aae98 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:58:43 2024 -0700 update method comment commit e7c4343c902961268792bd4951930cec56959384 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:56:48 2024 -0700 readd checkin accessory format commit c0620c27ff74ceb66ce23a75431d8f2184eb91e0 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:30:34 2024 -0700 adds back laravels channel formats commit ed81973fe649355a687dfd5dc70b60d9fdb997c3 Author: Godfrey M <[email protected]> Date: Mon Oct 28 13:57:42 2024 -0700 adds notifications for deprecation commit 2d318b394c98954c51e9a6457ccf570487e47ae4 Merge: 86d784bd5 5c4971612 Author: snipe <[email protected]> Date: Mon Oct 28 18:41:49 2024 +0000 Merge pull request #15744 from marcusmoore/chore/action-tests-debugging Added the display of logs when tests fail in GitHub Actions commit b987b3dc005400e2c5042fc47be7d134e86c4314 Author: Godfrey M <[email protected]> Date: Mon Oct 28 10:57:48 2024 -0700 adds back the laravel channels package and applies a deprecated check commit 5c49716129950b19b503c0d05456ea83c2119755 Author: Marcus Moore <[email protected]> Date: Mon Oct 28 10:24:35 2024 -0700 Dump logs on test failure commit 86d784bd598393919a7b60a4845d6e47d1931de0 Author: snipe <[email protected]> Date: Mon Oct 28 13:37:59 2024 +0000 Fixed #15740 - use non-translated strings for icons Signed-off-by: snipe <[email protected]> commit 589f9cccdf1f4af8956f527728678e2b2316d723 Author: snipe <[email protected]> Date: Mon Oct 28 12:04:10 2024 +0000 Fixed #15732 Signed-off-by: snipe <[email protected]> commit 4d848e45e6c58aec7cb3d5fc32b5bdab7ddf1bd0 Author: snipe <[email protected]> Date: Mon Oct 28 11:55:24 2024 +0000 Fixed #15736 Signed-off-by: snipe <[email protected]> commit 58ff641f822eec54ebd40c9904c26034e215c550 Author: Godfrey M <[email protected]> Date: Thu Oct 24 22:53:53 2024 -0700 removed unused variables commit ce68f550d8edf633d01af476fd95f1161b474e44 Author: Godfrey M <[email protected]> Date: Thu Oct 24 16:01:17 2024 -0700 remove alert emails from cc commit 6f0c1b12b18901bc335bfdda328777399436386c Author: Godfrey M <[email protected]> Date: Thu Oct 24 15:04:54 2024 -0700 this adds check out message for consumables commit 278bc5e52a133189cfaf5348d709dcf229229e2f Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:59:10 2024 -0700 ads check in and checkout message for license seats commit cce75a81859d3ff36dee19cf7d0278c17b711549 Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:48:23 2024 -0700 adds check in and checkout messag for accessories commit e27ff13377f8f783b7230287736eeff63e24c75d Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:39:40 2024 -0700 adds check in and checkout message for assets commit 56365495a1c3b38443772a8ab6d3cc5f9815691c Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:26:42 2024 -0700 remove unnecessary fields in accessory checkout mail commit 18da80e6de14f285f59012c75696f55be617a2d4 Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:24:00 2024 -0700 fix checkoutable listener for microsoft teams commit 18760e3fa19d4d37cf16995a4ba5f0b56ba3771a Author: Godfrey M <[email protected]> Date: Thu Oct 24 12:21:51 2024 -0700 replaces teams notification package, passes integration test commit 57107c487cce4f5520b8cfb97408e8c9f02d6547 Author: Godfrey M <[email protected]> Date: Thu Oct 24 09:40:10 2024 -0700 fixed last test, definetly the last test commit dfc63641dca2b0a19f632f73733c5bf015517815 Merge: 07a51ec8b b6340532d Author: snipe <[email protected]> Date: Thu Oct 24 11:40:50 2024 +0100 Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure Fix multi create partial failure (fixes: [RB-18591]) commit 07a51ec8b128aca554b44af9e9b030f284769650 Merge: e0ec6795b 727c0e458 Author: snipe <[email protected]> Date: Thu Oct 24 10:03:10 2024 +0100 Merge pull request #15712 from Godmartinz/fix_import-progress-bar Upgraded `livewire v3.5.9 => v3.5.12` commit 6329f5b87e9dd2ff852073aa290e2930b2f78c10 Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:33:23 2024 -0700 removed unused variable from test commit e0ec6795b57406e100fc80af4b5799eb6b00b757 Author: snipe <[email protected]> Date: Thu Oct 24 01:27:50 2024 +0100 Use crucial for seeded data Signed-off-by: snipe <[email protected]> commit 15073a0d3885dc18609158943254317a2394d9d7 Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:27:37 2024 -0700 last test to fix commit a80c09c16d256d67592e35fdde2bd165ff7090bb Merge: ab3b9c451 5509d756b Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:23:55 2024 -0700 Merge branch 'develop' into seperating_notification_n_mail commit 5509d756b7d410f5ec98c599c87ad530003b2cb4 Merge: 55ba6279a b16a978f1 Author: snipe <[email protected]> Date: Thu Oct 24 01:12:11 2024 +0100 Merge pull request #15722 from Godmartinz/fix_component_factory Fixed Component Factory: use manufacturer factory for `manufactuer_id` commit b16a978f1b5c11c949f9caff4e297628a21d0511 Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:25:51 2024 -0700 uses manufacturer factory for manufactuer_id commit ab3b9c45106fb68522f3832863f6e16c8f4856f7 Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:24:01 2024 -0700 remove unnecessary code from checkinasset notification commit 2cc2b2b1dfc3c4040a223c052d4cfff0175b3f0c Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:06:27 2024 -0700 apply array_filter to cc emails to prevent errors commit 62d06b44d634155aff0035dd4340a03f86479918 Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:43:42 2024 -0700 set fallback from email address to service.snipe-it.io commit f29a3831796ea5b8e73e17bb4a45919701f221bd Merge: fd74c3510 55ba6279a Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:15:14 2024 -0700 Merge branch 'develop' into seperating_notification_n_mail # Conflicts: # app/Notifications/CheckoutConsumableNotification.php commit fd74c35102b19ec99118c84e6e8339003936aa0e Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:08:29 2024 -0700 remove old notify by mail from consumable notification commit c681946b1df9f27242d03ae0dcd2342b1b11fdd3 Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:05:39 2024 -0700 added component markdown changes commit 257d25bd9eb1a3114c57c87aad90debc389543b6 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:56:54 2024 -0700 removed import notification from test, feature is not present in project commit 6c34a5c52c8e5391dab246c69a41ad118cfb0cc5 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:54:21 2024 -0700 conditionally check cc emails, initiate variables commit 1b5f4415ae11de482d79f3889db5e71b33e70f99 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:44:45 2024 -0700 corrected cc email behavior commit 55ba6279a4f841d8c3f800bec90b52067e403fc5 Author: snipe <[email protected]> Date: Wed Oct 23 19:14:17 2024 +0100 Use trans_choice on alert menu Signed-off-by: snipe <[email protected]> commit a9eea830e30f75a4b46648d3bf99d9aa54f07c99 Author: snipe <[email protected]> Date: Wed Oct 23 19:05:34 2024 +0100 Added manufacturer and model number to component seeders Signed-off-by: snipe <[email protected]> commit af564935d5405e545412210a8a9cfb90c1836948 Merge: d58f87862 3ee76be7e Author: snipe <[email protected]> Date: Wed Oct 23 17:56:04 2024 +0100 Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components Fixed #15695 - Added manufacturer and model_number to components commit 3ee76be7e37311fc1d835ca8350fbdb8481b6d23 Author: snipe <[email protected]> Date: Wed Oct 23 17:50:22 2024 +0100 Added manufacturer and model_number to components Signed-off-by: snipe <[email protected]> commit d58f87862c8b9dedc65b85f9e37601e6aa366a90 Merge: 5da3ce356 0b6859c49 Author: snipe <[email protected]> Date: Wed Oct 23 15:09:50 2024 +0100 Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable Fixed #15717 - Added ability to checkout consumables in variable qty via API commit 0b6859c49180c0cb76fa9a7fbdb87286d82815b1 Author: snipe <[email protected]> Date: Wed Oct 23 15:05:35 2024 +0100 Added ability to checkout consumables in variable qty Signed-off-by: snipe <[email protected]> commit 1e9922a0b08cf2ee0d14a10b734e4c44dd9942c7 Author: Godfrey M <[email protected]> Date: Tue Oct 22 16:14:36 2024 -0700 fix moar tests commit ead27accacaefb08f0ed990c7d28843475d757e8 Author: Godfrey M <[email protected]> Date: Tue Oct 22 15:45:52 2024 -0700 fixed accessory tests and notifiable target commit 727c0e458ceccc59f62667e28bb80204c219569c Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:34:39 2024 -0700 remove translation commit 870dc747db51fa7e0f0ea7d4fac9d857f10191cd Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:27:32 2024 -0700 oops commit 0fb3d83fac1df5f800da60a6471017010edea78b Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:26:54 2024 -0700 revert controller change commit 0d59ccd6a66cf15a55afc1b92be8ab5e2a3679cb Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:23:26 2024 -0700 upgraded livewire v3.5.9 => v3.5.12 commit 5da3ce3564c1ea8860e101ddbebe15c825b6884a Merge: c3bbca30a 5ecd2b629 Author: snipe <[email protected]> Date: Tue Oct 22 22:10:20 2024 +0100 Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes Fixed custom field checkboxes on asset edit page commit c3bbca30adb33ebc15c7d2c27675d338a27928ef Merge: dccb788a8 37f14fff3 Author: snipe <[email protected]> Date: Tue Oct 22 22:07:50 2024 +0100 Merge pull request #15710 from snipe/fixes_lightbox_for_avif Fixes #15701 - load avif files properly in lightbox commit 37f14fff3b98ab23654706b2087eae2261e2931a Author: snipe <[email protected]> Date: Tue Oct 22 22:07:28 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit eb6c51fabdf755b488493bff2b1c4d52a3ba8b3f Author: snipe <[email protected]> Date: Tue Oct 22 22:04:57 2024 +0100 Fixes #15701 - load avif files properly in lightbox Signed-off-by: snipe <[email protected]> commit 5ecd2b62935489df9f6228d378d42a03cfcb17f0 Author: Marcus Moore <[email protected]> Date: Tue Oct 22 14:04:05 2024 -0700 Default checkbox elements to an empty array commit 1e31592c553e49eab175531cf9aa3b02ce738812 Author: Godfrey M <[email protected]> Date: Tue Oct 22 11:49:06 2024 -0700 messing with the tests commit dccb788a88497608289fbaf08aec8a106d9a8b49 Merge: 5e1d792bb d10fe77ee Author: snipe <[email protected]> Date: Tue Oct 22 17:44:30 2024 +0100 Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user Updated `Company::getIdForCurrentUser()` to return null in certain scenarios commit d10fe77ee7d6445379445024d5f6714159554652 Merge: e1882ee6d 5e1d792bb Author: Marcus Moore <[email protected]> Date: Tue Oct 22 09:38:31 2024 -0700 Merge branch 'develop' into fixes/get-id-for-current-user commit 5e1d792bbaf5cdc140ecb4c53b054d20949a546b Merge: 9cf71976f 780ed91a1 Author: snipe <[email protected]> Date: Tue Oct 22 16:52:28 2024 +0100 Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower() commit 9cf71976f6b2865411f6fa8ae257c10c3e8a7e4c Author: snipe <[email protected]> Date: Tue Oct 22 16:51:42 2024 +0100 Fixed #15706 - Removed purchase order number from asset import Signed-off-by: snipe <[email protected]> commit 15745d9737f551ba0f04092c352ce65f5012870a Merge: bd97955b9 3f74ff25d Author: snipe <[email protected]> Date: Tue Oct 22 16:39:44 2024 +0100 Merge pull request #15566 from Godmartinz/status-label-error-message Fixed Status Labels Error Message commit bd97955b9e21294aa409cdb9b701bf90261d3863 Author: snipe <[email protected]> Date: Tue Oct 22 16:38:46 2024 +0100 Bumped hash Signed-off-by: snipe <[email protected]> commit 252d99421ca4dd707d456fc424f30316b10cd86d Merge: 5767a98ad db8170162 Author: snipe <[email protected]> Date: Tue Oct 22 16:26:48 2024 +0100 Merge pull request #15689 from snipe/better_handle_inline_files Better handle inline files in file listing commit 5767a98ad8abe738c4a18a9c33290ac4e3f5ceb1 Merge: 0c820cbc0 524a44272 Author: snipe <[email protected]> Date: Tue Oct 22 16:26:23 2024 +0100 Merge pull request #15649 from bryanlopezinc/ImproveImporting Improve import performance commit 0c820cbc0da0c6bb05ec4f685a7eeeaa5156bf7d Merge: 147fcfb8e 3153bbb13 Author: snipe <[email protected]> Date: Tue Oct 22 15:56:12 2024 +0100 Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue Custom Field Existence Validation Issue commit db8170162174b5688372e50005c5bd18b262508f Merge: a05c33feb 147fcfb8e Author: snipe <[email protected]> Date: Tue Oct 22 15:44:24 2024 +0100 Merge branch 'develop' into better_handle_inline_files commit a05c33febfb49b6a845e762817dd20e16db71d0e Author: snipe <[email protected]> Date: Tue Oct 22 15:43:19 2024 +0100 Squashed commit of the following: commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a Merge: 58a3d09b5 fdcc17ca2 Author: snipe <[email protected]> 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 58a3d09b5fd7ffa979bfb9553cacbb24ae452462 Merge: 30a06a594 867fa2f36 Author: snipe <[email protected]> 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 30a06a594289571097e2d30901546bc9a17b4bac Merge: 6c6af78e0 ce3086317 Author: snipe <[email protected]> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1 Merge: 9b06bbb6c 3f79fd7ea Author: snipe <[email protected]> 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 3f79fd7ea744bd18134785c37b87a2f4bcff0347 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01 Merge: 46ad1d072 d7f70146f Author: snipe <[email protected]> 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 ce30863177e499a29f395c9c88ce9c67bd669a74 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commit d7f70146f4a886795ddb118cc2f71bbadded72dc Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d Author: Marcus Moore <[email protected]> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632 Merge: bcb4bd9eb 3cf746d7d Author: snipe <[email protected]> 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 bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21 Merge: 250037540 f50ccbcc4 Author: snipe <[email protected]> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7 Author: Tobias Regnery <[email protected]> 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 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3 Author: Brady Wetherington <[email protected]> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit 6b7af802af41c92a36e77605415869c9e72ec192 Author: Brady Wetherington <[email protected]> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commit fdcc17ca2c33d38a7af505c99d9547e014f5f783 Author: Tobias Regnery <[email protected]> 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 <[email protected]> commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a Merge: 58a3d09b5 fdcc17ca2 Author: snipe <[email protected]> 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 58a3d09b5fd7ffa979bfb9553cacbb24ae452462 Merge: 30a06a594 867fa2f36 Author: snipe <[email protected]> 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 30a06a594289571097e2d30901546bc9a17b4bac Merge: 6c6af78e0 ce3086317 Author: snipe <[email protected]> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1 Merge: 9b06bbb6c 3f79fd7ea Author: snipe <[email protected]> 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 3f79fd7ea744bd18134785c37b87a2f4bcff0347 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01 Merge: 46ad1d072 d7f70146f Author: snipe <[email protected]> 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 ce30863177e499a29f395c9c88ce9c67bd669a74 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commit d7f70146f4a886795ddb118cc2f71bbadded72dc Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit e1882ee6d2a78506abfd371ba6e0d592ac487181 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:21:45 2024 -0700 Add comment commit 7eee239378f1b4318557886d1e022540a10977af Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:20:28 2024 -0700 use is_numeric instead of is_int commit 4188849ae17d52dd9befd349b56419eaea9f5287 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:19:48 2024 -0700 Add failing test case commit 787e651778dbc04acf66cd77faf0386f5a137534 Author: snipe <[email protected]> Date: Mon Oct 21 16:52:21 2024 +0100 Fixed todos with log message Signed-off-by: snipe <[email protected]> commit ef9b6e3b072f88bfec52c4ec930816d30eb34cb9 Author: snipe <[email protected]> Date: Mon Oct 21 16:34:54 2024 +0100 Code cleanup Signed-off-by: snipe <[email protected]> commit 06c599cc17ca8f7a29515564e5cac9be905e338d Author: snipe <[email protected]> Date: Mon Oct 21 16:34:03 2024 +0100 Added method to show or download file Signed-off-by: snipe <[email protected]> commit 61053238777c38579c6188d2380f0cb7b99ae59e Author: snipe <[email protected]> Date: Mon Oct 21 14:11:20 2024 +0100 Use plural class name for src Signed-off-by: snipe <[email protected]> commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d Author: Marcus Moore <[email protected]> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit a8d853c44a38b50db05884843c614fe7b7342d60 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:26:27 2024 -0700 Remove focus group tags commit 7e1b47708e7d44a2ad3bc7af93a38fc2dc6e72a9 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:18:41 2024 -0700 Fix failing test ensuring company id is an integer commit 979e4502ffbadab5978d38633fe06aa96eed698a Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:14:39 2024 -0700 Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company commit ff113ef523f77fb887b939a23de3936f603812a6 Author: Godfrey M <[email protected]> Date: Thu Oct 17 14:56:58 2024 -0700 typo fix commit 99dd51a965c7a02f8b24deddd1c233fac05f8465 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:53:18 2024 -0700 Improve name commit 15c2169477e9691216d9f3fc2b8b8ddd2d8ee21a Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:31:05 2024 -0700 Scaffold additional tests commit 50fa6ce33588f466e90829fb59e8d91411c8d736 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:12:22 2024 -0700 Scaffold tests commit 7ae76e7db9be7943ca473ab9ef30bda27b166aac Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:55:03 2024 -0700 remove viewdata array from 3 tests commit b98058ca98e02b865fdf1488e83a49d4bf7df9c8 Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:48:26 2024 -0700 fix tests pt 3 commit 83e8186d9e261efdde81ac56deeb9a799fdaa1e7 Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:39:56 2024 -0700 fix assertSent to AssertNotSent on some test commit cdd4fef7df6d49951aaa09ca597995b90a26f2ad Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:34:55 2024 -0700 attempt to fix tests p2 commit dceb8e305f55be79f3755a48bc3b4165dc79d43e Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:11:39 2024 -0700 attempt to fix tests commit 123cdeb858a8148cd8210847fcb39e635b7dc2bf Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:39:48 2024 -0700 add email check to listener commit 496b44e887078b6110f4e8e97e2b04bf22240677 Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:28:57 2024 -0700 merged composer lock from dev commit a690cc3582237fb6d40f8eaa3e3e83e7822574fc Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:26:55 2024 -0700 removing my composer stuff again..for the last time commit ceb3f5cea629ed68fa4bfc119fefa2166456499c Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:19:50 2024 -0700 added mail-gun and http-client to 8.1 commit 65735a31f178c8bd4e1efabc7190a30e3500f5fd Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:18:34 2024 -0700 removed symfony/mailgun-mailer symfony/http-client commit 285d6897cf83d2cac7e791fa50d23ec88f116849 Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:05:36 2024 -0700 added a coulple test adjustments and moved mail send logic to listener commit 159a1d3f4356141844767c2c2593252b98df3b11 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 11:48:55 2024 -0700 Be more explicit commit d1149730be99fdc8e59e91ce3b02c863a08d4aa1 Author: snipe <[email protected]> Date: Thu Oct 17 16:31:17 2024 +0100 Apply blade component to files views Signed-off-by: snipe <[email protected]> commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632 Merge: bcb4bd9eb 3cf746d7d Author: snipe <[email protected]> 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 780ed91a1098ed9af2a5f8f95d6ac87a14e55b20 Author: NebelKreis <[email protected]> Date: Thu Oct 17 16:09:25 2024 +0200 Fix: Removed strtolower() from dashboard titles This fix ensures the correct capitalization in different languages. commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21 Merge: 250037540 f50ccbcc4 Author: snipe <[email protected]> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7 Author: Tobias Regnery <[email protected]> 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 9a794833755ff5fb335ab6cf1e118a0d411b021e Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:59:18 2024 -0700 removed namespaces from routing commit ed6034065b34797ba531782a207fe49384e0f465 Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:47:36 2024 -0700 removed test route commit a7754c1a7fd6559b5d512fbd520556c9d10b76aa Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:46:52 2024 -0700 fixed asset checkout markdown, and notifiable variable commit 0e9b3c9119e77259ed2f8740ae98e9149936bd51 Author: snipe <[email protected]> Date: Thu Oct 17 00:27:39 2024 +0100 Check for existence before trying to get the icon Signed-off-by: snipe <[email protected]> commit 4933aa5784e3a86021136775055d81eed7b3c966 Author: snipe <[email protected]> Date: Thu Oct 17 00:27:04 2024 +0100 Add StorageHelper to app config Signed-off-by: snipe <[email protected]> commit d67addc69ee2fde2fdc9d90e1eefa13f1c1e4f26 Author: snipe <[email protected]> Date: Thu Oct 17 00:21:43 2024 +0100 Removed filetype column - it’s dumb Signed-off-by: snipe <[email protected]> commit 02c80ff18af48c016433807b4bdc0f384ffde41a Author: snipe <[email protected]> Date: Thu Oct 17 00:18:40 2024 +0100 Added comment Signed-off-by: snipe <[email protected]> commit c01190fac279b38d8ee74a636d8cf9c2fd7a7285 Author: snipe <[email protected]> Date: Thu Oct 17 00:18:34 2024 +0100 Conditionally add content-type Signed-off-by: snipe <[email protected]> commit 017884f8432abd3afed7397a7967bb2813df0262 Author: snipe <[email protected]> Date: Thu Oct 17 00:09:09 2024 +0100 Added checks and filetype display Signed-off-by: snipe <[email protected]> commit c49921f50fc54785b87d59e6265b29088bba48fe Author: snipe <[email protected]> Date: Thu Oct 17 00:08:54 2024 +0100 Removed unused (maybe?) API endpoint Signed-off-by: snipe <[email protected]> commit c49abb6aeafbfbf43ebcb7e1a9c565288b72b9d9 Author: snipe <[email protected]> Date: Thu Oct 17 00:08:38 2024 +0100 Refactor the UserFilesController show method for simpler inlining Signed-off-by: snipe <[email protected]> commit ccd20194484313c6e53bf357687ef8a29a4fffe6 Author: snipe <[email protected]> Date: Thu Oct 17 00:08:04 2024 +0100 Removed unusded use statements Signed-off-by: snipe <[email protected]> commit 96191a5e9391e86701095b74fefc9064e4bf74d3 Author: snipe <[email protected]> Date: Thu Oct 17 00:07:54 2024 +0100 Added method to decide if the file should be inlinable Signed-off-by: snipe <[email protected]> commit c56affd66345a92f64fb8c7451ced58b5340dd70 Author: snipe <[email protected]> Date: Thu Oct 17 00:07:37 2024 +0100 Added SVG icon Signed-off-by: snipe <[email protected]> commit 02bda3cd9598d77ddd2c68f67f589f82e0af37b3 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:53:05 2024 -0700 adds Checkout Consumable mailable and slackwebhook channel to notifs commit 02ff646da4388422d260ed50d8e93ea7bc57dab0 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:44:45 2024 -0700 adds checkin license mailable commit 4becdca8aa792957243e5ca9a3dcf04cfa3ee522 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:39:20 2024 -0700 removes toMail from license notificaqtion commit 2584d603445bb0a82e722cd8b7a3dbf7f1c1d020 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:38:49 2024 -0700 adds Licenses seat checkout Mailable commit f1d83a3f281a7d17c2b8ca52ccaf8403cac4d246 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:30:53 2024 -0700 forgot to add asset checkout markdown to projet commit c39df34bdfabb2acde4ab8aaba01cf5c65582675 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:29:50 2024 -0700 forgot to add accessory mail to project commit dcdf600b785501d960ee6a8f99a46f9a6ba90b9f Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:27:34 2024 -0700 adds Checkin and Checkout mailables and listner logic commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3 Author: Brady Wetherington <[email protected]> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit 6b7af802af41c92a36e77605415869c9e72ec192 Author: Brady Wetherington <[email protected]> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commit 9710436d54fc23e79bf96b61430f3f0f3345581a Author: Godfrey M <[email protected]> Date: Wed Oct 16 13:12:07 2024 -0700 adds Mailables for asset checkin and out commit 16cffe9a9dd0cbce4f38d161a2b4cbebeaffde1c Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:53:35 2024 -0700 simplified checkout webhook call commit 9e1b86f586f2942312105b0b37d69ee8ec34ca17 Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:51:19 2024 -0700 sends checkout notification via webhook commit 3ab2521cb0b8f61cb42a7b205a7836d7950046a6 Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:21:33 2024 -0700 email comes through, no picture and html markup appear though. commit 604a9644624a52cd1aa965d92d36aa936840265d Author: Marcus Moore <[email protected]> Date: Wed Oct 16 11:52:24 2024 -0700 Improve scenario descriptions commit 2f72c66614676efd205585e25d909424b136d869 Author: Marcus Moore <[email protected]> Date: Wed Oct 16 11:30:06 2024 -0700 Add additional case commit fdcc17ca2c33d38a7af505c99d9547e014f5f783 Author: Tobias Regnery <[email protected]> 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. commit cba1a560408c821c4112a2548a6df20755536efd Author: Marcus Moore <[email protected]> Date: Tue Oct 15 17:38:11 2024 -0700 Improve readability? commit d9afde4610dd0527fb19fd52093f2d654ce36430 Author: Marcus Moore <[email protected]> Date: Tue Oct 15 17:00:22 2024 -0700 Write failing test commit 9f06a0e441940606de32279c428b24a8957186fb Author: Godfrey M <[email protected]> Date: Tue Oct 15 14:01:28 2024 -0700 handle some edge cases, null values clean up variable names commit 42095c0167b661d0f7a996a3bd17e0c0cfac5750 Author: Marcus Moore <[email protected]> Date: Tue Oct 15 13:02:22 2024 -0700 Add reference link commit f8476f713396027e7149e7306db2bfcc710d5e5c Author: Godfrey M <[email protected]> Date: Tue Oct 15 12:49:52 2024 -0700 finished the construct and mail call in the listner commit b29d032bf0250941a2a968c85c227bbee9449c81 Author: Godfrey M <[email protected]> Date: Tue Oct 15 11:28:27 2024 -0700 adds checkoutAssetMail class, and content method commit 250037540038cb140c12cfe4cbf2aa9a7c0ffbdc Merge: 16c8264e7 e4e1d0d50 Author: snipe <[email protected]> Date: Tue Oct 15 17:34:35 2024 +0100 Merge pull request #15672 from uberbrady/ldap_location_fixes Clean up how we use the '$location' in LDAP sync command commit e4e1d0d50a4a3e418d1b736dac6221d437d88b66 Author: Brady Wetherington <[email protected]> Date: Tue Oct 15 17:26:31 2024 +0100 Clean up how we use the '$location' in LDAP sync command commit 16c8264e766b56e24c33fea740847a48a91d2cc3 Merge: 914a64720 0ae9ce0aa Author: snipe <[email protected]> Date: Tue Oct 15 16:42:34 2024 +0100 Merge pull request #15671 from snipe/bug/sc-27147 Bug/sc 27147 commit 0ae9ce0aa9fe06b850183f15a668f366f6128565 Author: snipe <[email protected]> Date: Tue Oct 15 16:41:45 2024 +0100 Cannot sort by updated at on Users [sc-27147] Signed-off-by: snipe <[email protected]> commit 50b8f180b3d1315e48d8d545c3b9c7153a768bdf Author: snipe <[email protected]> Date: Tue Oct 15 16:41:39 2024 +0100 More logical grouping in allow_columns Signed-off-by: snipe <[email protected]> commit 914a647204843f784edeffc358d50bd0175d2d14 Merge: 69b6080bd e9225ff3e Author: snipe <[email protected]> Date: Tue Oct 15 12:47:15 2024 +0100 Merge pull request #15669 from snipe/remlove_ou_requirenedess Fixed #15663 - remove requiredness for OU commit e9225ff3ea6952f83ec0cbda2749f0756d6f1de7 Author: snipe <[email protected]> Date: Tue Oct 15 12:43:10 2024 +0100 Switch to regular HTML for input form field Signed-off-by: snipe <[email protected]> commit d0d4159088e4452ff18dcfb80e3746475caedc88 Author: snipe <[email protected]> Date: Tue Oct 15 12:42:09 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit 69b6080bd865c6db78577d256627b894b28550cd Merge: ddead359d b997d728f Author: snipe <[email protected]> Date: Tue Oct 15 10:31:29 2024 +0100 Merge pull request #15666 from snipe/updated_readme_llm Added LLM note commit b997d728fb508f00b28d1f5db7bdd7ecd6177c0b Author: snipe <[email protected]> Date: Tue Oct 15 10:30:34 2024 +0100 Added LLM note Signed-off-by: snipe <[email protected]> commit ddead359d055f1ebc52b2e3bbcf4004f8233800d Merge: 0d35335da f3c4e5566 Author: snipe <[email protected]> Date: Mon Oct 14 14:29:34 2024 +0100 Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2 Refactor asset creation with API commit f3c4e556675d7dcd7920807bced18b3416b0b2ec Author: Tobias Regnery <[email protected]> Date: Mon Oct 14 15:14:41 2024 +0200 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. commit 0d35335da7df0d601d4221d1c2073478d3ab55b2 Author: snipe <[email protected]> Date: Fri Oct 11 16:06:17 2024 +0100 Removed debugging Signed-off-by: snipe <[email protected]> commit feaa71430493b46870203f31d0540a39b2355411 Author: snipe <[email protected]> Date: Fri Oct 11 14:23:57 2024 +0100 Nicer disabled button Signed-off-by: snipe <[email protected]> commit e1a70023b167999defc72adf3d837d8ff2679e2a Merge: de62359c6 fb4fe3004 Author: snipe <[email protected]> Date: Fri Oct 11 11:45:48 2024 +0100 Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport commit de62359c6734bdd01c1d3823b723be671ff0595b Merge: 12bda8fc7 3dc64cc5e Author: snipe <[email protected]> Date: Fri Oct 11 11:29:34 2024 +0100 Merge pull request #15533 from marcusmoore/testing/fmcs-accessories Added tests for accessory api controller commit 12bda8fc7b756e7d930ed1a14b94f130d39f673a Merge: 8aa298f6b b054017c9 Author: snipe <[email protected]> Date: Fri Oct 11 11:27:18 2024 +0100 Merge pull request #15653 from snipe/15651_admin_user_on_maintenances Fixed #15651 - admin user now displaying on maintenances page commit fb4fe3004906acfc53a0d26e5e62569cb078d1e8 Author: Tobias Regnery <[email protected]> Date: Fri Oct 11 12:09:09 2024 +0200 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(). commit b054017c9f422d37c32b137b49ce04dc2a4e9533 Author: snipe <[email protected]> Date: Fri Oct 11 11:16:24 2024 +0100 Fixed #15651 - admin user now displaying on maintenances page Signed-off-by: snipe <[email protected]> commit 524a44272452d701e9da4d2e77ca10780f019f96 Author: bryanlopezinc <[email protected]> Date: Thu Oct 10 23:32:07 2024 +0100 Improved import performance commit 8aa298f6b017c27feb5787a3d58dd9cd5023f419 Merge: 1f3465773 b5b93fdd3 Author: snipe <[email protected]> Date: Thu Oct 10 12:30:53 2024 +0100 Merge pull request #15644 from snipe/form_requests_for_settings Form requests for settings commit 1f34657734f075286e6007c75cfb764637cb708c Author: snipe <[email protected]> Date: Thu Oct 10 12:30:35 2024 +0100 Fixed test Signed-off-by: snipe <[email protected]> commit 0856ee648ec8b55cf17cbbf46fddb8fb0cc05a21 Merge: 94a074a19 1dafc970d Author: snipe <[email protected]> Date: Thu Oct 10 12:23:14 2024 +0100 Merge pull request #15648 from snipe/update_packages Updated livewire to 3.5.2 commit 1dafc970dfb517d710b57a39c25470249deeeb6f Author: snipe <[email protected]> Date: Thu Oct 10 12:19:57 2024 +0100 Updated livewire to 3.5.2 Signed-off-by: snipe <[email protected]> commit 94a074a193cdcba198613906641cba57e3703890 Merge: 2d49e1eff b34a7c8aa Author: snipe <[email protected]> Date: Thu Oct 10 01:11:10 2024 +0100 Merge pull request #15601 from snipe/check_db_on_healthcheck Fixed #15439 - check database on healthcheck commit 2d49e1eff207dc37662d5a0f1017cf498c6f50c7 Merge: 705bc6f0c c2663ea1e Author: snipe <[email protected]> Date: Thu Oct 10 01:09:11 2024 +0100 Merge pull request #15637 from akemidx/bug/sc-26614 FIXED: Badge counter showing deleted assets on User page commit 705bc6f0c0d5582cb8e3dcaed97561bfd613894f Merge: 3ee571374 67a605c9a Author: snipe <[email protected]> Date: Thu Oct 10 01:08:25 2024 +0100 Merge pull request #15642 from uberbrady/fix_bulk_checkout Fix bulk checkout to users, assets, and locations commit b5b93fdd3a75bf72712b927b5c59c1e249c47f16 Author: snipe <[email protected]> Date: Thu Oct 10 00:27:00 2024 +0100 Make ldap username required Signed-off-by: snipe <[email protected]> commit d9432baf7ad497e6b7104990401a4074b1d6fe80 Author: snipe <[email protected]> Date: Wed Oct 9 23:51:20 2024 +0100 Mlore ldap style improvements Signed-off-by: snipe <[email protected]> commit 90be2a4498a71d55080663875e29ebd67cfdc433 Author: snipe <[email protected]> Date: Wed Oct 9 22:26:30 2024 +0100 Use newer naming convention for errors Signed-off-by: snipe <[email protected]> commit 3886da8941b01af7d4f7c63a141ea2bde49854c3 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:49 2024 +0100 Remove form request from get LDAP method Signed-off-by: snipe <[email protected]> commit 130e0c6242e2590cb44d60437d8b7c0f4e3c7f67 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:37 2024 +0100 More validation Signed-off-by: snipe <[email protected]> commit 4361a108183b8b1ed473be8bfe8b7c27eda7a84c Author: snipe <[email protected]> Date: Wed Oct 9 22:15:30 2024 +0100 Added string Signed-off-by: snipe <[email protected]> commit aa8048ac15fc931825083070099b0ceee550f281 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:25 2024 +0100 Blade changes for ldap Signed-off-by: snipe <[email protected]> commit 710e738e8ef0d39f0ead49f8dd0604d201a11936 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:16 2024 +0100 Fixed tests Signed-off-by: snipe <[email protected]> commit 3705b914399054e29d4964371ca638524a427bed Author: snipe <[email protected]> Date: Wed Oct 9 20:51:34 2024 +0100 Added more validation Signed-off-by: snipe <[email protected]> commit 707bdad192416c9bd6be3fd221913df282601d55 Author: snipe <[email protected]> Date: Wed Oct 9 20:33:56 2024 +0100 Updated test Signed-off-by: snipe <[email protected]> commit 242fe33f973131463c5ebb297b4d05aa50974c3c Author: snipe <[email protected]> Date: Wed Oct 9 20:33:42 2024 +0100 Switch to regular HTML input Signed-off-by: snipe <[email protected]> commit ded79469c1cdfe7ce8421b872da9945cf9ff569d Author: snipe <[email protected]> Date: Wed Oct 9 20:33:29 2024 +0100 Remove unused controller method Signed-off-by: snipe <[email protected]> commit d9fbf330e5302355b4c59d14fec7311e2375fb24 Author: snipe <[email protected]> Date: Wed Oct 9 20:33:15 2024 +0100 Fixed translations Signed-off-by: snipe <[email protected]> commit 2cb9ac26cd4b5b79fc9c813a76a8a0043ef2fa6c Author: snipe <[email protected]> Date: Wed Oct 9 19:57:04 2024 +0100 Renamed test Signed-off-by: snipe <[email protected]> commit 185bc966e6c699e9ff4930a254c5c79405c0b836 Author: snipe <[email protected]> Date: Wed Oct 9 19:46:47 2024 +0100 Cleaned up use statements in tests Signed-off-by: snipe <[email protected]> commit a7f7e4938ffb99217f9cbbc70cdf08a4a9bbf9cd Author: snipe <[email protected]> Date: Wed Oct 9 19:31:56 2024 +0100 Added form action Signed-off-by: snipe <[email protected]> commit 2883e791938812a54ad2e4865cfcabd40bbb5589 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:55 2024 +0100 Removed unecessary assets creation Signed-off-by: snipe <[email protected]> commit 9c4191ae0ac4c4d338f77cb6bd3ea71c66f0844d Author: snipe <[email protected]> Date: Wed Oct 9 19:30:42 2024 +0100 Basic tests Signed-off-by: snipe <[email protected]> commit 3a77b83e9c71bf60f52e4900670047764b453e62 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:34 2024 +0100 Added space Signed-off-by: snipe <[email protected]> commit d9be2b5a5e5cff6266c0ee54b5d2261885459f69 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:25 2024 +0100 Trying to use the email_array translation Signed-off-by: snipe <[email protected]> commit 69c43c610c87babcf3919a8bac8ac73f6533330b Author: snipe <[email protected]> Date: Wed Oct 9 19:30:00 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit 4f957bcf7191ce17bbc33b958a5b60968fb3264f Author: snipe <[email protected]> Date: Wed Oct 9 18:34:53 2024 +0100 Required flag Signed-off-by: snipe <[email protected]> commit 5cda7cce4830626f594de8cb4d4291c161916351 Author: snipe <[email protected]> Date: Wed Oct 9 18:21:40 2024 +0100 Only accept a positive number for thresholds Signed-off-by: snipe <[email protected]> commit 41b94e7128c68af71f53e95ddd8bfbc242cde198 Author: snipe <[email protected]> Date: Wed Oct 9 18:19:26 2024 +0100 Fixed form input group Signed-off-by: snipe <[email protected]> commit aa55fa6ff496d279ca271b4614a5f778e73ae808 Author: snipe <[email protected]> Date: Wed Oct 9 18:16:34 2024 +0100 Switch to form requests for settings Signed-off-by: snipe <[email protected]> commit 67a605c9a5cf01f6028bf981a35664a399b43347 Author: Brady Wetherington <[email protected]> Date: Wed Oct 9 17:01:26 2024 +0100 Fix bulk checkout to users, assets, and locations commit c2663ea1e090c089ef58db872f9f2676891611e9 Author: akemidx <[email protected]> Date: Tue Oct 8 16:38:33 2024 -0400 withouttrashed commit 3ee5713740c9944dbcd1233c7f35bf51c0b5ca36 Merge: ab8a22f77 56e7ea667 Author: snipe <[email protected]> Date: Mon Oct 7 23:13:15 2024 +0100 Merge pull request #15631 from snipe/test/importer-tests Add importer tests commit ab8a22f77e13ad86c4964787cfe9bf12d57c7a6f Merge: 26d7572bc 8c9132aff Author: snipe <[email protected]> Date: Mon Oct 7 22:56:23 2024 +0100 Merge pull request #15630 from marcusmoore/bug/sc-27028 Only show EULA when available on print users page commit 56e7ea6677ee9372a19adb30f8338995d9a245f3 Merge: 32551d55d 803532667 Author: snipe <[email protected]> Date: Mon Oct 7 22:29:35 2024 +0100 Merge pull request #15616 from marcusmoore/test/importer-test-updates Improve importer tests commit 26d7572bcc36030f5d0b62d432a4f6bfd965d962 Merge: 382ebef8c ee046a868 Author: snipe <[email protected]> Date: Mon Oct 7 22:28:53 2024 +0100 Merge pull request #15603 from marcusmoore/fixes/add-reguard Added `Model::reguard()` to importer commit 8c9132aff9be01a90ac53b16d87303bd912b24b0 Author: Marcus Moore <[email protected]> Date: Mon Oct 7 14:22:49 2024 -0700 Hide EULA text and button when nothing will be displayed commit 382ebef8ca069767d9e340c7def62ca920537a91 Merge: 2be88cb95 f76da4844 Author: snipe <[email protected]> Date: Mon Oct 7 21:26:21 2024 +0100 Merge pull request #15621 from sniff122/develop Docker Env: Change trusted proxies to RFC1918 commit 2be88cb95517c09cb962069fd41d19ee76fead33 Merge: 7fc498a59 3f36d5f9b Author: snipe <[email protected]> Date: Mon Oct 7 11:14:24 2024 +0100 Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users Removed duplicate JS and removed line break before user section commit 3f36d5f9b38d9adae796f01b930bccbe1b6406ed Author: snipe <[email protected]> Date: Mon Oct 7 11:08:02 2024 +0100 Removed duplicate CSS and removed line break before user section Signed-off-by: snipe <[email protected]> commit f76da48448e06a6008751bcf9b7148b15722b1b8 Author: Lewis Foster <[email protected]> Date: Sat Oct 5 18:27:42 2024 +0100 Docker Env: Change trusted proxies to RFC1918 commit 8035326675e9a479c030687dc5a8079fd43e34f5 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 16:53:19 2024 -0700 Add test commit dfdd85abb17422380499d20fe4596a759ff56e4c Author: Marcus Moore <[email protected]> Date: Thu Oct 3 15:14:07 2024 -0700 Remove unused imports commit 063ea1892b3fecdd52ad8cd353c39038a8087de7 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 15:02:03 2024 -0700 Add trait to clean up files after test runs commit e21305377549886099d21b67f49d2abbccc42d91 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:59:58 2024 -0700 Swap factory syntax commit 88d549e7c5ee8fd385d897be557dbbac60a66f73 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:40:37 2024 -0700 Remove unused data provider method commit 983a25aa5f9004e05f27713fbef6e8f9302bb772 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:39:54 2024 -0700 Simplify permission tests commit bde05d6ed9840d6e712e0f4a785f9c9166f352fd Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:15:49 2024 -0700 Use new() instead of times() commit b5ffe54bd07bd6a14216e993142e9086fbdee9e7 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:15:02 2024 -0700 Swap assertEquals parameter order commit 863c0a8b609d9c407bf7ed038bcb7db0e40dd4df Author: Marcus Moore <[email protected]> Date: Thu Oct 3 11:43:02 2024 -0700 Fix import_type for accessory state commit 32551d55d730271d6ab24b566b111d7e80a1e3b9 Merge: 7fc498a59 e807cfab8 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 11:39:21 2024 -0700 Merge pull request #15579 from bryanlopezinc/ImportTests Add Import data tests commit 7fc498a5977d975d0e349cf3d09e473369c5881b Merge: 78ca1026f cb281c640 Author: snipe <[email protected]> Date: Thu Oct 3 17:39:18 2024 +0100 Merge pull request #15613 from snipe/css_fixes_for_long_values Smarter word-wrapping on long text commit cb281c6408bb81dd0fbcb8f65e0ad6fea090c154 Author: snipe <[email protected]> Date: Thu Oct 3 17:33:46 2024 +0100 Tweaked line height Signed-off-by: snipe <[email protected]> commit f483cd448fdcf3dc75482a0e9029f0569fc3916d Author: snipe <[email protected]> Date: Thu Oct 3 17:27:37 2024 +0100 Smarter work-wrapping on long text Signed-off-by: snipe <[email protected]> commit 78ca1026fd4a02e949ac500cacd48ed2dd0b4ceb Merge: 3699d7936 722d5a58e Author: snipe <[email protected]> Date: Thu Oct 3 16:24:32 2024 +0100 Merge pull request #15612 from snipe/fixes_print_assigned_in_profile Fixes print assigned in profile commit 722d5a58e719886282f908a11420fa88f9fed4fc Author: snipe <[email protected]> Date: Thu Oct 3 16:19:38 2024 +0100 Added isset on users Signed-off-by: snipe <[email protected]> commit 7461c3e0ca2af18ed989a5905c84c5710213f1fb Author: snipe <[email protected]> Date: Thu Oct 3 16:19:27 2024 +0100 Change controller to assume a collection. (This is dumb, but whatever) Signed-off-by: snipe <[email protected]> commit 3c0f4181ae994e6e33c4c15adbb6704be921c99f Author: snipe <[email protected]> Date: Thu Oct 3 16:19:06 2024 +0100 Use the newer button style Signed-off-by: snipe <[email protected]> commit 3699d79363cb578ba0689f66cc512a84f8d143eb Merge: 54fbd0540 350b627ce Author: snipe <[email protected]> Date: Thu Oct 3 14:34:00 2024 +0100 Merge pull request #15610 from uberbrady/fix_numeric_sort_bug Fix numeric sort 'ambiguous order clause' error commit 350b627ce1a247b248845b8b85d2a802c8fb8f74 Author: Brady Wetherington <[email protected]> Date: Thu Oct 3 14:23:40 2024 +0100 Fix numeric sort 'ambiguous order clause' error commit ee046a86885deecf15601acd65ee97fac1f6b54e Author: Marcus Moore <[email protected]> Date: Wed Oct 2 10:50:40 2024 -0700 Add matching Model::reguard() commit b34a7c8aad07ce285e09cfcd4fb779c8c4295d3f Author: snipe <[email protected]> Date: Wed Oct 2 15:48:35 2024 +0100 Removed die() Signed-off-by: snipe <[email protected]> commit f92bf5dc2067cae2b533090f0c3a947d16fb4d50 Author: snipe <[email protected]> Date: Wed Oct 2 15:39:27 2024 +0100 Updated language for failure Signed-off-by: snipe <[email protected]> commit 4d9e85026aa814bd5cba426c339f931cacdafd67 Author: snipe <[email protected]> Date: Wed Oct 2 15:36:01 2024 +0100 Fixed #15439 - check database on healthcheck Signed-off-by: snipe <[email protected]> commit 54fbd0540d8600ba8f49681f158d4db4fea4e9cf Merge: b483bb163 4db735808 Author: snipe <[email protected]> Date: Wed Oct 2 12:40:49 2024 +0100 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop commit b483bb1633af5933fd8ac56a489bb8717fd14a5e Author: snipe <[email protected]> Date: Wed Oct 2 12:40:45 2024 +0100 Bumped version Signed-off-by: snipe <[email protected]> commit 4db73580869fd4d05475f68152fb6f83304c83fc Merge: 0dd6f41f6 b9cfdf2e5 Author: snipe <[email protected]> Date: Wed Oct 2 12:38:46 2024 +0100 Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug Fixed divide by zero bug in depreciation transformer commit 0dd6f41f66c0e41ca8ac3561162f818b1af88540 Author: snipe <[email protected]> Date: Wed Oct 2 11:04:55 2024 +0100 Simplified 2fa if/else Signed-off-by: snipe <[email protected]> commit 684c20ae393cc524821137fe442ce1f0b7a8873d Author: snipe <[email protected]> Date: Wed Oct 2 11:00:49 2024 +0100 Fixed parenthasis Signed-off-by: snipe <[email protected]> commit 3153bbb13fb2244a457135e7550f656a51a6ea20 Author: spencerrlongg <[email protected]> Date: Tue Oct 1 17:04:18 2024 -0500 dumb fix commit 3dc64cc5e0465e60116e2afd9e04a865d8781199 Author: Marcus Moore <[email protected]> Date: Tue Oct 1 13:35:39 2024 -0700 Reference accessory checkout and not the accessory commit c32f4e34b4a233bdd2f812b0ff6ff1e2ba3a8523 Author: snipe <[email protected]> Date: Tue Oct 1 20:35:49 2024 +0100 Minor formatting fix Signed-off-by: snipe <[email protected]> commit ca1886cebcc107b4ca4e31739cb556ad7a806caf Merge: 45ab49eea a79dfea40 Author: snipe <[email protected]> Date: Tue Oct 1 20:31:38 2024 +0100 Merge pull request #15594 from snipe/localizations/update-2024-10-01 Updated strings commit a79dfea40a2a4776b9f7e6ae64453ef072e0870d Author: snipe <[email protected]> Date: Tue Oct 1 20:30:58 2024 +0100 Updated strings Signed-off-by: snipe <[email protected]> commit 45ab49eeab1e995999337f060ac76c33ddb2dcc3 Merge: 97d00e5aa 8232618a9 Author: snipe <[email protected]> Date: Tue Oct 1 20:26:42 2024 +0100 Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors Catch Errors Around Request Notifications commit 8232618a9f8868cd1c5495fe301544fd3461a2d5 Author: spencerrlongg <[email protected]> Date: Tue Oct 1 14:26:32 2024 -0500 change the other one too commit 9a651b567d0c3c463f781b8e5b87609113b0fdd0 Author: spencerrlongg <[email protected]> Date: Tue Oct 1 14:24:03 2024 -0500 change error to warning commit 97d00e5aa87fb1581aa44829e8cbb5410e021ebd Author: snipe <[email protected]> Date: Tue Oct 1 20:08:54 2024 +0100 Fixed erroneous form tag on anchor Signed-off-by: snipe <[email protected]> commit 5b90d79494215f27f8d1f8b02e1d14c787f44a6a Author: Marcus Moo…
commit c012bf0ece16415fd150532eef40865da51afb52 Merge: 787340b98 947351af6 Author: snipe <[email protected]> Date: Wed Nov 13 00:55:53 2024 +0000 Merge pull request #15799 from Godmartinz/update_deprecated_trigger_for_ms_teams Updated deprecated trigger for ms teams commit 947351af6716965849ba1b35cacf5d2f667930bd Author: Godfrey M <[email protected]> Date: Tue Nov 12 16:49:02 2024 -0800 removed unused variabl commit 4e0d70e0b843d29115f2cd833bcc39e59ff42452 Author: Godfrey M <[email protected]> Date: Tue Nov 12 15:44:14 2024 -0800 checkin notif was missing commit 832ccc6aa3adb97f5b9c275a7ed9dc2989352937 Author: Godfrey M <[email protected]> Date: Tue Nov 12 15:35:09 2024 -0800 updated deprecated trigger for ms teams commit 787340b987ce3ce8721f3726034e3144d0e785c8 Merge: 6bec57395 c62a02225 Author: snipe <[email protected]> Date: Tue Nov 12 22:35:11 2024 +0000 Merge pull request #14441 from Godmartinz/ldap_location-resync Fixes Assets location not being resynced when Users location is updated via LDAP commit 6bec573956922013dc19cee4840fcb14bcbb74f1 Merge: b6ad69fac 1fc5bb54e Author: snipe <[email protected]> Date: Mon Nov 11 13:54:09 2024 +0000 Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance Check that the file exists before trying to download stored EULA commit 1fc5bb54e1ac036c44e4a6096b958f7e86674248 Author: snipe <[email protected]> Date: Mon Nov 11 13:50:53 2024 +0000 Check that the file exists before trying to download Signed-off-by: snipe <[email protected]> commit b6ad69fac248658a964ea60dc8d3e909e32795f6 Merge: 357ef7e37 47b2cdb84 Author: snipe <[email protected]> Date: Sun Nov 10 18:05:20 2024 +0000 Merge pull request #15793 from snipe/allow_eol_explicit Allow user to specify null for calculation or explicit on bulk edit commit 47b2cdb8469e6d4904f9ad3ffb34bdc6d9a196db Author: snipe <[email protected]> Date: Sun Nov 10 18:04:13 2024 +0000 Allow user to specify null for calculation or explicit on bulk edit Signed-off-by: snipe <[email protected]> commit 357ef7e3757712307417b5533785d839c0fb58a9 Merge: 000f3171e 6928b1b27 Author: snipe <[email protected]> Date: Sun Nov 10 17:48:25 2024 +0000 Merge pull request #15792 from snipe/edit_eol_from_bulk Added EOL date to bulk asset edit commit 6928b1b273667f1b36c97183e167da0418c39dd6 Author: snipe <[email protected]> Date: Sun Nov 10 17:47:10 2024 +0000 Added eol date to bulk asset edit Signed-off-by: snipe <[email protected]> commit 000f3171e39bcdbbb79a12296aa3f6326101d22f Author: snipe <[email protected]> Date: Fri Nov 8 10:28:01 2024 +0000 Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786 Signed-off-by: snipe <[email protected]> commit 5ef3183a5261bfe74df7e5616bb2d54b9c64f37c Merge: a41529dbc 050831868 Author: snipe <[email protected]> Date: Thu Nov 7 11:44:06 2024 +0000 Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes Improved indexes on manager_id for locations and users, including del… commit 050831868e96722753ef15228d794f8343da5548 Author: Brady Wetherington <[email protected]> Date: Thu Nov 7 11:39:27 2024 +0000 Improved indexes on manager_id for locations and users, including deleted_at commit a41529dbc4798d635739bdb77b8ffb8955049c89 Merge: aa168fcb5 4fcf5ac7d Author: snipe <[email protected]> Date: Wed Nov 6 21:22:45 2024 +0000 Merge pull request #15780 from uberbrady/add_manager_indexes Add new indexes to locations and users for faster manager lookups commit 4fcf5ac7dae2819e6b19d1d63d7d865d08d056be Author: Brady Wetherington <[email protected]> Date: Wed Nov 6 21:19:41 2024 +0000 Add new indexes to locations and users for faster manager lookups commit aa168fcb5b7d9c9d0c600ca2d7160985ce1a240f Author: snipe <[email protected]> Date: Wed Nov 6 18:41:52 2024 +0000 Updated BS table to 1.23.5 Signed-off-by: snipe <[email protected]> commit 9c1c93ad52112a53c7c1e4d502f04091b118c125 Merge: b96a31253 ad99b8b45 Author: snipe <[email protected]> Date: Wed Nov 6 18:40:35 2024 +0000 Merge pull request #15774 from marcusmoore/feature/sc-27350 Added Checkout ID column to user accessory table commit ad99b8b456968c2385f288b20d20d30d41d847b6 Author: Marcus Moore <[email protected]> Date: Wed Nov 6 10:37:31 2024 -0800 Use generic ID translation commit b96a31253902a4d702de318b381098f66e474fb8 Merge: 654f67b6a bab1e58ea Author: snipe <[email protected]> Date: Wed Nov 6 18:29:22 2024 +0000 Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345 Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736 commit bab1e58ea4dc0715478e8feef1aa562d1ab9ce82 Author: Joël Pittet <[email protected]> Date: Wed Nov 6 09:46:11 2024 -0800 symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736 commit 654f67b6ac4537794ec134fa96ee924075875b5e Author: snipe <[email protected]> Date: Wed Nov 6 14:05:42 2024 +0000 Updated webpack Signed-off-by: snipe <[email protected]> commit 3965bcd7c116bdde2649e38d96531808d811962b Merge: 287f4addf 2362cb5e5 Author: snipe <[email protected]> Date: Wed Nov 6 14:02:44 2024 +0000 Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests Fixed notifications for licenses and asset to asset checkoutables commit 2362cb5e5221ecae78c6aaf28bf8380f5ae20de2 Author: Godfrey M <[email protected]> Date: Mon Nov 4 16:32:46 2024 -0800 refactor to getNotifiables commit e7cb4a75eb5cd0d32524bcae0d53d184415acff5 Author: Marcus Moore <[email protected]> Date: Mon Nov 4 15:56:53 2024 -0800 Show accessory checkout id in user accessory table commit 93494ac55447b062b80918d84a80e38c5dbd2c3d Author: Godfrey M <[email protected]> Date: Mon Nov 4 15:17:58 2024 -0800 put dataprovider back in for tests commit 0d707a18512aa8e01c242d6d5486b675754ed5ed Author: Godfrey M <[email protected]> Date: Mon Nov 4 15:13:10 2024 -0800 fixes notifications for licenses and asset to asset checkouables commit 287f4addf026f44467376bada0222aa4e489eb0f Merge: f32ebdc7a 2e96d478f Author: snipe <[email protected]> Date: Mon Nov 4 20:06:24 2024 +0000 Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging Revert "Added the display of logs when tests fail in GitHub Actions" commit 2e96d478f15c433c5628e3307cd323fcd8a765ac Author: Marcus Moore <[email protected]> Date: Mon Nov 4 11:04:17 2024 -0800 Revert "Added the display of logs when tests fail in GitHub Actions" commit f32ebdc7acc370ab8d6f0e07a3f8ee59981d1491 Merge: 5897d37fc d6c7dc8e1 Author: snipe <[email protected]> Date: Thu Oct 31 22:39:58 2024 +0000 Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file Added missing Livewire file commit d6c7dc8e1c99c5421c149543a22b8cec0784ba7f Author: Marcus Moore <[email protected]> Date: Thu Oct 31 15:37:01 2024 -0700 Add missing livewire file commit 5897d37fcfd3c79afeef72e095d32145e90798bc Merge: 49de07045 21a27dcac Author: snipe <[email protected]> Date: Thu Oct 31 20:54:01 2024 +0000 Merge pull request #15763 from Godmartinz/no_to_email_check Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent. commit 21a27dcac11a696a28d35a20d32e5381faa10e43 Merge: 379138076 49de07045 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:55:46 2024 -0700 fixed conflicts commit 3791380764fa0ddffeb94d5c5b14d1ae2357bab6 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:52:47 2024 -0700 remove unused uses commit 7a0f79ecd222b23f9e874c354b5881dcaba9d2db Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:51:22 2024 -0700 remove test route commit 97a449e80ece3e553ec12064e74eae9e291f30f6 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:50:13 2024 -0700 removes instanceof User check commit e65942064e3b555885e575aa22315ff02801bde9 Author: Godfrey M <[email protected]> Date: Thu Oct 31 12:45:29 2024 -0700 send emails even if target has no email commit 49de07045ad48893daad9ea116b517145a711433 Merge: 7e996c40f 73772a013 Author: snipe <[email protected]> Date: Thu Oct 31 17:53:17 2024 +0000 Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs Fixed MS Team Notifications to utilize workflows after deprecation commit 7e996c40f5770b608b36af035c0118c83fd07864 Merge: 73e8f160c 69e74bbdd Author: snipe <[email protected]> Date: Thu Oct 31 02:51:42 2024 +0000 Merge pull request #15758 from snipe/jerm/fix-deprecation-warning Fix ${var} deprecation warning in License model commit 69e74bbdd39201fad43216a0520d771a58554021 Author: Jeremy Price <[email protected]> Date: Wed Oct 30 19:43:54 2024 -0700 Fix ${var} deprecation warning in License model When upgrading to php8.3 i started getting deprecation warning about using ${var} instead of {$var} in 2 places in License.php PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187 PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219 This simple fix switches the offending statements to {$var} syntax. commit 73e8f160cf078e3dbc69cf032a899cf6fa8d8739 Merge: f68df1fa0 bd23772fe Author: snipe <[email protected]> Date: Wed Oct 30 19:29:09 2024 +0000 Merge pull request #15756 from Godmartinz/cc-email-array changes `admin_cc_email` validation to allow an array commit bd23772fe96dc33db62c0fd286a095d4c99e2067 Author: Godfrey M <[email protected]> Date: Wed Oct 30 11:42:15 2024 -0700 changes cc_email validation to allow array commit 73772a01381ea654bf7cca48860e61551f363295 Author: Godfrey M <[email protected]> Date: Wed Oct 30 11:12:31 2024 -0700 change button text commit b26cae372cad814dac2a40467aaa122c58c93787 Author: Godfrey M <[email protected]> Date: Wed Oct 30 10:40:23 2024 -0700 merged in develop commit d6ba303f39c6b5d00aabfdc61a8aadd74c7ca7bf Merge: 9a0eee8f0 f68df1fa0 Author: Godfrey M <[email protected]> Date: Wed Oct 30 10:27:45 2024 -0700 Merge branch 'develop' into refacto_ms_teams_notifs # Conflicts: # app/Listeners/CheckoutableListener.php commit f68df1fa063125eb1b3f6e5a44b7e5156148c1e4 Author: snipe <[email protected]> Date: Wed Oct 30 13:21:13 2024 +0000 Made type searchable in action logs Signed-off-by: snipe <[email protected]> commit f0813e03bf95f3ab53e650ebb8f7128b7fc90164 Merge: 05875ebd1 58ff641f8 Author: snipe <[email protected]> Date: Wed Oct 30 12:18:41 2024 +0000 Merge pull request #15681 from Godmartinz/seperating_notification_n_mail Separated Notifications and Emails: Check ins and Check outs commit 05875ebd1fcea7366288de8833adfcedd66a309c Author: snipe <[email protected]> Date: Mon Oct 28 22:04:35 2024 +0000 Updated translations Signed-off-by: snipe <[email protected]> commit 9a0eee8f03fa06ba67476996741faffe5cf248e7 Author: Godfrey M <[email protected]> Date: Mon Oct 28 15:03:43 2024 -0700 revert testing variables commit 6128765d1f88215c9aa0e528ae2def74cba9bf4c Author: Godfrey M <[email protected]> Date: Mon Oct 28 15:03:03 2024 -0700 change wording on notification button commit c24f79c025cde958335981252d47285e347aae98 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:58:43 2024 -0700 update method comment commit e7c4343c902961268792bd4951930cec56959384 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:56:48 2024 -0700 readd checkin accessory format commit c0620c27ff74ceb66ce23a75431d8f2184eb91e0 Author: Godfrey M <[email protected]> Date: Mon Oct 28 14:30:34 2024 -0700 adds back laravels channel formats commit ed81973fe649355a687dfd5dc70b60d9fdb997c3 Author: Godfrey M <[email protected]> Date: Mon Oct 28 13:57:42 2024 -0700 adds notifications for deprecation commit 2d318b394c98954c51e9a6457ccf570487e47ae4 Merge: 86d784bd5 5c4971612 Author: snipe <[email protected]> Date: Mon Oct 28 18:41:49 2024 +0000 Merge pull request #15744 from marcusmoore/chore/action-tests-debugging Added the display of logs when tests fail in GitHub Actions commit b987b3dc005400e2c5042fc47be7d134e86c4314 Author: Godfrey M <[email protected]> Date: Mon Oct 28 10:57:48 2024 -0700 adds back the laravel channels package and applies a deprecated check commit 5c49716129950b19b503c0d05456ea83c2119755 Author: Marcus Moore <[email protected]> Date: Mon Oct 28 10:24:35 2024 -0700 Dump logs on test failure commit 86d784bd598393919a7b60a4845d6e47d1931de0 Author: snipe <[email protected]> Date: Mon Oct 28 13:37:59 2024 +0000 Fixed #15740 - use non-translated strings for icons Signed-off-by: snipe <[email protected]> commit 589f9cccdf1f4af8956f527728678e2b2316d723 Author: snipe <[email protected]> Date: Mon Oct 28 12:04:10 2024 +0000 Fixed #15732 Signed-off-by: snipe <[email protected]> commit 4d848e45e6c58aec7cb3d5fc32b5bdab7ddf1bd0 Author: snipe <[email protected]> Date: Mon Oct 28 11:55:24 2024 +0000 Fixed #15736 Signed-off-by: snipe <[email protected]> commit 58ff641f822eec54ebd40c9904c26034e215c550 Author: Godfrey M <[email protected]> Date: Thu Oct 24 22:53:53 2024 -0700 removed unused variables commit ce68f550d8edf633d01af476fd95f1161b474e44 Author: Godfrey M <[email protected]> Date: Thu Oct 24 16:01:17 2024 -0700 remove alert emails from cc commit 6f0c1b12b18901bc335bfdda328777399436386c Author: Godfrey M <[email protected]> Date: Thu Oct 24 15:04:54 2024 -0700 this adds check out message for consumables commit 278bc5e52a133189cfaf5348d709dcf229229e2f Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:59:10 2024 -0700 ads check in and checkout message for license seats commit cce75a81859d3ff36dee19cf7d0278c17b711549 Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:48:23 2024 -0700 adds check in and checkout messag for accessories commit e27ff13377f8f783b7230287736eeff63e24c75d Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:39:40 2024 -0700 adds check in and checkout message for assets commit 56365495a1c3b38443772a8ab6d3cc5f9815691c Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:26:42 2024 -0700 remove unnecessary fields in accessory checkout mail commit 18da80e6de14f285f59012c75696f55be617a2d4 Author: Godfrey M <[email protected]> Date: Thu Oct 24 14:24:00 2024 -0700 fix checkoutable listener for microsoft teams commit 18760e3fa19d4d37cf16995a4ba5f0b56ba3771a Author: Godfrey M <[email protected]> Date: Thu Oct 24 12:21:51 2024 -0700 replaces teams notification package, passes integration test commit 57107c487cce4f5520b8cfb97408e8c9f02d6547 Author: Godfrey M <[email protected]> Date: Thu Oct 24 09:40:10 2024 -0700 fixed last test, definetly the last test commit dfc63641dca2b0a19f632f73733c5bf015517815 Merge: 07a51ec8b b6340532d Author: snipe <[email protected]> Date: Thu Oct 24 11:40:50 2024 +0100 Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure Fix multi create partial failure (fixes: [RB-18591]) commit 07a51ec8b128aca554b44af9e9b030f284769650 Merge: e0ec6795b 727c0e458 Author: snipe <[email protected]> Date: Thu Oct 24 10:03:10 2024 +0100 Merge pull request #15712 from Godmartinz/fix_import-progress-bar Upgraded `livewire v3.5.9 => v3.5.12` commit 6329f5b87e9dd2ff852073aa290e2930b2f78c10 Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:33:23 2024 -0700 removed unused variable from test commit e0ec6795b57406e100fc80af4b5799eb6b00b757 Author: snipe <[email protected]> Date: Thu Oct 24 01:27:50 2024 +0100 Use crucial for seeded data Signed-off-by: snipe <[email protected]> commit 15073a0d3885dc18609158943254317a2394d9d7 Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:27:37 2024 -0700 last test to fix commit a80c09c16d256d67592e35fdde2bd165ff7090bb Merge: ab3b9c451 5509d756b Author: Godfrey M <[email protected]> Date: Wed Oct 23 17:23:55 2024 -0700 Merge branch 'develop' into seperating_notification_n_mail commit 5509d756b7d410f5ec98c599c87ad530003b2cb4 Merge: 55ba6279a b16a978f1 Author: snipe <[email protected]> Date: Thu Oct 24 01:12:11 2024 +0100 Merge pull request #15722 from Godmartinz/fix_component_factory Fixed Component Factory: use manufacturer factory for `manufactuer_id` commit b16a978f1b5c11c949f9caff4e297628a21d0511 Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:25:51 2024 -0700 uses manufacturer factory for manufactuer_id commit ab3b9c45106fb68522f3832863f6e16c8f4856f7 Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:24:01 2024 -0700 remove unnecessary code from checkinasset notification commit 2cc2b2b1dfc3c4040a223c052d4cfff0175b3f0c Author: Godfrey M <[email protected]> Date: Wed Oct 23 16:06:27 2024 -0700 apply array_filter to cc emails to prevent errors commit 62d06b44d634155aff0035dd4340a03f86479918 Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:43:42 2024 -0700 set fallback from email address to service.snipe-it.io commit f29a3831796ea5b8e73e17bb4a45919701f221bd Merge: fd74c3510 55ba6279a Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:15:14 2024 -0700 Merge branch 'develop' into seperating_notification_n_mail # Conflicts: # app/Notifications/CheckoutConsumableNotification.php commit fd74c35102b19ec99118c84e6e8339003936aa0e Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:08:29 2024 -0700 remove old notify by mail from consumable notification commit c681946b1df9f27242d03ae0dcd2342b1b11fdd3 Author: Godfrey M <[email protected]> Date: Wed Oct 23 15:05:39 2024 -0700 added component markdown changes commit 257d25bd9eb1a3114c57c87aad90debc389543b6 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:56:54 2024 -0700 removed import notification from test, feature is not present in project commit 6c34a5c52c8e5391dab246c69a41ad118cfb0cc5 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:54:21 2024 -0700 conditionally check cc emails, initiate variables commit 1b5f4415ae11de482d79f3889db5e71b33e70f99 Author: Godfrey M <[email protected]> Date: Wed Oct 23 14:44:45 2024 -0700 corrected cc email behavior commit 55ba6279a4f841d8c3f800bec90b52067e403fc5 Author: snipe <[email protected]> Date: Wed Oct 23 19:14:17 2024 +0100 Use trans_choice on alert menu Signed-off-by: snipe <[email protected]> commit a9eea830e30f75a4b46648d3bf99d9aa54f07c99 Author: snipe <[email protected]> Date: Wed Oct 23 19:05:34 2024 +0100 Added manufacturer and model number to component seeders Signed-off-by: snipe <[email protected]> commit af564935d5405e545412210a8a9cfb90c1836948 Merge: d58f87862 3ee76be7e Author: snipe <[email protected]> Date: Wed Oct 23 17:56:04 2024 +0100 Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components Fixed #15695 - Added manufacturer and model_number to components commit 3ee76be7e37311fc1d835ca8350fbdb8481b6d23 Author: snipe <[email protected]> Date: Wed Oct 23 17:50:22 2024 +0100 Added manufacturer and model_number to components Signed-off-by: snipe <[email protected]> commit d58f87862c8b9dedc65b85f9e37601e6aa366a90 Merge: 5da3ce356 0b6859c49 Author: snipe <[email protected]> Date: Wed Oct 23 15:09:50 2024 +0100 Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable Fixed #15717 - Added ability to checkout consumables in variable qty via API commit 0b6859c49180c0cb76fa9a7fbdb87286d82815b1 Author: snipe <[email protected]> Date: Wed Oct 23 15:05:35 2024 +0100 Added ability to checkout consumables in variable qty Signed-off-by: snipe <[email protected]> commit 1e9922a0b08cf2ee0d14a10b734e4c44dd9942c7 Author: Godfrey M <[email protected]> Date: Tue Oct 22 16:14:36 2024 -0700 fix moar tests commit ead27accacaefb08f0ed990c7d28843475d757e8 Author: Godfrey M <[email protected]> Date: Tue Oct 22 15:45:52 2024 -0700 fixed accessory tests and notifiable target commit 727c0e458ceccc59f62667e28bb80204c219569c Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:34:39 2024 -0700 remove translation commit 870dc747db51fa7e0f0ea7d4fac9d857f10191cd Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:27:32 2024 -0700 oops commit 0fb3d83fac1df5f800da60a6471017010edea78b Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:26:54 2024 -0700 revert controller change commit 0d59ccd6a66cf15a55afc1b92be8ab5e2a3679cb Author: Godfrey M <[email protected]> Date: Tue Oct 22 14:23:26 2024 -0700 upgraded livewire v3.5.9 => v3.5.12 commit 5da3ce3564c1ea8860e101ddbebe15c825b6884a Merge: c3bbca30a 5ecd2b629 Author: snipe <[email protected]> Date: Tue Oct 22 22:10:20 2024 +0100 Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes Fixed custom field checkboxes on asset edit page commit c3bbca30adb33ebc15c7d2c27675d338a27928ef Merge: dccb788a8 37f14fff3 Author: snipe <[email protected]> Date: Tue Oct 22 22:07:50 2024 +0100 Merge pull request #15710 from snipe/fixes_lightbox_for_avif Fixes #15701 - load avif files properly in lightbox commit 37f14fff3b98ab23654706b2087eae2261e2931a Author: snipe <[email protected]> Date: Tue Oct 22 22:07:28 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit eb6c51fabdf755b488493bff2b1c4d52a3ba8b3f Author: snipe <[email protected]> Date: Tue Oct 22 22:04:57 2024 +0100 Fixes #15701 - load avif files properly in lightbox Signed-off-by: snipe <[email protected]> commit 5ecd2b62935489df9f6228d378d42a03cfcb17f0 Author: Marcus Moore <[email protected]> Date: Tue Oct 22 14:04:05 2024 -0700 Default checkbox elements to an empty array commit 1e31592c553e49eab175531cf9aa3b02ce738812 Author: Godfrey M <[email protected]> Date: Tue Oct 22 11:49:06 2024 -0700 messing with the tests commit dccb788a88497608289fbaf08aec8a106d9a8b49 Merge: 5e1d792bb d10fe77ee Author: snipe <[email protected]> Date: Tue Oct 22 17:44:30 2024 +0100 Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user Updated `Company::getIdForCurrentUser()` to return null in certain scenarios commit d10fe77ee7d6445379445024d5f6714159554652 Merge: e1882ee6d 5e1d792bb Author: Marcus Moore <[email protected]> Date: Tue Oct 22 09:38:31 2024 -0700 Merge branch 'develop' into fixes/get-id-for-current-user commit 5e1d792bbaf5cdc140ecb4c53b054d20949a546b Merge: 9cf71976f 780ed91a1 Author: snipe <[email protected]> Date: Tue Oct 22 16:52:28 2024 +0100 Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower() commit 9cf71976f6b2865411f6fa8ae257c10c3e8a7e4c Author: snipe <[email protected]> Date: Tue Oct 22 16:51:42 2024 +0100 Fixed #15706 - Removed purchase order number from asset import Signed-off-by: snipe <[email protected]> commit 15745d9737f551ba0f04092c352ce65f5012870a Merge: bd97955b9 3f74ff25d Author: snipe <[email protected]> Date: Tue Oct 22 16:39:44 2024 +0100 Merge pull request #15566 from Godmartinz/status-label-error-message Fixed Status Labels Error Message commit bd97955b9e21294aa409cdb9b701bf90261d3863 Author: snipe <[email protected]> Date: Tue Oct 22 16:38:46 2024 +0100 Bumped hash Signed-off-by: snipe <[email protected]> commit 252d99421ca4dd707d456fc424f30316b10cd86d Merge: 5767a98ad db8170162 Author: snipe <[email protected]> Date: Tue Oct 22 16:26:48 2024 +0100 Merge pull request #15689 from snipe/better_handle_inline_files Better handle inline files in file listing commit 5767a98ad8abe738c4a18a9c33290ac4e3f5ceb1 Merge: 0c820cbc0 524a44272 Author: snipe <[email protected]> Date: Tue Oct 22 16:26:23 2024 +0100 Merge pull request #15649 from bryanlopezinc/ImproveImporting Improve import performance commit 0c820cbc0da0c6bb05ec4f685a7eeeaa5156bf7d Merge: 147fcfb8e 3153bbb13 Author: snipe <[email protected]> Date: Tue Oct 22 15:56:12 2024 +0100 Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue Custom Field Existence Validation Issue commit db8170162174b5688372e50005c5bd18b262508f Merge: a05c33feb 147fcfb8e Author: snipe <[email protected]> Date: Tue Oct 22 15:44:24 2024 +0100 Merge branch 'develop' into better_handle_inline_files commit a05c33febfb49b6a845e762817dd20e16db71d0e Author: snipe <[email protected]> Date: Tue Oct 22 15:43:19 2024 +0100 Squashed commit of the following: commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a Merge: 58a3d09b5 fdcc17ca2 Author: snipe <[email protected]> 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 58a3d09b5fd7ffa979bfb9553cacbb24ae452462 Merge: 30a06a594 867fa2f36 Author: snipe <[email protected]> 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 30a06a594289571097e2d30901546bc9a17b4bac Merge: 6c6af78e0 ce3086317 Author: snipe <[email protected]> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1 Merge: 9b06bbb6c 3f79fd7ea Author: snipe <[email protected]> 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 3f79fd7ea744bd18134785c37b87a2f4bcff0347 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01 Merge: 46ad1d072 d7f70146f Author: snipe <[email protected]> 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 ce30863177e499a29f395c9c88ce9c67bd669a74 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commit d7f70146f4a886795ddb118cc2f71bbadded72dc Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d Author: Marcus Moore <[email protected]> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632 Merge: bcb4bd9eb 3cf746d7d Author: snipe <[email protected]> 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 bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21 Merge: 250037540 f50ccbcc4 Author: snipe <[email protected]> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7 Author: Tobias Regnery <[email protected]> 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 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3 Author: Brady Wetherington <[email protected]> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit 6b7af802af41c92a36e77605415869c9e72ec192 Author: Brady Wetherington <[email protected]> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commit fdcc17ca2c33d38a7af505c99d9547e014f5f783 Author: Tobias Regnery <[email protected]> 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 <[email protected]> commit 147fcfb8ebc4ceeea96d803d6a455abeba54f45a Merge: 58a3d09b5 fdcc17ca2 Author: snipe <[email protected]> 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 58a3d09b5fd7ffa979bfb9553cacbb24ae452462 Merge: 30a06a594 867fa2f36 Author: snipe <[email protected]> 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 30a06a594289571097e2d30901546bc9a17b4bac Merge: 6c6af78e0 ce3086317 Author: snipe <[email protected]> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit 6c6af78e0840fc4f134e5bbb7965f21f4adcc0e1 Merge: 9b06bbb6c 3f79fd7ea Author: snipe <[email protected]> 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 3f79fd7ea744bd18134785c37b87a2f4bcff0347 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit 9b06bbb6c37fcea9b6202ad9fb2b4d952210dd01 Merge: 46ad1d072 d7f70146f Author: snipe <[email protected]> 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 ce30863177e499a29f395c9c88ce9c67bd669a74 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commit d7f70146f4a886795ddb118cc2f71bbadded72dc Author: Marcus Moore <[email protected]> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit 867fa2f36e02bdfe0ee74ae98b590fd013f6fc7a Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit e1882ee6d2a78506abfd371ba6e0d592ac487181 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:21:45 2024 -0700 Add comment commit 7eee239378f1b4318557886d1e022540a10977af Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:20:28 2024 -0700 use is_numeric instead of is_int commit 4188849ae17d52dd9befd349b56419eaea9f5287 Author: Marcus Moore <[email protected]> Date: Mon Oct 21 12:19:48 2024 -0700 Add failing test case commit 787e651778dbc04acf66cd77faf0386f5a137534 Author: snipe <[email protected]> Date: Mon Oct 21 16:52:21 2024 +0100 Fixed todos with log message Signed-off-by: snipe <[email protected]> commit ef9b6e3b072f88bfec52c4ec930816d30eb34cb9 Author: snipe <[email protected]> Date: Mon Oct 21 16:34:54 2024 +0100 Code cleanup Signed-off-by: snipe <[email protected]> commit 06c599cc17ca8f7a29515564e5cac9be905e338d Author: snipe <[email protected]> Date: Mon Oct 21 16:34:03 2024 +0100 Added method to show or download file Signed-off-by: snipe <[email protected]> commit 61053238777c38579c6188d2380f0cb7b99ae59e Author: snipe <[email protected]> Date: Mon Oct 21 14:11:20 2024 +0100 Use plural class name for src Signed-off-by: snipe <[email protected]> commit 0933a2d4ea6d5babd6ef3e0e2f8350c2e088648d Author: Marcus Moore <[email protected]> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit a8d853c44a38b50db05884843c614fe7b7342d60 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:26:27 2024 -0700 Remove focus group tags commit 7e1b47708e7d44a2ad3bc7af93a38fc2dc6e72a9 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:18:41 2024 -0700 Fix failing test ensuring company id is an integer commit 979e4502ffbadab5978d38633fe06aa96eed698a Author: Marcus Moore <[email protected]> Date: Thu Oct 17 15:14:39 2024 -0700 Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company commit ff113ef523f77fb887b939a23de3936f603812a6 Author: Godfrey M <[email protected]> Date: Thu Oct 17 14:56:58 2024 -0700 typo fix commit 99dd51a965c7a02f8b24deddd1c233fac05f8465 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:53:18 2024 -0700 Improve name commit 15c2169477e9691216d9f3fc2b8b8ddd2d8ee21a Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:31:05 2024 -0700 Scaffold additional tests commit 50fa6ce33588f466e90829fb59e8d91411c8d736 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 14:12:22 2024 -0700 Scaffold tests commit 7ae76e7db9be7943ca473ab9ef30bda27b166aac Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:55:03 2024 -0700 remove viewdata array from 3 tests commit b98058ca98e02b865fdf1488e83a49d4bf7df9c8 Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:48:26 2024 -0700 fix tests pt 3 commit 83e8186d9e261efdde81ac56deeb9a799fdaa1e7 Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:39:56 2024 -0700 fix assertSent to AssertNotSent on some test commit cdd4fef7df6d49951aaa09ca597995b90a26f2ad Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:34:55 2024 -0700 attempt to fix tests p2 commit dceb8e305f55be79f3755a48bc3b4165dc79d43e Author: Godfrey M <[email protected]> Date: Thu Oct 17 13:11:39 2024 -0700 attempt to fix tests commit 123cdeb858a8148cd8210847fcb39e635b7dc2bf Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:39:48 2024 -0700 add email check to listener commit 496b44e887078b6110f4e8e97e2b04bf22240677 Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:28:57 2024 -0700 merged composer lock from dev commit a690cc3582237fb6d40f8eaa3e3e83e7822574fc Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:26:55 2024 -0700 removing my composer stuff again..for the last time commit ceb3f5cea629ed68fa4bfc119fefa2166456499c Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:19:50 2024 -0700 added mail-gun and http-client to 8.1 commit 65735a31f178c8bd4e1efabc7190a30e3500f5fd Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:18:34 2024 -0700 removed symfony/mailgun-mailer symfony/http-client commit 285d6897cf83d2cac7e791fa50d23ec88f116849 Author: Godfrey M <[email protected]> Date: Thu Oct 17 12:05:36 2024 -0700 added a coulple test adjustments and moved mail send logic to listener commit 159a1d3f4356141844767c2c2593252b98df3b11 Author: Marcus Moore <[email protected]> Date: Thu Oct 17 11:48:55 2024 -0700 Be more explicit commit d1149730be99fdc8e59e91ce3b02c863a08d4aa1 Author: snipe <[email protected]> Date: Thu Oct 17 16:31:17 2024 +0100 Apply blade component to files views Signed-off-by: snipe <[email protected]> commit 46ad1d072f5c45d20c1b078d2b3f84a3a0f36632 Merge: bcb4bd9eb 3cf746d7d Author: snipe <[email protected]> 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 780ed91a1098ed9af2a5f8f95d6ac87a14e55b20 Author: NebelKreis <[email protected]> Date: Thu Oct 17 16:09:25 2024 +0200 Fix: Removed strtolower() from dashboard titles This fix ensures the correct capitalization in different languages. commit bcb4bd9eb4e419e8a125a7dccd3e79c39dc13e21 Merge: 250037540 f50ccbcc4 Author: snipe <[email protected]> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commit f50ccbcc492db6c98cabf6dc6752dd99ab82bce7 Author: Tobias Regnery <[email protected]> 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 9a794833755ff5fb335ab6cf1e118a0d411b021e Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:59:18 2024 -0700 removed namespaces from routing commit ed6034065b34797ba531782a207fe49384e0f465 Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:47:36 2024 -0700 removed test route commit a7754c1a7fd6559b5d512fbd520556c9d10b76aa Author: Godfrey M <[email protected]> Date: Wed Oct 16 16:46:52 2024 -0700 fixed asset checkout markdown, and notifiable variable commit 0e9b3c9119e77259ed2f8740ae98e9149936bd51 Author: snipe <[email protected]> Date: Thu Oct 17 00:27:39 2024 +0100 Check for existence before trying to get the icon Signed-off-by: snipe <[email protected]> commit 4933aa5784e3a86021136775055d81eed7b3c966 Author: snipe <[email protected]> Date: Thu Oct 17 00:27:04 2024 +0100 Add StorageHelper to app config Signed-off-by: snipe <[email protected]> commit d67addc69ee2fde2fdc9d90e1eefa13f1c1e4f26 Author: snipe <[email protected]> Date: Thu Oct 17 00:21:43 2024 +0100 Removed filetype column - it’s dumb Signed-off-by: snipe <[email protected]> commit 02c80ff18af48c016433807b4bdc0f384ffde41a Author: snipe <[email protected]> Date: Thu Oct 17 00:18:40 2024 +0100 Added comment Signed-off-by: snipe <[email protected]> commit c01190fac279b38d8ee74a636d8cf9c2fd7a7285 Author: snipe <[email protected]> Date: Thu Oct 17 00:18:34 2024 +0100 Conditionally add content-type Signed-off-by: snipe <[email protected]> commit 017884f8432abd3afed7397a7967bb2813df0262 Author: snipe <[email protected]> Date: Thu Oct 17 00:09:09 2024 +0100 Added checks and filetype display Signed-off-by: snipe <[email protected]> commit c49921f50fc54785b87d59e6265b29088bba48fe Author: snipe <[email protected]> Date: Thu Oct 17 00:08:54 2024 +0100 Removed unused (maybe?) API endpoint Signed-off-by: snipe <[email protected]> commit c49abb6aeafbfbf43ebcb7e1a9c565288b72b9d9 Author: snipe <[email protected]> Date: Thu Oct 17 00:08:38 2024 +0100 Refactor the UserFilesController show method for simpler inlining Signed-off-by: snipe <[email protected]> commit ccd20194484313c6e53bf357687ef8a29a4fffe6 Author: snipe <[email protected]> Date: Thu Oct 17 00:08:04 2024 +0100 Removed unusded use statements Signed-off-by: snipe <[email protected]> commit 96191a5e9391e86701095b74fefc9064e4bf74d3 Author: snipe <[email protected]> Date: Thu Oct 17 00:07:54 2024 +0100 Added method to decide if the file should be inlinable Signed-off-by: snipe <[email protected]> commit c56affd66345a92f64fb8c7451ced58b5340dd70 Author: snipe <[email protected]> Date: Thu Oct 17 00:07:37 2024 +0100 Added SVG icon Signed-off-by: snipe <[email protected]> commit 02bda3cd9598d77ddd2c68f67f589f82e0af37b3 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:53:05 2024 -0700 adds Checkout Consumable mailable and slackwebhook channel to notifs commit 02ff646da4388422d260ed50d8e93ea7bc57dab0 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:44:45 2024 -0700 adds checkin license mailable commit 4becdca8aa792957243e5ca9a3dcf04cfa3ee522 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:39:20 2024 -0700 removes toMail from license notificaqtion commit 2584d603445bb0a82e722cd8b7a3dbf7f1c1d020 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:38:49 2024 -0700 adds Licenses seat checkout Mailable commit f1d83a3f281a7d17c2b8ca52ccaf8403cac4d246 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:30:53 2024 -0700 forgot to add asset checkout markdown to projet commit c39df34bdfabb2acde4ab8aaba01cf5c65582675 Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:29:50 2024 -0700 forgot to add accessory mail to project commit dcdf600b785501d960ee6a8f99a46f9a6ba90b9f Author: Godfrey M <[email protected]> Date: Wed Oct 16 15:27:34 2024 -0700 adds Checkin and Checkout mailables and listner logic commit 3cf746d7df83ef3e7cfa45c602fc182ebe8f11e3 Author: Brady Wetherington <[email protected]> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit 6b7af802af41c92a36e77605415869c9e72ec192 Author: Brady Wetherington <[email protected]> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commit 9710436d54fc23e79bf96b61430f3f0f3345581a Author: Godfrey M <[email protected]> Date: Wed Oct 16 13:12:07 2024 -0700 adds Mailables for asset checkin and out commit 16cffe9a9dd0cbce4f38d161a2b4cbebeaffde1c Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:53:35 2024 -0700 simplified checkout webhook call commit 9e1b86f586f2942312105b0b37d69ee8ec34ca17 Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:51:19 2024 -0700 sends checkout notification via webhook commit 3ab2521cb0b8f61cb42a7b205a7836d7950046a6 Author: Godfrey M <[email protected]> Date: Wed Oct 16 12:21:33 2024 -0700 email comes through, no picture and html markup appear though. commit 604a9644624a52cd1aa965d92d36aa936840265d Author: Marcus Moore <[email protected]> Date: Wed Oct 16 11:52:24 2024 -0700 Improve scenario descriptions commit 2f72c66614676efd205585e25d909424b136d869 Author: Marcus Moore <[email protected]> Date: Wed Oct 16 11:30:06 2024 -0700 Add additional case commit fdcc17ca2c33d38a7af505c99d9547e014f5f783 Author: Tobias Regnery <[email protected]> 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. commit cba1a560408c821c4112a2548a6df20755536efd Author: Marcus Moore <[email protected]> Date: Tue Oct 15 17:38:11 2024 -0700 Improve readability? commit d9afde4610dd0527fb19fd52093f2d654ce36430 Author: Marcus Moore <[email protected]> Date: Tue Oct 15 17:00:22 2024 -0700 Write failing test commit 9f06a0e441940606de32279c428b24a8957186fb Author: Godfrey M <[email protected]> Date: Tue Oct 15 14:01:28 2024 -0700 handle some edge cases, null values clean up variable names commit 42095c0167b661d0f7a996a3bd17e0c0cfac5750 Author: Marcus Moore <[email protected]> Date: Tue Oct 15 13:02:22 2024 -0700 Add reference link commit f8476f713396027e7149e7306db2bfcc710d5e5c Author: Godfrey M <[email protected]> Date: Tue Oct 15 12:49:52 2024 -0700 finished the construct and mail call in the listner commit b29d032bf0250941a2a968c85c227bbee9449c81 Author: Godfrey M <[email protected]> Date: Tue Oct 15 11:28:27 2024 -0700 adds checkoutAssetMail class, and content method commit 250037540038cb140c12cfe4cbf2aa9a7c0ffbdc Merge: 16c8264e7 e4e1d0d50 Author: snipe <[email protected]> Date: Tue Oct 15 17:34:35 2024 +0100 Merge pull request #15672 from uberbrady/ldap_location_fixes Clean up how we use the '$location' in LDAP sync command commit e4e1d0d50a4a3e418d1b736dac6221d437d88b66 Author: Brady Wetherington <[email protected]> Date: Tue Oct 15 17:26:31 2024 +0100 Clean up how we use the '$location' in LDAP sync command commit 16c8264e766b56e24c33fea740847a48a91d2cc3 Merge: 914a64720 0ae9ce0aa Author: snipe <[email protected]> Date: Tue Oct 15 16:42:34 2024 +0100 Merge pull request #15671 from snipe/bug/sc-27147 Bug/sc 27147 commit 0ae9ce0aa9fe06b850183f15a668f366f6128565 Author: snipe <[email protected]> Date: Tue Oct 15 16:41:45 2024 +0100 Cannot sort by updated at on Users [sc-27147] Signed-off-by: snipe <[email protected]> commit 50b8f180b3d1315e48d8d545c3b9c7153a768bdf Author: snipe <[email protected]> Date: Tue Oct 15 16:41:39 2024 +0100 More logical grouping in allow_columns Signed-off-by: snipe <[email protected]> commit 914a647204843f784edeffc358d50bd0175d2d14 Merge: 69b6080bd e9225ff3e Author: snipe <[email protected]> Date: Tue Oct 15 12:47:15 2024 +0100 Merge pull request #15669 from snipe/remlove_ou_requirenedess Fixed #15663 - remove requiredness for OU commit e9225ff3ea6952f83ec0cbda2749f0756d6f1de7 Author: snipe <[email protected]> Date: Tue Oct 15 12:43:10 2024 +0100 Switch to regular HTML for input form field Signed-off-by: snipe <[email protected]> commit d0d4159088e4452ff18dcfb80e3746475caedc88 Author: snipe <[email protected]> Date: Tue Oct 15 12:42:09 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit 69b6080bd865c6db78577d256627b894b28550cd Merge: ddead359d b997d728f Author: snipe <[email protected]> Date: Tue Oct 15 10:31:29 2024 +0100 Merge pull request #15666 from snipe/updated_readme_llm Added LLM note commit b997d728fb508f00b28d1f5db7bdd7ecd6177c0b Author: snipe <[email protected]> Date: Tue Oct 15 10:30:34 2024 +0100 Added LLM note Signed-off-by: snipe <[email protected]> commit ddead359d055f1ebc52b2e3bbcf4004f8233800d Merge: 0d35335da f3c4e5566 Author: snipe <[email protected]> Date: Mon Oct 14 14:29:34 2024 +0100 Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2 Refactor asset creation with API commit f3c4e556675d7dcd7920807bced18b3416b0b2ec Author: Tobias Regnery <[email protected]> Date: Mon Oct 14 15:14:41 2024 +0200 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. commit 0d35335da7df0d601d4221d1c2073478d3ab55b2 Author: snipe <[email protected]> Date: Fri Oct 11 16:06:17 2024 +0100 Removed debugging Signed-off-by: snipe <[email protected]> commit feaa71430493b46870203f31d0540a39b2355411 Author: snipe <[email protected]> Date: Fri Oct 11 14:23:57 2024 +0100 Nicer disabled button Signed-off-by: snipe <[email protected]> commit e1a70023b167999defc72adf3d837d8ff2679e2a Merge: de62359c6 fb4fe3004 Author: snipe <[email protected]> Date: Fri Oct 11 11:45:48 2024 +0100 Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport commit de62359c6734bdd01c1d3823b723be671ff0595b Merge: 12bda8fc7 3dc64cc5e Author: snipe <[email protected]> Date: Fri Oct 11 11:29:34 2024 +0100 Merge pull request #15533 from marcusmoore/testing/fmcs-accessories Added tests for accessory api controller commit 12bda8fc7b756e7d930ed1a14b94f130d39f673a Merge: 8aa298f6b b054017c9 Author: snipe <[email protected]> Date: Fri Oct 11 11:27:18 2024 +0100 Merge pull request #15653 from snipe/15651_admin_user_on_maintenances Fixed #15651 - admin user now displaying on maintenances page commit fb4fe3004906acfc53a0d26e5e62569cb078d1e8 Author: Tobias Regnery <[email protected]> Date: Fri Oct 11 12:09:09 2024 +0200 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(). commit b054017c9f422d37c32b137b49ce04dc2a4e9533 Author: snipe <[email protected]> Date: Fri Oct 11 11:16:24 2024 +0100 Fixed #15651 - admin user now displaying on maintenances page Signed-off-by: snipe <[email protected]> commit 524a44272452d701e9da4d2e77ca10780f019f96 Author: bryanlopezinc <[email protected]> Date: Thu Oct 10 23:32:07 2024 +0100 Improved import performance commit 8aa298f6b017c27feb5787a3d58dd9cd5023f419 Merge: 1f3465773 b5b93fdd3 Author: snipe <[email protected]> Date: Thu Oct 10 12:30:53 2024 +0100 Merge pull request #15644 from snipe/form_requests_for_settings Form requests for settings commit 1f34657734f075286e6007c75cfb764637cb708c Author: snipe <[email protected]> Date: Thu Oct 10 12:30:35 2024 +0100 Fixed test Signed-off-by: snipe <[email protected]> commit 0856ee648ec8b55cf17cbbf46fddb8fb0cc05a21 Merge: 94a074a19 1dafc970d Author: snipe <[email protected]> Date: Thu Oct 10 12:23:14 2024 +0100 Merge pull request #15648 from snipe/update_packages Updated livewire to 3.5.2 commit 1dafc970dfb517d710b57a39c25470249deeeb6f Author: snipe <[email protected]> Date: Thu Oct 10 12:19:57 2024 +0100 Updated livewire to 3.5.2 Signed-off-by: snipe <[email protected]> commit 94a074a193cdcba198613906641cba57e3703890 Merge: 2d49e1eff b34a7c8aa Author: snipe <[email protected]> Date: Thu Oct 10 01:11:10 2024 +0100 Merge pull request #15601 from snipe/check_db_on_healthcheck Fixed #15439 - check database on healthcheck commit 2d49e1eff207dc37662d5a0f1017cf498c6f50c7 Merge: 705bc6f0c c2663ea1e Author: snipe <[email protected]> Date: Thu Oct 10 01:09:11 2024 +0100 Merge pull request #15637 from akemidx/bug/sc-26614 FIXED: Badge counter showing deleted assets on User page commit 705bc6f0c0d5582cb8e3dcaed97561bfd613894f Merge: 3ee571374 67a605c9a Author: snipe <[email protected]> Date: Thu Oct 10 01:08:25 2024 +0100 Merge pull request #15642 from uberbrady/fix_bulk_checkout Fix bulk checkout to users, assets, and locations commit b5b93fdd3a75bf72712b927b5c59c1e249c47f16 Author: snipe <[email protected]> Date: Thu Oct 10 00:27:00 2024 +0100 Make ldap username required Signed-off-by: snipe <[email protected]> commit d9432baf7ad497e6b7104990401a4074b1d6fe80 Author: snipe <[email protected]> Date: Wed Oct 9 23:51:20 2024 +0100 Mlore ldap style improvements Signed-off-by: snipe <[email protected]> commit 90be2a4498a71d55080663875e29ebd67cfdc433 Author: snipe <[email protected]> Date: Wed Oct 9 22:26:30 2024 +0100 Use newer naming convention for errors Signed-off-by: snipe <[email protected]> commit 3886da8941b01af7d4f7c63a141ea2bde49854c3 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:49 2024 +0100 Remove form request from get LDAP method Signed-off-by: snipe <[email protected]> commit 130e0c6242e2590cb44d60437d8b7c0f4e3c7f67 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:37 2024 +0100 More validation Signed-off-by: snipe <[email protected]> commit 4361a108183b8b1ed473be8bfe8b7c27eda7a84c Author: snipe <[email protected]> Date: Wed Oct 9 22:15:30 2024 +0100 Added string Signed-off-by: snipe <[email protected]> commit aa8048ac15fc931825083070099b0ceee550f281 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:25 2024 +0100 Blade changes for ldap Signed-off-by: snipe <[email protected]> commit 710e738e8ef0d39f0ead49f8dd0604d201a11936 Author: snipe <[email protected]> Date: Wed Oct 9 22:15:16 2024 +0100 Fixed tests Signed-off-by: snipe <[email protected]> commit 3705b914399054e29d4964371ca638524a427bed Author: snipe <[email protected]> Date: Wed Oct 9 20:51:34 2024 +0100 Added more validation Signed-off-by: snipe <[email protected]> commit 707bdad192416c9bd6be3fd221913df282601d55 Author: snipe <[email protected]> Date: Wed Oct 9 20:33:56 2024 +0100 Updated test Signed-off-by: snipe <[email protected]> commit 242fe33f973131463c5ebb297b4d05aa50974c3c Author: snipe <[email protected]> Date: Wed Oct 9 20:33:42 2024 +0100 Switch to regular HTML input Signed-off-by: snipe <[email protected]> commit ded79469c1cdfe7ce8421b872da9945cf9ff569d Author: snipe <[email protected]> Date: Wed Oct 9 20:33:29 2024 +0100 Remove unused controller method Signed-off-by: snipe <[email protected]> commit d9fbf330e5302355b4c59d14fec7311e2375fb24 Author: snipe <[email protected]> Date: Wed Oct 9 20:33:15 2024 +0100 Fixed translations Signed-off-by: snipe <[email protected]> commit 2cb9ac26cd4b5b79fc9c813a76a8a0043ef2fa6c Author: snipe <[email protected]> Date: Wed Oct 9 19:57:04 2024 +0100 Renamed test Signed-off-by: snipe <[email protected]> commit 185bc966e6c699e9ff4930a254c5c79405c0b836 Author: snipe <[email protected]> Date: Wed Oct 9 19:46:47 2024 +0100 Cleaned up use statements in tests Signed-off-by: snipe <[email protected]> commit a7f7e4938ffb99217f9cbbc70cdf08a4a9bbf9cd Author: snipe <[email protected]> Date: Wed Oct 9 19:31:56 2024 +0100 Added form action Signed-off-by: snipe <[email protected]> commit 2883e791938812a54ad2e4865cfcabd40bbb5589 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:55 2024 +0100 Removed unecessary assets creation Signed-off-by: snipe <[email protected]> commit 9c4191ae0ac4c4d338f77cb6bd3ea71c66f0844d Author: snipe <[email protected]> Date: Wed Oct 9 19:30:42 2024 +0100 Basic tests Signed-off-by: snipe <[email protected]> commit 3a77b83e9c71bf60f52e4900670047764b453e62 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:34 2024 +0100 Added space Signed-off-by: snipe <[email protected]> commit d9be2b5a5e5cff6266c0ee54b5d2261885459f69 Author: snipe <[email protected]> Date: Wed Oct 9 19:30:25 2024 +0100 Trying to use the email_array translation Signed-off-by: snipe <[email protected]> commit 69c43c610c87babcf3919a8bac8ac73f6533330b Author: snipe <[email protected]> Date: Wed Oct 9 19:30:00 2024 +0100 Fixed typo Signed-off-by: snipe <[email protected]> commit 4f957bcf7191ce17bbc33b958a5b60968fb3264f Author: snipe <[email protected]> Date: Wed Oct 9 18:34:53 2024 +0100 Required flag Signed-off-by: snipe <[email protected]> commit 5cda7cce4830626f594de8cb4d4291c161916351 Author: snipe <[email protected]> Date: Wed Oct 9 18:21:40 2024 +0100 Only accept a positive number for thresholds Signed-off-by: snipe <[email protected]> commit 41b94e7128c68af71f53e95ddd8bfbc242cde198 Author: snipe <[email protected]> Date: Wed Oct 9 18:19:26 2024 +0100 Fixed form input group Signed-off-by: snipe <[email protected]> commit aa55fa6ff496d279ca271b4614a5f778e73ae808 Author: snipe <[email protected]> Date: Wed Oct 9 18:16:34 2024 +0100 Switch to form requests for settings Signed-off-by: snipe <[email protected]> commit 67a605c9a5cf01f6028bf981a35664a399b43347 Author: Brady Wetherington <[email protected]> Date: Wed Oct 9 17:01:26 2024 +0100 Fix bulk checkout to users, assets, and locations commit c2663ea1e090c089ef58db872f9f2676891611e9 Author: akemidx <[email protected]> Date: Tue Oct 8 16:38:33 2024 -0400 withouttrashed commit 3ee5713740c9944dbcd1233c7f35bf51c0b5ca36 Merge: ab8a22f77 56e7ea667 Author: snipe <[email protected]> Date: Mon Oct 7 23:13:15 2024 +0100 Merge pull request #15631 from snipe/test/importer-tests Add importer tests commit ab8a22f77e13ad86c4964787cfe9bf12d57c7a6f Merge: 26d7572bc 8c9132aff Author: snipe <[email protected]> Date: Mon Oct 7 22:56:23 2024 +0100 Merge pull request #15630 from marcusmoore/bug/sc-27028 Only show EULA when available on print users page commit 56e7ea6677ee9372a19adb30f8338995d9a245f3 Merge: 32551d55d 803532667 Author: snipe <[email protected]> Date: Mon Oct 7 22:29:35 2024 +0100 Merge pull request #15616 from marcusmoore/test/importer-test-updates Improve importer tests commit 26d7572bcc36030f5d0b62d432a4f6bfd965d962 Merge: 382ebef8c ee046a868 Author: snipe <[email protected]> Date: Mon Oct 7 22:28:53 2024 +0100 Merge pull request #15603 from marcusmoore/fixes/add-reguard Added `Model::reguard()` to importer commit 8c9132aff9be01a90ac53b16d87303bd912b24b0 Author: Marcus Moore <[email protected]> Date: Mon Oct 7 14:22:49 2024 -0700 Hide EULA text and button when nothing will be displayed commit 382ebef8ca069767d9e340c7def62ca920537a91 Merge: 2be88cb95 f76da4844 Author: snipe <[email protected]> Date: Mon Oct 7 21:26:21 2024 +0100 Merge pull request #15621 from sniff122/develop Docker Env: Change trusted proxies to RFC1918 commit 2be88cb95517c09cb962069fd41d19ee76fead33 Merge: 7fc498a59 3f36d5f9b Author: snipe <[email protected]> Date: Mon Oct 7 11:14:24 2024 +0100 Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users Removed duplicate JS and removed line break before user section commit 3f36d5f9b38d9adae796f01b930bccbe1b6406ed Author: snipe <[email protected]> Date: Mon Oct 7 11:08:02 2024 +0100 Removed duplicate CSS and removed line break before user section Signed-off-by: snipe <[email protected]> commit f76da48448e06a6008751bcf9b7148b15722b1b8 Author: Lewis Foster <[email protected]> Date: Sat Oct 5 18:27:42 2024 +0100 Docker Env: Change trusted proxies to RFC1918 commit 8035326675e9a479c030687dc5a8079fd43e34f5 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 16:53:19 2024 -0700 Add test commit dfdd85abb17422380499d20fe4596a759ff56e4c Author: Marcus Moore <[email protected]> Date: Thu Oct 3 15:14:07 2024 -0700 Remove unused imports commit 063ea1892b3fecdd52ad8cd353c39038a8087de7 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 15:02:03 2024 -0700 Add trait to clean up files after test runs commit e21305377549886099d21b67f49d2abbccc42d91 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:59:58 2024 -0700 Swap factory syntax commit 88d549e7c5ee8fd385d897be557dbbac60a66f73 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:40:37 2024 -0700 Remove unused data provider method commit 983a25aa5f9004e05f27713fbef6e8f9302bb772 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:39:54 2024 -0700 Simplify permission tests commit bde05d6ed9840d6e712e0f4a785f9c9166f352fd Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:15:49 2024 -0700 Use new() instead of times() commit b5ffe54bd07bd6a14216e993142e9086fbdee9e7 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 13:15:02 2024 -0700 Swap assertEquals parameter order commit 863c0a8b609d9c407bf7ed038bcb7db0e40dd4df Author: Marcus Moore <[email protected]> Date: Thu Oct 3 11:43:02 2024 -0700 Fix import_type for accessory state commit 32551d55d730271d6ab24b566b111d7e80a1e3b9 Merge: 7fc498a59 e807cfab8 Author: Marcus Moore <[email protected]> Date: Thu Oct 3 11:39:21 2024 -0700 Merge pull request #15579 from bryanlopezinc/ImportTests Add Import data tests commit 7fc498a5977d975d0e349cf3d09e473369c5881b Merge: 78ca1026f cb281c640 Author: snipe <[email protected]> Date: Thu Oct 3 17:39:18 2024 +0100 Merge pull request #15613 from snipe/css_fixes_for_long_values Smarter word-wrapping on long text commit cb281c6408bb81dd0fbcb8f65e0ad6fea090c154 Author: snipe <[email protected]> Date: Thu Oct 3 17:33:46 2024 +0100 Tweaked line height Signed-off-by: snipe <[email protected]> commit f483cd448fdcf3dc75482a0e9029f0569fc3916d Author: snipe <[email protected]> Date: Thu Oct 3 17:27:37 2024 +0100 Smarter work-wrapping on long text Signed-off-by: snipe <[email protected]> commit 78ca1026fd4a02e949ac500cacd48ed2dd0b4ceb Merge: 3699d7936 722d5a58e Author: snipe <[email protected]> Date: Thu Oct 3 16:24:32 2024 +0100 Merge pull request #15612 from snipe/fixes_print_assigned_in_profile Fixes print assigned in profile commit 722d5a58e719886282f908a11420fa88f9fed4fc Author: snipe <[email protected]> Date: Thu Oct 3 16:19:38 2024 +0100 Added isset on users Signed-off-by: snipe <[email protected]> commit 7461c3e0ca2af18ed989a5905c84c5710213f1fb Author: snipe <[email protected]> Date: Thu Oct 3 16:19:27 2024 +0100 Change controller to assume a collection. (This is dumb, but whatever) Signed-off-by: snipe <[email protected]> commit 3c0f4181ae994e6e33c4c15adbb6704be921c99f Author: snipe <[email protected]> Date: Thu Oct 3 16:19:06 2024 +0100 Use the newer button style Signed-off-by: snipe <[email protected]> commit 3699d79363cb578ba0689f66cc512a84f8d143eb Merge: 54fbd0540 350b627ce Author: snipe <[email protected]> Date: Thu Oct 3 14:34:00 2024 +0100 Merge pull request #15610 from uberbrady/fix_numeric_sort_bug Fix numeric sort 'ambiguous order clause' error commit 350b627ce1a247b248845b8b85d2a802c8fb8f74 Author: Brady Wetherington <[email protected]> Date: Thu Oct 3 14:23:40 2024 +0100 Fix numeric sort 'ambiguous order clause' error commit ee046a86885deecf15601acd65ee97fac1f6b54e Author: Marcus Moore <[email protected]> Date: Wed Oct 2 10:50:40 2024 -0700 Add matching Model::reguard() commit b34a7c8aad07ce285e09cfcd4fb779c8c4295d3f Author: snipe <[email protected]> Date: Wed Oct 2 15:48:35 2024 +0100 Removed die() Signed-off-by: snipe <[email protected]> commit f92bf5dc2067cae2b533090f0c3a947d16fb4d50 Author: snipe <[email protected]> Date: Wed Oct 2 15:39:27 2024 +0100 Updated language for failure Signed-off-by: snipe <[email protected]> commit 4d9e85026aa814bd5cba426c339f931cacdafd67 Author: snipe <[email protected]> Date: Wed Oct 2 15:36:01 2024 +0100 Fixed #15439 - check database on healthcheck Signed-off-by: snipe <[email protected]> commit 54fbd0540d8600ba8f49681f158d4db4fea4e9cf Merge: b483bb163 4db735808 Author: snipe <[email protected]> Date: Wed Oct 2 12:40:49 2024 +0100 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop commit b483bb1633af5933fd8ac56a489bb8717fd14a5e Author: snipe <[email protected]> Date: Wed Oct 2 12:40:45 2024 +0100 Bumped version Signed-off-by: snipe <[email protected]> commit 4db73580869fd4d05475f68152fb6f83304c83fc Merge: 0dd6f41f6 b9cfdf2e5 Author: snipe <[email protected]> Date: Wed Oct 2 12:38:46 2024 +0100 Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug Fixed divide by zero bug in depreciation transformer commit 0dd6f41f66c0e41ca8ac3561162f818b1af88540 Author: snipe <[email protected]> Date: Wed Oct 2 11:04:55 2024 +0100 Simplified 2fa if/else Signed-off-by: snipe <[email protected]> commit 684c20ae393cc524821137fe442ce1f0b7a8873d Author: snipe <[email protected]> Date: Wed Oct 2 11:00:49 2024 +0100 Fixed parenthasis Signed-off-by: snipe <[email protected]> commit 3153bbb13fb2244a457135e7550f656a51a6ea20 Author: spencerrlongg <[email protected]> Date: Tue Oct 1 17:04:18 2024 -0500 dumb fix commit 3dc64cc5e0465e60116e2afd9e04a865d8781199 Author: Marcus Moore <[email protected]> Date: Tue Oct 1 13:35:39 2024 -0700 Reference accessory checkout and not the accessory commit c32f4e34b4a233bdd2f812b0ff6ff1e2ba3a8523 Author: snipe <[email protected]> Date: Tue Oct 1 20:35:49 2024 +0100 Minor formatting fix Signed-off-by: snipe <[email protected]> commit ca1886cebcc107b4ca4e31739cb556ad7a806caf Merge: 45ab49eea a79dfea40 Author: snipe <[email protected]> Date: Tue Oct 1 20:31:38 2024 +0100 Merge pull request #15594 from snipe/localizations/update-2024-10-01 Upda…
This is a refactor to use a blade component for the file listing table tabs, and also changes the StorageHelper do a better job of what should be able to be displayed inline and what shouldn't. (Things that are not images or PDFs can still be inlined, but only if they are allow-listed, otherwise we will force a
content-type: text/plain
to prevent rendering within the browser.)Still needs a little more refactoring, as previews for images are not showing up on objects other than hardware and users, and I'd like to shift more of that logic that's in the general helper into the StorageHelper where it makes sense, but I think this is a good start.
This solves a few issues:
php-fileinfo
App/Helpers/StorageHelper
to the app configTesting
?inline=true
to the URL, it renders as text, and does NOT display as anything else