yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fdb6c210755696ff3d92c1fd85dd9671830c08dc
Umbraco-CMS/src/Umbraco.Web
History
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
..
AspNet
Don't prepend root to path when path starts with root
2020-11-19 03:07:05 -08:00
Compose
Cleanup of different stuff that can be deleted from Umbraco.Web
2020-10-22 12:25:52 +02:00
Composing
Remove Security from UmbracoContext (#9392)
2020-11-24 12:52:48 +01:00
Editors
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-11-30 11:24:24 +01:00
Logging
NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356)
2020-11-10 09:50:47 +01:00
Macros
Cleanup of different stuff that can be deleted from Umbraco.Web
2020-10-22 12:25:52 +02:00
Models/Membership
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-11-30 11:24:24 +01:00
Mvc
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Properties
…
Routing
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-11-30 11:24:24 +01:00
Runtime
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Security
Created new abstraction IUmbracoWebsiteSecurity and migrated controller's using it (replacing MembershipHelper) to Umbraco.Web.Website.
2020-11-18 16:12:42 +01:00
WebApi
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
WebAssets/CDF
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths
2020-11-26 13:14:26 +01:00
AppBuilderExtensions.cs
More clean up of old configs
2020-09-14 14:12:38 +02:00
HttpContextAccessorExtensions.cs
…
HttpContextExtensions.cs
…
HttpContextUmbracoContextAccessor.cs
…
HttpCookieExtensions.cs
Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller
2020-10-23 10:10:02 +11:00
HttpRequestExtensions.cs
…
HttpUrlHelperExtensions.cs
…
IHttpContextAccessor.cs
…
ImageProcessorLogger.cs
Begin trying to replace logger in Current
2020-09-16 13:46:45 +02:00
ModelStateExtensions.cs
Fixes merge conflicts
2020-08-07 14:00:56 +02:00
OwinExtensions.cs
It builds!
2020-10-23 14:18:53 +11:00
OwinMiddlewareConfiguredEventArgs.cs
…
PublishedContentExtensions.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
PublishedElementExtensions.cs
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-11-30 11:24:24 +01:00
PublishedPropertyExtension.cs
…
RoutableDocumentFilter.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
RouteCollectionExtensions.cs
…
StringExtensions.cs
…
TypeLoaderExtensions.cs
Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
2020-11-12 11:01:19 +01:00
Umbraco.Web.csproj
Merge pull request #9448 from AndyButland/feature/membership-helper-facade-2
2020-11-26 06:38:11 +01:00
UmbracoApplication.cs
Removed CoreRuntimeBootstrapper
2020-11-19 20:21:45 +00:00
UmbracoApplicationBase.cs
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths
2020-11-26 13:14:26 +01:00
UmbracoBuilderExtensions.cs
Resolve naming issues from #9415
2020-11-25 05:11:31 +00:00
UmbracoContext.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UmbracoContextFactory.cs
Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)
2020-10-21 16:51:00 +11:00
UmbracoDbProviderFactoryCreator.cs
…
UmbracoDefaultOwinStartup.cs
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
2020-11-12 13:10:19 +01:00
UmbracoHelper.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UmbracoHttpHandler.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UmbracoInjectedModule.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UmbracoModule.cs
Merge options
2020-09-18 12:53:06 +02:00
UmbracoWebService.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UrlHelperExtensions.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
UrlHelperRenderExtensions.cs
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00