yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
63fceebca08764360ac8f0999fd3c65a440bd220
Umbraco-CMS/src/Umbraco.Web
History
Bjarke Berg e46a248832 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
2020-11-12 13:10:19 +01:00
..
AspNet
Merge options
2020-09-18 12:53:06 +02:00
Compose
Cleanup of different stuff that can be deleted from Umbraco.Web
2020-10-22 12:25:52 +02:00
Composing
Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
2020-11-12 11:01:19 +01:00
Controllers
Remove public ILogger from PluginController
2020-09-21 11:46:29 +02:00
Editors
Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
2020-11-12 11:01:19 +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
Migrated RenderNoContentController + related (#9309)
2020-11-03 18:55:55 +01:00
Mvc
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
2020-11-12 13:10:19 +01:00
Properties
…
Routing
Merge branch 'v8/8.6' into v8/dev
2020-09-23 11:09:40 +02:00
Runtime
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
2020-11-12 13:10:19 +01:00
Security
It builds!
2020-10-23 14:18:53 +11:00
WebApi
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
2020-11-12 13:10:19 +01:00
WebAssets/CDF
NetCore: MSDI refactor remove IFactory & IRegister (#9308)
2020-10-30 12:16:17 +01:00
AppBuilderExtensions.cs
More clean up of old configs
2020-09-14 14:12:38 +02:00
CompositionExtensions.cs
NetCore: MSDI refactor remove IFactory & IRegister (#9308)
2020-10-30 12:16:17 +01:00
GridTemplateExtensions.cs
…
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
…
OwinExtensions.cs
It builds!
2020-10-23 14:18:53 +11:00
OwinMiddlewareConfiguredEventArgs.cs
…
PublishedContentExtensions.cs
NetCore: MSDI refactor remove IFactory & IRegister (#9308)
2020-10-30 12:16:17 +01:00
PublishedElementExtensions.cs
…
PublishedPropertyExtension.cs
…
RoutableDocumentFilter.cs
Merge options
2020-09-18 12:53:06 +02: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 remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
2020-11-12 13:10:19 +01:00
UmbracoApplication.cs
NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356)
2020-11-10 09:50:47 +01:00
UmbracoApplicationBase.cs
NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356)
2020-11-10 09:50:47 +01:00
UmbracoContext.cs
It builds!
2020-10-23 14:18:53 +11: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
Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
2020-11-12 11:01:19 +01:00
UmbracoHttpHandler.cs
It builds!
2020-10-23 14:18:53 +11:00
UmbracoInjectedModule.cs
Merge options
2020-09-18 12:53:06 +02:00
UmbracoModule.cs
Merge options
2020-09-18 12:53:06 +02:00
UmbracoWebService.cs
It builds!
2020-10-23 14:18:53 +11:00
UrlHelperExtensions.cs
…
UrlHelperRenderExtensions.cs
Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
2020-11-12 11:01:19 +01:00