Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code changes from V13.4 #16652

Merged
merged 53 commits into from
Jun 25, 2024
Merged

Code changes from V13.4 #16652

merged 53 commits into from
Jun 25, 2024

Conversation

bergmania
Copy link
Member

@bergmania bergmania commented Jun 25, 2024

Merge from v13.4

AndyButland and others added 30 commits March 20, 2024 13:20
* 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>
…etLocalizedTextService

(cherry picked from commit b001668)
(cherry picked from commit 2bb56f1)
…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)
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
bergmania and others added 21 commits May 22, 2024 12:21
…v13/dev

# Conflicts:
#	src/Umbraco.Web.Website/Routing/EagerMatcherPolicy.cs
#	version.json
* Do not execute query if no macros found

* Request cache the permission lookup

* Unbreak change by adding obsolete ctor

* Clean up

* Wrap indexing for delivery API in a scope

* Do not ask options every time for the timeout, instead listen for updates

* Lookup content types once instead of one by one

* Use TryGetValue instead

* Do a distinct on user ids before building index, to avoid issue with more than 2100 parameters

* Don't map ContentDto (it's unused)

* Introduce request bound block editor element cache

---------

Co-authored-by: kjac <kja@umbraco.dk>
… always routed through the UmbracoRouteValueTransforms (#16540)
… API (#16550)

* RTE and media picker should route medias the same way in the Delivery API

* Fix failing unit test

* Fixed failing tests
* Rename FindDomain to FindAndSetDomain

* Ensure VariationContext and PublishedRequest is updated for virtual page controller
* Bumped version of helper and builder

* Removed faker
@bergmania bergmania merged commit 215fc43 into v14/dev Jun 25, 2024
11 of 15 checks passed
@bergmania bergmania deleted the v14/feature/merge-2024-06-25 branch June 25, 2024 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.