yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Mvc/UmbracoController.cs
This commit is contained in:
Shannon
2020-10-22 21:16:44 +11:00
parent d1b35deb43 e9ae1a93c3
commit 2b1dfc5888
238 changed files with 2413 additions and 3987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -29,14 +29,13 @@ using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Routing;
using Constants = Umbraco.Core.Constants;
using Umbraco.Extensions;
using Umbraco.Web.BackOffice.Controllers;
using Umbraco.Web.BackOffice.Filters;
using Umbraco.Web.BackOffice.ModelBinders;
using Umbraco.Web.Common.ActionResults;
using Umbraco.Web.Common.Attributes;
using Umbraco.Web.Common.Exceptions;
using Umbraco.Web.Common.Filters;
using Umbraco.Web.Models.Mapping;
using Umbraco.Web.Security;
using Umbraco.Web.WebApi.Filters;
namespace Umbraco.Web.BackOffice.Controllers