[5.3] Upmerge changes from 5.2-dev 2024-10-23 (1st try)#44347
Closed
richard67 wants to merge 21 commits intojoomla:5.3-devfrom
Closed
[5.3] Upmerge changes from 5.2-dev 2024-10-23 (1st try)#44347richard67 wants to merge 21 commits intojoomla:5.3-devfrom
richard67 wants to merge 21 commits intojoomla:5.3-devfrom
Conversation
* Translation for Publish & Feature * Files for translation strings in #__assets * Another condition for translation for #__assets * Update administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql * Update administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql
…a#44286) * No menu must be selected for menu items batch processing * Update administrator/components/com_menus/tmpl/items/default_batch_body.php
* move use statement out of phpcs disable caused by joomla#43265 * move use statement out of phpcs disable caused by joomla#40129 * remove blank line in phpcs disable * fix phpcs enable rule caused by joomla#40343
…a#44324) * synch the sequence * cs * Update installation/src/Model/ConfigurationModel.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Update installation/src/Model/ConfigurationModel.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> --------- Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
joomla-cms-bot
added
Composer Dependency Changed
Language Change
Member
Author
|
Seems I missed PR #44084 here doe to wrong conflict resolution. Will close this PR here and make a new one so U will not mess up commit history with a fix. |
richard67
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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 of this kind, which this commit 1663f79 (without PR).
Testing Instructions
Review. Check the commits of this PR and those in the 5.2-dev branch.
Link to documentations
Please select:
No documentation changes for docs.joomla.org needed
No documentation changes for manual.joomla.org needed