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 |
|
Bjarke Berg
|
e3c8bd8ced
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Cache/MemberCacheRefresher.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
|
2020-09-23 12:54:13 +02:00 |
|
Bjarke Berg
|
dc643ab6a6
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten
# Conflicts:
# src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
# src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
# src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
# src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
# src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
|
2020-09-10 14:01:38 +02:00 |
|
Bjarke Berg
|
43a11a637d
|
https://github.com/umbraco/Umbraco-CMS/issues/8835: Moved DisableRedirectUrlTracking checks into the events, as it can be disabled/enabled without restart in netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-09-08 20:49:04 +02:00 |
|
Bjarke Berg
|
c8669b18c2
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-09-04 14:30:48 +02:00 |
|
Shannon
|
16e4ffb725
|
Fixes unsubscribing from static events on Terminate
|
2020-09-04 00:28:38 +10: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
|
e2dfc68718
|
Cleaned up config for WebRouting settings
|
2020-03-12 09:52:34 +01:00 |
|
Bjarke Berg
|
7daee53c64
|
Isolated more web usages - Membership and Request stuff
- Moved a few more files
|
2020-02-28 11:15:25 +01:00 |
|