[5.2] Upmerge 2024-05-14 #43469
Merged
[5.2] Upmerge 2024-05-14 #43469
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
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
…ions (joomla#43336) * a * b * Update LocalAdapter.php
…eck CLI (joomla#43208) * Untranslated string for warning message in update:extensions:check CLI * Move language load to command. ---------
…3274) * Update LocalAdapter.php * Update LocalAdapter.php ---------
…oomla#43259) * Determine the next task run date with the timezone of the site * cs ---------
* [4.4] Vote : aggregateRating error in Google Rich Results * Update rating.php * Update rating.php Replace tabs by spaces * Update plugins/content/vote/tmpl/rating.php Co-authored-by: jsanders <j53.sanders@gmail.com> * Update rating.php remove itemscope redefinition ---------
After discussion with Alikon the fix is simple 10 milliseconds waiting time after changing sorting order. The five failures were reproducable in 4.4-dev and ifixed and it is expected it works for 5.1 the same way.
* Contact VCF: properly assign to array * Update components/com_contact/src/View/Contact/VcfView.php ---------
* Fix ordering for files in the template view * Rewrite getDirectoryTree function using early return and uksort * CS * Use natural sorting instead of string comparison ---------
This reverts commit 53959fa.
[5.1] Upmerges 2024-05-08
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com> Co-authored-by: Harald Leithner <leithner@itronic.at> Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
joomla-cms-bot
added
NPM Resource Changed
brianteeman
added a commit
to brianteeman/joomla-cms
that referenced
this pull request
Jun 6, 2024
[5.2] Upmerge 2024-05-14 joomla#43469 was incorrect as it updated package.json to 5.2 but only chabged the lock file to 5.1.1
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.
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