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.0] Upmerge 2023-12-30 #42580

Merged
merged 9 commits into from
Dec 30, 2023
Merged

Conversation

bembelimen
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

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

RickR2H and others added 9 commits December 20, 2023 13:22
… PR 42489 (joomla#42550)

* Better English (1)

Co-authored-by: Brian Teeman <[email protected]>

* Better English (2)

Co-authored-by: Brian Teeman <[email protected]>

* Remove br html element from language strings

---------

Co-authored-by: Brian Teeman <[email protected]>
Fixes hardening measure introduced in joomla#23716
Better message on package uninstallation when an extension from that package is missing. Fixes issue joomla#42537 .
backport [5] update from nightly to latest nightly build
joomla#41865
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev Unit/System Tests labels Dec 30, 2023
@bembelimen bembelimen merged commit af3ed9a into joomla:5.0-dev Dec 30, 2023
2 checks passed
@bembelimen bembelimen deleted the 5.0/upmerge-2023-12-30 branch December 30, 2023 23:37
.drone.yml Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester Unit/System Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants