Shannon d72c11821f Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope ...

# Conflicts:
#	src/Umbraco.Core/HybridAccessorBase.cs
#	src/Umbraco.Core/Security/IBackOfficeSecurityFactory.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs

2021-03-04 16:57:32 +11:00

..

config

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies

2021-02-22 09:00:33 +01:00

Properties

Fixed buildscripts to work with latest Umbraco.Build (0.2.17) and Directory.Build.props. Also updates the port (Now located in launchSettings.json) number if SetUmbracoVersion is called.

2021-02-16 12:28:37 +01:00

umbraco

Netcore: Align namespaces (#9801)

2021-02-18 11:06:02 +01:00

Views

Adds common.views to view imports

2021-02-26 14:11:00 +11:00

wwwroot

Replace the favicon with the U-logo

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

appsettings.Development.json

Netcore: Fixes issues with user invites (#9616)

2021-01-12 16:15:19 +01:00

appsettings.json

Reverted appsettings

2021-02-22 20:57:41 +00:00

Program.cs

Netcore: Align namespaces (#9801)

2021-02-18 11:06:02 +01:00

Startup.cs

Netcore: Align namespaces (#9801)

2021-02-18 11:06:02 +01:00

Umbraco.Web.UI.NetCore.csproj

Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope

2021-03-04 16:57:32 +11:00