Shannon
|
0f0c50b56e
|
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
# Conflicts:
# src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
# src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
# src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
# src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
|
2020-12-02 13:14:47 +11:00 |
|