Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.2] Upmerge changes from 4.4-dev 2024-12-19 #44651

Merged
merged 11 commits into from
Dec 21, 2024

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Dec 21, 2024

Pull Request for Issue # .

Summary of Changes

This pull request (PR) merges the latest changes in the current 4.4-dev branch since the last upmerge.

The only relevant change is the one from PR #44622 .

The other changes are either not relevant because they are back-ports of changes from 5.2-dev to 4.4-dev, which are PR #44577 and #44580 , or they are from translation updates already having been superseded by later updates in the 5.2-dev branch.

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 4.4-dev branch.

In addition you could test according to the testing instructions of PR ##44622 .

Actual result BEFORE applying this Pull Request

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

npm audit reports 3 vulnerabilities (2 moderate, 1 high), of which 2 can be fixed with npm audit (without --force).

Expected result AFTER applying this Pull Request

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

npm audit reports 1 moderate severity vulnerability which can only be fixed with npm audit fix --force.

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 10 commits October 7, 2024 15:08
Signed-off-by: Martin Kopp <[email protected]>
* 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 <[email protected]>
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.2-dev labels Dec 21, 2024
@Hackwar Hackwar merged commit d19b52d into joomla:5.2-dev Dec 21, 2024
0 of 2 checks passed
@pe7er pe7er added this to the Joomla! 5.2.3 milestone Dec 21, 2024
@Hackwar
Copy link
Member

Hackwar commented Dec 21, 2024

Thank you!

@richard67 richard67 deleted the 5.2-dev-upmerge-2024-12-19 branch December 21, 2024 10:32
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 PR-5.2-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants