[5.1] upmerge 2024-01-04 fix #42624
Merged
[5.1] upmerge 2024-01-04 fix #42624
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
… 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
* load lang * test-4-dupkey ---------
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
[5.0] Upmerge 2023-12-30
* Fix `function` parameter lost during redirect Currently if you are switching the menu filter in the menu item select modal, the function parameter will be lost on redirect. * Move function parameter to form url * Remove hidden input
…_SIZE rows" when checking for core updates (joomla#42576) * Use concat of columns for getting core extensions * Fix PHPCS * Remove wrong quotes
* cast to int for pgsql * yet-another ---------
[5.0] Upmerge 2024-01-02
joomla-cms-bot
added
Composer Dependency Changed
Language Change
|
Looks ok to me. When being merged with a merge commit and not a squash, all should be good. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix the upmerge of 2024-01-04