Skip to content

Updating 4.3-dev with changes from 4.2-dev#39681

Merged
obuisard merged 25 commits intojoomla:4.3-devfrom
obuisard:upmerge-2023-01-20
Jan 21, 2023
Merged

Updating 4.3-dev with changes from 4.2-dev#39681
obuisard merged 25 commits intojoomla:4.3-devfrom
obuisard:upmerge-2023-01-20

Conversation

@obuisard
Copy link
Copy Markdown
Contributor

No description provided.

laoneo and others added 22 commits January 14, 2023 10:54
* php 8.2 -  dynamic property Deprecated

Deprecated: Creation of dynamic property Joomla\CMS\User\User::$aid is deprecated in /shared/httpd/dev4/joomla-cms/libraries/src/User/User.php on line 871

* asset id

* Update libraries/src/User/User.php

* Update libraries/src/User/User.php

* access level id

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
…ass (joomla#39592)

* Test if an app has the property JComponentTitle

* Set the title as app config

* Change to defined property

* cs

* property order
…la#39583)

* Replace deprecated utf8 encode/decode to mb string

* Make mb string polyfill dependency explicit

* Order
* Fix library autoloading

* Codestyle

* CS

* Remove duplicate variable declaration
Updates the external script for skipto to address an RTL issue

## To test
apply pr and then run npm install
or
use a prebuilt package

Install arabic language
go to the components dashboard (index.php?option=com_cpanel&view=cpanel&dashboard=components)

## Before

## After
…joomla#39636)

* Values not translated in com_finder search result

* Update default_result.php
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Deprecated: Creation of dynamic property

* Deprecated: Creation of dynamic property
* Fix breadcrumb for Tagged Items menu item type

* CS
* Fix tinymce when sorting happen

* Fix jdragndrop when editor removed

* jscs
* fix data-processed

* add missing translation
This PR replaces the use of speech marks in the language files with escaped quotation marks.

This avoids the problem of a translator breaking their language pack by using non-escaped quotation marks instead of the speech marks.
* Missing variables

* Update error_login.php
# Conflicts:
#	administrator/components/com_admin/script.php
#	administrator/components/com_categories/src/Model/CategoryModel.php
#	administrator/components/com_config/src/Model/ApplicationModel.php
#	administrator/components/com_config/src/Model/ComponentModel.php
#	administrator/components/com_fields/src/Model/FieldModel.php
#	administrator/components/com_fields/src/Model/GroupModel.php
#	administrator/components/com_finder/src/Indexer/Query.php
#	administrator/components/com_finder/src/Service/HTML/Filter.php
#	administrator/components/com_finder/src/Service/HTML/Query.php
#	administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
#	administrator/components/com_languages/src/Model/StringsModel.php
#	administrator/components/com_menus/tmpl/items/modal.php
#	administrator/components/com_tags/src/Table/TagTable.php
#	administrator/components/com_users/src/Model/LevelsModel.php
#	administrator/components/com_users/src/Model/MailModel.php
#	administrator/components/com_users/src/Model/UserModel.php
#	administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
#	components/com_config/src/Controller/ConfigController.php
#	components/com_content/src/Model/ArchiveModel.php
#	components/com_finder/src/Controller/SuggestionsController.php
#	components/com_tags/src/Model/TagModel.php
#	components/com_tags/src/Service/Router.php
#	components/com_tags/src/View/Tag/FeedView.php
#	components/com_tags/src/View/Tag/HtmlView.php
#	components/com_users/src/Controller/ProfileController.php
#	components/com_users/src/Controller/UserController.php
#	composer.lock
#	installation/src/Model/SetupModel.php
#	layouts/joomla/form/field/text.php
#	libraries/namespacemap.php
#	libraries/src/Component/Router/Rules/NomenuRules.php
#	libraries/src/Form/Field/TextField.php
#	libraries/src/Helper/ModuleHelper.php
#	libraries/src/MVC/Model/ListModel.php
#	libraries/src/Object/CMSObject.php
#	libraries/src/Table/ContentType.php
#	plugins/authentication/cookie/src/Extension/Cookie.php
#	plugins/behaviour/versionable/src/Extension/Versionable.php
#	plugins/editors/tinymce/src/Field/TinymcebuilderField.php
#	plugins/extension/namespacemap/src/Extension/NamespaceMap.php
#	plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php
#	plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
#	plugins/quickicon/privacycheck/privacycheck.php
#	plugins/user/joomla/joomla.php
@joomla-cms-bot
Copy link
Copy Markdown

Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks.
This is an automated message from the J!Tracker Application.

@obuisard obuisard merged commit bd296af into joomla:4.3-dev Jan 21, 2023
@obuisard obuisard deleted the upmerge-2023-01-20 branch September 15, 2023 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.