Bjarke Berg 7dbb2dbf9a Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml

2021-01-04 12:10:56 +01:00

..

config

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

2020-10-23 10:10:02 +11:00

Properties

…

umbraco

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

2021-01-04 12:10:56 +01:00

Views/Partials

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

2020-12-01 11:34:13 +01:00

wwwroot

…

appsettings.Development.json

Migrates AuthenticationController for the 2FA requirements

2020-10-19 18:48:51 +11:00

appsettings.json

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

2020-12-14 19:22:03 +01:00

Program.cs

Remove HostBuilder UseUmbraco extension, it's not required.

2020-12-18 09:53:01 +00:00

Startup.cs

oops, trying to fix build

2020-12-23 12:27:47 +11:00

Umbraco.Web.UI.NetCore.csproj

Netcore: Package support for media + media types (#9547)

2020-12-16 22:26:47 +01:00