Skip to content

[5.3] Upmerge changes from 5.2-dev 2024-12-21#44653

Merged
rdeutz merged 19 commits intojoomla:5.3-devfrom
richard67:5.3-dev-upmerge-2024-12-21
Jan 10, 2025
Merged

[5.3] Upmerge changes from 5.2-dev 2024-12-21#44653
rdeutz merged 19 commits intojoomla:5.3-devfrom
richard67:5.3-dev-upmerge-2024-12-21

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 with PR #44621 , which are:

The changes from the 4.4-dev translation PR #44333 are not shown in the diff as they were superseded by later translation changes in the 5.2-dev branch.

The changes from the 4.4-dev PRs #44577 and #44580 are not shown as they were backports from changes from 5.2-dev to 4.4-dev. See also description of PR #44651 .

Important hint for maintainers

This PR has to be merged with a merge commit, not a squash commit.

Testing Instructions

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

Actual result BEFORE applying this Pull Request

5.3-dev branch is not up to date with 5.2-dev.

Expected result AFTER applying this Pull Request

5.3-dev branch is up to date with 5.2-dev.

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

MacJoom and others added 19 commits October 7, 2024 15:08
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* Language update

* Language update

* Language update

* Language update

* Update create-translation-pull-request-v4.yml

Rename the job to find it faster in actions

* Language update

* Language update

* Language update

* Language update
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
…2-19

[5.2] Upmerge changes from 4.4-dev 2024-12-19
@richard67 richard67 requested a review from rdeutz as a code owner December 21, 2024 11:03
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.3-dev labels Dec 21, 2024
@rdeutz rdeutz merged commit 92835a9 into joomla:5.3-dev Jan 10, 2025
@rdeutz
Copy link
Contributor

rdeutz commented Jan 10, 2025

Thanks

@richard67 richard67 deleted the 5.3-dev-upmerge-2024-12-21 branch January 10, 2025 10:40
@LadySolveig LadySolveig added this to the Joomla! 5.3.0 milestone Jan 18, 2025
@Alex-Bedeker
Copy link

Is the combination of #44522 and #44521 tested? Because I'm running Joomla 5.3.2 now with MFA and Privacy and users are getting in the never ending loop redirect mentioned in #44522.

@richard67
Copy link
Member Author

Is the combination of #44522 and #44521 tested? Because I'm running Joomla 5.3.2 now with MFA and Privacy and users are getting in the never ending loop redirect mentioned in #44522.

@Alex-Bedeker Maybe better open a new issue if a quick search for "redirect loop" does not show a result, otherwise if there is already an open issue found comment on that, because commenting on a merged upmerge PR will not really find much attendance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.