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

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

2020-01-21 10:51:04 +01:00

..

BackOfficeTours

V8: Email Marketing Opt In (#7366)

2020-01-21 08:56:51 +01:00

imageprocessor

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Lang

…

splashes

AB3677 - Moved usages of Current (Core) to Current (Web)

2019-12-19 15:53:50 +01:00

ClientDependency.Release.config

Removes booting.aspx and creates embedded html pages for booting and failed (if those are ever seen ), renames some classes and namespaces, removes old cdf bundle classes

2019-01-29 23:05:59 +11:00

grid.editors.config.js

Moves editor name part out of template. Adds null checking in templates

2019-11-05 15:33:29 +01:00

HealthChecks.config

…

HealthChecks.Release.config

…

logviewer.searches.config.js

critical => fatal

2019-07-12 14:20:28 +10:00

serilog.Release.config

AB3986 - Wrapped System.Web.Hosting.IRegisteredObject in the AspNetHostingEnvironment. Updated Maindom to use our own new interface and the wrapper and moved to infrastructure. Removed the Umbraco.Core project now that it was empty.

2020-01-08 09:01:58 +01:00

serilog.user.Release.config

At some point we have upgraded Serilog.Filters.Expressions package & the signature/method name got changed to ByIncludingOnly()

2019-07-11 10:45:41 +01:00

tinyMceConfig.config

Changes mode of styleselect to All

2019-08-15 21:17:14 +02:00

tinyMceConfig.Release.config

Changes mode of styleselect to All

2019-08-15 21:17:14 +02:00

umbracoSettings.config

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

2020-01-07 07:35:34 +01:00

umbracoSettings.Release.config

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

2020-01-07 07:35:34 +01:00