V15: Merge #16801
Merged
V15: Merge #16801
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
* Ported over #15928 changes for 13.3 RC * Use GetOrAdd() * Lock dictionary initialization --------- Co-authored-by: Jason Elkin <jasonelkin86@gmail.com>
* Make the API content response builder extendable * DeliveryApiJsonTypeResolver needs to be extendable too
* Add blocks telemetry * Use constants and update tests * V13: Add property type information to telemetry (#16109) * Add property type counts to telemetry * Use constants and fix tests * Update description
* Fix for fallback file upload (#14892) * Added check for file type * Removed unneeded null checks and fixed tabs * Cleaning * Cleanups, cleanups, and removal of unneeded null checks * Reverted removal of relationshipservice * Revert null check removals (too risky) --------- Co-authored-by: Ambert van Unen <AvanUnen@ilionx.com> Co-authored-by: Laura Neto <12862535+lauraneto@users.noreply.github.com> (cherry picked from commit 0b5d1f8) * Fix up formatting --------- Co-authored-by: Ambert van Unen <ambertvu@gmail.com>
(cherry picked from commit cae106b)
…iateValue - this was unexpected in the XPath navigator code (#16121)
* fix: include all headers in webhook log * feat: return webhook log status from server * feat: make webhook logs deep linkable * feat: add webhook log pagination * feat: improve webhook request/response body preview
* Introduce EagerMatcherPolicy to conditionally bypass content routing * Ensure that the candidate we disable dynamic routing for is valid * Skip Umbraco endpoints * Simplify logic a bit * Move install logic to matcher * Ensure that dynamic routing is still skipped when in upgrade state * Fixup comments * Reduce nesting a bit * Don't show maintenance page when statically routed controllers are hít * Remove excess check, since installer requests are statically routed
* Introduce EagerMatcherPolicy to conditionally bypass content routing * Ensure that the candidate we disable dynamic routing for is valid * Skip Umbraco endpoints * Simplify logic a bit * Move install logic to matcher * Ensure that dynamic routing is still skipped when in upgrade state * Fixup comments * Reduce nesting a bit * Don't show maintenance page when statically routed controllers are hít * Remove excess check, since installer requests are statically routed (cherry picked from commit ba9ddd1)
…v13/dev # Conflicts: # version.json
…v10/dev # Conflicts: # version.json
# Conflicts: # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
…v12/dev # Conflicts: # version.json
# Conflicts: # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
* Move ReservedFieldNames to type configuration endpoints * Update obsoletion messages * Update src/Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> --------- Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
…ApiContentIndex without the special index value transformations
…DeliveryApiContentIndex without the special index value transformations" This reverts commit a7ff328.
…piContentIndex" This reverts commit f6deaca.
* fix: move usernameIsEmail from the current user to the user configuration since it is a static variable not only relevant to the current user * update OpenApi.json * update OpenApi.json * update OpenApi.json
# Conflicts: # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# Conflicts: # src/Umbraco.Web.UI.Client
…be able to work with the background in certain steps
…be able to work with the background in certain steps
…DeliveryApiContentIndex` (#16756) * Removing override of OnTransformingIndexValues from DeliveryApiContentIndex * Making sure that TransformingIndexValues event is raised for DeliveryApiContentIndex without performing the special index value transformations * Review suggestion
* chore: remove the `user-defined.css` asset from the RCL You cannot overwrite an asset in an RCL just like that, as the user-defined.css were intended. * delete actual file
…cted to be able to work with the background in certain steps" This reverts commit d72fc5c.
V14: Merge
…erge # Conflicts: # Directory.Packages.props # tests/Directory.Packages.props # version.json
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.
Merges v14 into v15