Bjarke Berg 520309e3f8 Merge remote-tracking branch 'origin/v12/dev' into v14/dev ...

# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs

2023-06-12 10:10:08 +02:00

..

AliasUrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderByIdPath.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderByPageIdQuery.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderByRedirectUrl.cs

Merge branch 'v10/dev' into v10/contrib

2022-07-11 15:04:46 +02:00

ContentFinderByUrl.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderByUrlAlias.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderByUrlAndTemplate.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderCollection.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ContentFinderCollectionBuilder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

DefaultMediaUrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

DefaultUrlProvider.cs

Improve logging performance by checking Trace/Debug log level is enabled (#12793)

2023-06-07 11:47:05 +02:00

Domain.cs

Sort domains (Culture and Hostnames) (#13797)

2023-02-14 10:35:45 +01:00

DomainAndUri.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

DomainUtilities.cs

Sort domains (Culture and Hostnames) (#13797)

2023-02-14 10:35:45 +01:00

IContentFinder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IContentLastChanceFinder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IMediaUrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IPublishedRequest.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IPublishedRequestBuilder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IPublishedRouter.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IPublishedUrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

ISiteDomainMapper.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

IUrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

MediaUrlProviderCollection.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

MediaUrlProviderCollectionBuilder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

PublishedRequest.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

PublishedRequestBuilder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

PublishedRequestExtensions.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

PublishedRequestOld.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

PublishedRouter.cs

Only attempt to find template when TemplateId is not null or default

2022-10-24 11:47:28 +01:00

RouteDirection.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

RouteRequestOptions.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

SiteDomainMapper.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UmbracoRequestPaths.cs

Post merge fixes

2023-03-20 09:37:11 +01:00

UmbracoRequestPathsOptions.cs

V11: Merge dev to contrib (#13363)

2022-11-08 08:21:55 +01:00

UmbracoRouteResult.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UriUtility.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UrlInfo.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UrlProvider.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UrlProviderCollection.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UrlProviderCollectionBuilder.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00

UrlProviderExtensions.cs

Merge remote-tracking branch 'origin/v12/dev' into v14/dev

2023-06-12 10:10:08 +02:00

WebPath.cs

V10: Fix build warnings in core (#12438)

2022-06-07 15:28:38 +02:00