Bjarke Berg
|
85c01d9905
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
# src/Umbraco.Configuration/Legacy/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Models/ContentBaseExtensions.cs
# src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Services/IRuntimeState.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/RuntimeState.cs
# src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
# src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Install/Controllers/InstallController.cs
# src/Umbraco.Web/PublishedElementExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UrlHelperExtensions.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
# src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
|
2020-12-01 11:34:13 +01:00 |
|
Bjarke Berg
|
c88c842d47
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# .github/workflows/codeql-analysis.yml
# src/Umbraco.Core/CompositionExtensions.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/GuidUdi.cs
# src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
# src/Umbraco.Core/PublishedContentExtensions.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UrlProvider.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Services/IRuntimeState.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
# src/Umbraco.Core/Sync/IServerRegistrar.cs
# src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
# src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
# src/Umbraco.Tests/Routing/UrlProviderTests.cs
# src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
# src/Umbraco.Web/CompositionExtensions.cs
# src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComponent.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/UmbracoContext.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
|
2020-11-30 11:24:24 +01:00 |
|
Andy Butland
|
64f8752587
|
Removed introduced second constructors for IOptions based depenedencies and used Options.Create instead.
|
2020-08-26 11:58:44 +02:00 |
|
Andy Butland
|
2cd91a5a54
|
Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services.
Further amends to return to booting application.
|
2020-08-23 23:36:48 +02:00 |
|
Andy Butland
|
510bd92e78
|
Amended injection of further settings to use IOptionsSnapshot.
|
2020-08-21 14:52:47 +01:00 |
|
Bjarke Berg
|
39162f0f6a
|
Merge conflicts resolved
|
2020-08-06 12:59:21 +02:00 |
|
Bjarke Berg
|
e3ac778fc9
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Cache/WebCachingAppCache.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
# src/Umbraco.Web/Macros/MacroRenderer.cs
# src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
|
2020-04-01 12:44:53 +02:00 |
|
Bjarke Berg
|
d147b182ee
|
Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure.
|
2020-02-06 14:40:46 +01:00 |
|