Shannon 061529c40d Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge ...

# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
#	src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
#	src/Umbraco.Core/Services/IExternalLoginService.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/ExternalLoginFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.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.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/OwinExtensions.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Web/Services/IconService.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
#	src/Umbraco.Web/ViewDataExtensions.cs

2020-10-23 14:33:32 +11:00

..

assets/img

…

gulp

Gets password roll forward working

2020-10-07 16:56:48 +11:00

lib

Merge remote-tracking branch 'netcore/dev' into netcore/netcore

2020-08-26 08:05:15 +02:00

src

Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge

2020-10-23 14:33:32 +11:00

test

Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore

2020-09-09 19:13:37 +02:00

.babelrc

…

.eslintrc

adds utility.js as facade to generic javascript utility functio… (#7738)

2020-03-24 17:48:14 +01:00

gulpfile.js

fix of npm run unit, plus begin able to test code that uses promises.

2020-06-19 09:41:19 +02:00

package.json

Gets password roll forward working

2020-10-07 16:56:48 +11:00

Umbraco.Web.UI.Client.proj.DotSettings

…