From bce2007b97adff1926519306e51765085fcfdf0a Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 25 Feb 2025 16:38:40 +0000 Subject: [PATCH 01/12] Fixes #16331 - Don't make passport:install command require user input --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 7d2d2660ab..dcc0f9e093 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -256,7 +256,7 @@ class SettingsController extends Controller Artisan::call('migrate', ['--force' => true]); if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) { Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations', '--force' => true]); - Artisan::call('passport:install'); + Artisan::call('passport:install', ['--no-interaction' => true]); } return view('setup/migrate') From c73d64cdbc36ece5e613a603d1ed50f04dbc451d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 13:37:23 -0800 Subject: [PATCH 02/12] Remove manual doctrine mapping for enums --- app/Models/CustomField.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index 81eff9b4cd..cc29cefe41 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -149,11 +149,6 @@ class CustomField extends Model return true; } - // This is just a dumb thing we have to include because Laraval/Doctrine doesn't - // play well with enums or a table that EVER had enums. :( - $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform(); - $platform->registerDoctrineTypeMapping('enum', 'string'); - // Rename the field if the name has changed Schema::table(self::$table_name, function ($table) use ($custom_field) { $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal('name')), $custom_field->convertUnicodeDbSlug()); From 37e4a1397960f8ffd5c6bcffb7211a24e7947317 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:15:12 -0800 Subject: [PATCH 03/12] Replace Form::checkbox in image upload partial --- resources/views/partials/forms/edit/image-upload.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php index 6bc77aaee0..8032cf85f1 100644 --- a/resources/views/partials/forms/edit/image-upload.blade.php +++ b/resources/views/partials/forms/edit/image-upload.blade.php @@ -4,7 +4,7 @@
From 510946e0ebb10cbfbc414ba627bb86b80f6a9d9e Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:20:43 -0800 Subject: [PATCH 04/12] Replace Form::checkbox in logo upload partial --- resources/views/partials/forms/edit/uploadLogo.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php index b7c9cf49ae..695829dbda 100644 --- a/resources/views/partials/forms/edit/uploadLogo.blade.php +++ b/resources/views/partials/forms/edit/uploadLogo.blade.php @@ -47,7 +47,7 @@
From ecd7dc20944b32e67351ef86d0574b6cc799987a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:23:26 -0800 Subject: [PATCH 05/12] Replace Form::checkbox on alert settings page --- resources/views/settings/alerts.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index db39a85a6d..04554bcf35 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -45,7 +45,7 @@
@@ -55,7 +55,7 @@
From de330a47cdbf6b1a567f358c508a90a27708e58f Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:25:02 -0800 Subject: [PATCH 06/12] Replace Form::checkbox on asset tag settings page --- resources/views/settings/asset_tags.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php index 6b25eb520e..4ac001b96b 100644 --- a/resources/views/settings/asset_tags.blade.php +++ b/resources/views/settings/asset_tags.blade.php @@ -47,7 +47,7 @@
From d88c79366c2e27ed97a7b84835bd7b6033967cb3 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:27:07 -0800 Subject: [PATCH 07/12] Replace Form::checkbox on google settings page --- resources/views/settings/google.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php index 64cca8d1ab..a1391ea031 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -54,7 +54,7 @@

{{ trans('admin/settings/general.enable_google_login_help') }}

From 46b31dfe147d13b1e00aae1ed68f3ed150190fad Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 14:32:39 -0800 Subject: [PATCH 08/12] Replace Form::checkbox on user create and edit page --- resources/views/users/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 223f9992cf..d3ed344459 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -213,7 +213,7 @@ @elseif ($user->id === Auth::user()->id)

{{ trans('admin/users/general.activated_disabled_help_text') }}

@@ -259,7 +259,7 @@
From 15f842e2dc07cf3bf2711dd56a48af43c20261b9 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 16:00:46 -0800 Subject: [PATCH 09/12] Replace Form::checkbox on bulk user edit page --- resources/views/users/bulk-edit.blade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index 5909e4a25f..b800870c39 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -42,7 +42,7 @@
@@ -55,7 +55,7 @@
@@ -69,7 +69,7 @@
@@ -83,7 +83,7 @@
@@ -102,7 +102,7 @@
@@ -246,7 +246,7 @@
@@ -264,7 +264,7 @@
From 2c5170a21836e86443bd8981a6e1539182834661 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 17:09:25 -0800 Subject: [PATCH 10/12] Replace Form::checkbox on security settings page --- resources/views/settings/security.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index e534d2c1da..4c555bb1d4 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -83,27 +83,27 @@
@@ -129,7 +129,7 @@

{{ trans('general.feature_disabled') }}

@else @@ -158,7 +158,7 @@ {!! $errors->first('login_common_disabled', '') !!} From f9ccf32af46dea4dff74ec97fb45a08ebb07478d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 17:22:44 -0800 Subject: [PATCH 11/12] Replace Form::checkbox on ldap settings page --- resources/views/settings/ldap.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 218c52d720..24f4fd79ef 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -75,7 +75,7 @@
@@ -96,7 +96,7 @@
@error('is_ad') @@ -122,7 +122,7 @@
@@ -255,7 +255,7 @@
@error('ldap_tls') @@ -281,7 +281,7 @@
@error('ldap_server_cert_ignore') From e01226a1743243c457df4bf106e0dc9764aeee75 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 25 Feb 2025 17:31:05 -0800 Subject: [PATCH 12/12] Replace Form::checkbox on saml settings page --- resources/views/settings/saml.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php index 02321054aa..63625e5749 100644 --- a/resources/views/settings/saml.blade.php +++ b/resources/views/settings/saml.blade.php @@ -52,7 +52,7 @@
@@ -146,7 +146,7 @@

{{ trans('admin/settings/general.saml_forcelogin_help') }}

@@ -162,7 +162,7 @@

{{ trans('admin/settings/general.saml_slo_help') }}