-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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.3] Upmerge changes from 5.2-dev 2024-12-21 #44653
Open
richard67
wants to merge
19
commits into
joomla:5.3-dev
Choose a base branch
from
richard67:5.3-dev-upmerge-2024-12-21
base: 5.3-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]>
Co-authored-by: Benjamin Trenkle <[email protected]>
…2-19 [5.2] Upmerge changes from 4.4-dev 2024-12-19
joomla-cms-bot
added
NPM Resource Changed
This Pull Request can't be tested by Patchtester
PR-5.3-dev
labels
Dec 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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