Shannon
1400a02798
Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller
# Conflicts:
# src/Umbraco.Core/Constants-Security.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
# src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
# src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
# 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/Views/AuthorizeUpgrade.cshtml
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
# src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
2020-10-23 10:10:02 +11:00
..
2020-10-23 10:10:02 +11:00
2020-07-04 17:39:44 +02:00
2020-07-04 17:39:44 +02:00
2020-07-04 17:39:44 +02:00
2020-07-04 17:39:44 +02:00
2020-07-04 17:39:44 +02:00