Skip to content

Conversation

@richard67
Copy link
Member

Pull Request for Issue # .

Summary of Changes

This pull request (PR) merges the changes from 5.3-dev up into 5.4-dev which have been made since the last upmerge PR #45985 2 days ago, which are:

The change from PR #45987 was already made in 5.4-dev with PR #45784 .

Testing Instructions

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

Actual result BEFORE applying this Pull Request

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

Expected result AFTER applying this Pull Request

5.4-dev branch is up to date with 5.3-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

joomla-translation-bot and others added 7 commits August 26, 2025 20:25
* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
…ming 5.3.4 release (joomla#45984)

* composer update enshrined/svg-sanitize to 0.22.0

* npm fix audit issues
…rsor placement (joomla#45987)

* npm update tinymce from 6.8.5 to 6.8.6

* Update version in tinymce.xml
@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.4-dev labels Aug 28, 2025
@richard67 richard67 added this to the Joomla! 5.4.0 milestone Aug 28, 2025
@muhme
Copy link
Contributor

muhme commented Aug 28, 2025

✅ Verified by a quick check of the file changes

@muhme muhme merged commit 3c96b7f into joomla:5.4-dev Aug 28, 2025
40 checks passed
@richard67 richard67 deleted the 5.4-dev-upmerge-2025-08-28 branch August 28, 2025 07:24
@muhme
Copy link
Contributor

muhme commented Aug 28, 2025

Thank you @richard67 for your contribution.

softforge pushed a commit that referenced this pull request Aug 28, 2025
* [5.3] Translation Update (#45983)

* Fix copy / paste error (#45979)

* [5.3] Security updates for composer and npm dependencies for the upcoming 5.3.4 release (#45984)

* composer update enshrined/svg-sanitize to 0.22.0

* npm fix audit issues

* [5.3] Update TinyMCE from 6.8.5 to 6.8.6 to fix TinyMCE issue with cursor placement (#45987)

* npm update tinymce from 6.8.5 to 6.8.6

* Update version in tinymce.xml

* [5.4] Revert b/c breaking change in AbstractView::get (#45940)

* Revert "[5.4] Replace deprecation AbstractView::get() in layouts (#45702)"
* This reverts commit f1906ba.

* [5.3] Update joomla/filesystem to fix extension uploads when post_max_size is 0 (#45986)

* [5.4] Upmerge 2025-08-28 (#45997)

* [5.3] Translation Update #45983
* [5.3] Fix copy / paste error in form fields #45979
* [5.3] Security updates for composer and npm dependencies for the upcoming 5.3.4 release #45984
* [5.3] Update joomla/filesystem to fix extension uploads when post_max_size is 0 #45986

* [5.4] Composer update joomla/filesystem to 3.2.0 (#45999)

* Update content-hash
@richard67 richard67 mentioned this pull request Aug 29, 2025
4 tasks
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 PR-5.4-dev

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants