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

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs

2020-09-22 13:28:03 +02:00

..

assets/img

…

gulp

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

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

lib

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

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

src

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

2020-09-22 13:28:03 +02: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

Merge branch 'v8/8.7' into v8/dev

2020-09-09 12:48:28 +02:00

Umbraco.Web.UI.Client.proj.DotSettings

…