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 |
|
Ronald Barendse
|
2bfef74191
|
Fix casing of 'URL' (#9080)
|
2020-10-05 20:48:38 +02:00 |
|
Mole
|
d61b9f54fa
|
Merge options
|
2020-09-18 12:53:06 +02:00 |
|
Nikolaj
|
b8c60d1666
|
Refactor Fatal with simple message
|
2020-09-14 11:23:17 +02:00 |
|
Bjarke Berg
|
e079bd5a50
|
Cleanup usages of Configs
|
2020-09-08 13:03:43 +02:00 |
|
Andy Butland
|
89b725ef28
|
Reverted non netcore related project amends in order to limit changes to those necessary for the netcore executable call stack.
|
2020-08-23 14:05:35 +02:00 |
|
Andy Butland
|
510bd92e78
|
Amended injection of further settings to use IOptionsSnapshot.
|
2020-08-21 14:52:47 +01:00 |
|
Bjarke Berg
|
ef7af69731
|
https://github.com/umbraco/Umbraco-CMS/issues/7138 - Injected IIOHelper (#7581)
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
|
2020-02-10 11:23:23 +01:00 |
|
Bjarke Berg
|
d2443ea4c0
|
AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff.
|
2020-01-07 13:08:21 +01:00 |
|
Bjarke Berg
|
13507c0e13
|
AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭)
|
2019-11-08 07:51:14 +01:00 |
|
Shannon
|
aa9ece94b7
|
naming convention and null check
|
2019-09-12 23:37:17 +10:00 |
|
Shannon Deminick
|
d7b950fe06
|
Update src/Umbraco.Web/RoutableDocumentFilter.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
|
2019-09-12 23:14:18 +10:00 |
|
Shannon Deminick
|
2c27a631c9
|
Update src/Umbraco.Web/RoutableDocumentFilter.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
|
2019-09-12 23:14:10 +10:00 |
|
Shannon
|
0a12f86108
|
Moves the reserved path detection to RoutableDocumentFilter, adds caching to MVC route detection
|
2019-09-10 16:09:09 +10:00 |
|
Shannon
|
44fbdb7028
|
renames class
|
2019-09-10 14:23:42 +10:00 |
|