Skip to content

[5.3] Upmerge changes from 5.2-dev 2024-10-23#44348

Merged
richard67 merged 19 commits intojoomla:5.3-devfrom
richard67:5.3-dev-upmerge-2024-10-23
Oct 23, 2024
Merged

[5.3] Upmerge changes from 5.2-dev 2024-10-23#44348
richard67 merged 19 commits intojoomla:5.3-devfrom
richard67:5.3-dev-upmerge-2024-10-23

Conversation

@richard67
Copy link
Member

Pull Request for Issue # .

Summary of Changes

This pull request (PR) merges the changes from 5.2-dev up into 5.3-dev which have been made since the last upmerge of this kind, which this commit 1663f79 (without PR).

Testing Instructions

Review. Check the commits of this PR and those in the 5.2-dev branch.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

Hackwar and others added 19 commits October 11, 2024 13:24
* Translation for Publish & Feature

* Files for translation strings in #__assets

* Another condition for translation for #__assets

* Update administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql

* Update administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql
…a#44286)

* No menu must be selected for menu items batch processing

* Update administrator/components/com_menus/tmpl/items/default_batch_body.php
* move use statement out of phpcs disable

caused by joomla#43265

* move use statement out of phpcs disable

caused by joomla#40129

* remove blank line in phpcs disable

* fix phpcs enable rule

caused by joomla#40343
…a#44324)

* synch the sequence

* cs

* Update installation/src/Model/ConfigurationModel.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* Update installation/src/Model/ConfigurationModel.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
@joomla-cms-bot joomla-cms-bot added Composer Dependency Changed Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.3-dev labels Oct 23, 2024
@richard67 richard67 merged commit b627935 into joomla:5.3-dev Oct 23, 2024
@richard67 richard67 deleted the 5.3-dev-upmerge-2024-10-23 branch October 23, 2024 19:50
@LadySolveig LadySolveig added this to the Joomla! 5.3.0 milestone Jan 18, 2025
Kostelano added a commit to JPathRu/localisation that referenced this pull request Apr 14, 2025
joomla/joomla-cms#41496 - (upmerge с 5.2х)
joomla/joomla-cms#42530 +
joomla/joomla-cms#43994 - (upmerge с 5.2х)
joomla/joomla-cms#44009 - (upmerge с 5.2х)
joomla/joomla-cms#44010 - (upmerge с 5.2х)
joomla/joomla-cms#44161 +
joomla/joomla-cms#44187 - (upmerge с 5.2х)
joomla/joomla-cms#44207 - (upmerge с 5.2х)
joomla/joomla-cms#44271 +
joomla/joomla-cms#44273 +
joomla/joomla-cms#44288 - (только для en-GB)
joomla/joomla-cms#44348 - (upmerge с 5.2х)
joomla/joomla-cms#44366 +
joomla/joomla-cms#44367 - (upmerge с 5.2х)
joomla/joomla-cms#44434 - (upmerge с 5.2х)
joomla/joomla-cms#44448 - (upmerge с 5.2х)
joomla/joomla-cms#44462 +
joomla/joomla-cms#44487 - (upmerge с 5.2х)
joomla/joomla-cms#44587 +
joomla/joomla-cms#44600 +
joomla/joomla-cms#44604 +
joomla/joomla-cms#44621 - (upmerge с 5.2х)
joomla/joomla-cms#44623 +
joomla/joomla-cms#44632 +
joomla/joomla-cms#44640 - (позже был REVERT joomla/joomla-cms#44845)
joomla/joomla-cms#44714 - (upmerge с 5.2х)
joomla/joomla-cms#44756 +
joomla/joomla-cms#44768 - (upmerge с 5.2х)
joomla/joomla-cms#44792 - (только для en-GB)
joomla/joomla-cms#44813 +
joomla/joomla-cms#44822 - (upmerge с 5.2х)
joomla/joomla-cms#44839 +
joomla/joomla-cms#44871 +
joomla/joomla-cms#44954 +
joomla/joomla-cms#45034 - (upmerge с 5.2х)
joomla/joomla-cms#45058 - (только для en-GB)
joomla/joomla-cms#45064 +
joomla/joomla-cms#45078 - (только для en-GB)
joomla/joomla-cms#45130 - (upmerge с 5.2х)
joomla/joomla-cms#45240 - (upmerge с 5.2х)
joomla/joomla-cms#45246 - (только для др. пакетов)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Composer Dependency Changed Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester

Projects

None yet

Development

Successfully merging this pull request may close these issues.