Skip to content

[5.4] Upmerge changes from 5.3-dev 2025-02-25#45009

Merged
richard67 merged 34 commits intojoomla:5.4-devfrom
richard67:5.4-dev-upmerge-2025-02-25
Feb 25, 2025
Merged

[5.4] Upmerge changes from 5.3-dev 2025-02-25#45009
richard67 merged 34 commits intojoomla:5.4-devfrom
richard67:5.4-dev-upmerge-2025-02-25

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 5.4-dev branch was branched off the 5.3-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 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

Hackwar and others added 30 commits February 4, 2025 11:25
…omla#44902)

---------

Co-authored-by: Brian Teeman <brian@teeman.net>
…es (joomla#44922)

---------

Co-authored-by: Martina  Scholz <64533137+LadySolveig@users.noreply.github.com>
Co-authored-by: Martina  Scholz <64533137+LadySolveig@users.noreply.github.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Harald Leithner <leithner@itronic.at>
joomdonation and others added 4 commits February 22, 2025 10:59
…44878)

* Fix alignment, thanks @QuyTon
* Update php-cs-fixer rule, correctly align ??= operator
* Fix additional CS

---------

Co-authored-by: Harald Leithner <leithner@itronic.at>
* avoid warning when deleting media file/folder

* cs

* isSupported
@richard67 richard67 merged commit 377000b into joomla:5.4-dev Feb 25, 2025
3 checks passed
@richard67 richard67 deleted the 5.4-dev-upmerge-2025-02-25 branch February 25, 2025 14:12
@richard67 richard67 added this to the Joomla! 5.4.0 milestone Feb 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

Comments