Merge 5.11 changes into 6.x - #19209
Draft
brandonkelly wants to merge 61 commits into
Draft
Conversation
[ci skip]
[ci skip]
UrlHelper::removeParams(), removeAllParams()
Resolves #19139
# Conflicts: # src/helpers/UrlHelper.php # tests/unit/helpers/UrlHelperTest.php
[ci skip]
# Conflicts: # CHANGELOG-5.11.md # composer.json # composer.lock
# Conflicts: # composer.lock
[ci skip]
reorderNestedElements()
# Conflicts: # composer.lock
# Conflicts: # CHANGELOG-5.11.md # composer.lock # src/controllers/NestedElementsController.php # src/services/Elements.php # tests/unit/services/ElementsTest.php
📚 Storybook previews@craftcms/ui — open Storybook No changed components detected in this Storybook. resources/js — open Storybook No changed components detected in this Storybook. |
# Conflicts: # composer.lock
# Conflicts: # composer.lock
[ci skip]
…dpoints Add support for `.well-known/passkey-endpoints`
# Conflicts: # src/config/app.php
Only create missing assets_sites rows for assets that have globally-defined alt text, and null/missing translated alt text
# Conflicts: # src/Http/Controllers/NestedElementsController.php # src/Support/Url.php
# Conflicts: # CHANGELOG-5.11.md # CHANGELOG.md # src/fields/data/LinkData.php
[ci skip]
…-amends respect alt text translation method from the start
# Conflicts: # src/Asset/Elements/Asset.php
for people already running v6 alpha, and this way we can keep Cms::MIN_VERSION_REQUIRED set to 5.9.0
# Conflicts: # CHANGELOG-5.11.md # src/config/app.php # src/controllers/UsersController.php # src/elements/Asset.php # src/elements/db/AssetQuery.php
…t-amends-v6-2 [6.x] translatable asset alt text amends
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
2 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.
No description provided.