Bjarke Berg 5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore ...

# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	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

2020-12-07 12:31:26 +01:00

..

config

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

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

Properties

Boot netcore on https:localhost:44331

2020-06-29 12:13:53 +02:00

umbraco

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

2020-12-07 12:31:26 +01:00

Views/Partials

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

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

wwwroot

Replace the favicon with the U-logo

2020-03-02 09:08:14 +01:00

appsettings.Development.json

Migrates AuthenticationController for the 2FA requirements

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

appsettings.json

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

2020-12-07 12:31:26 +01:00

Program.cs

Netcore: Turn container validation back on (#9401)

2020-11-17 08:56:04 +01:00

Startup.cs

merge cleanup

2020-12-04 13:09:08 +11:00

Umbraco.Web.UI.NetCore.csproj

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

2020-12-07 12:31:26 +01:00