[5.1] upmerges 2023-11-25

[jgerman-bot]

New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/42400 Here are the upstream changes:

Click to expand the diff!

```diff diff --git a/administrator/components/com_workflow/src/Table/WorkflowTable.php b/administrator/components/com_workflow/src/Table/WorkflowTable.php index 6366a1cb460c3..d0564f0d75c1c 100644 --- a/administrator/components/com_workflow/src/Table/WorkflowTable.php +++ b/administrator/components/com_workflow/src/Table/WorkflowTable.php @@ -82,7 +82,7 @@ public function delete($pk = null) $isDefault = $db->setQuery($query)->loadResult(); if ($isDefault) { - $app->enqueueMessage(Text::_('COM_WORKFLOW_MSG_DELETE_DEFAULT'), 'error'); + $app->enqueueMessage(Text::_('COM_WORKFLOW_MSG_DELETE_IS_DEFAULT'), 'error'); return false; } diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 9864e177ca8eb..723b24fe7a63b 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -222,6 +222,7 @@ COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" +COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" COM_USERS_MAIL_REGISTRATION_ADMIN_VERIFICATION_REQUEST_DESC="Notification to admins to verify a new, verified account." diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 4597691b85297..89455c42352b1 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -7,7 +7,7 @@ (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt 5.1.0-alpha1-dev - 2023-10 + 2023-11 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php index c2caef06fb040..eaedcdbac0c43 100644 --- a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php +++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php @@ -62,7 +62,6 @@ $wa->getRegistry()->addExtensionRegistryFile('plg_editors_tinymce'); $wa->registerAndUseStyle('tinymce.skin', 'media/vendor/tinymce/skins/ui/oxide/skin.min.css') - ->registerAndUseStyle('tinymce.skin.dark', 'media/vendor/tinymce/skins/ui/oxide-dark/skin.min.css') ->registerAndUseStyle('plg_editors_tinymce.builder', 'plg_editors_tinymce/tinymce-builder.css', [], [], ['tinymce.skin', 'dragula']) ->registerScript('plg_editors_tinymce.builder', 'plg_editors_tinymce/tinymce-builder.js', [], ['type' => 'module'], ['dragula', 'plg_editors_tinymce']) ->useScript('plg_editors_tinymce.builder') diff --git a/libraries/src/Version.php b/libraries/src/Version.php index c0c6d0d5fe6f6..0de116011519f 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '5-October-2023'; + public const RELDATE = '25-November-2023'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '19:48'; + public const RELTIME = '14:49'; /** * Release timezone. ```

[tecpromotion]

see e34a03254fcc96a99bfffe80fa6bab7c3be27305