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

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/IO/SystemDirectories.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Scoping/ScopeProvider.cs
#	src/Umbraco.Core/Services/IIconService.cs
#	src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
#	src/Umbraco.Tests/Scoping/ScopeTests.cs
#	src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/PreviewController.cs

2021-03-19 16:18:32 +01:00

..

assets/img

…

gulp

Include sourcemaps for minified dependencies

2021-03-16 08:22:07 +01:00

lib

Fix casing of 'URL' (#9080)

2020-10-05 20:48:38 +02:00

src

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

2021-03-19 16:18:32 +01:00

test

Fix karma.conf JS test for folder names to make UNIX tests pass

2021-03-15 13:41:14 +00:00

.babelrc

…

.eslintrc

…

gulpfile.js

run JS unit test in development script (#9014)

2020-11-23 11:31:31 +01:00

package-lock.json

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

2021-03-19 16:18:32 +01:00

package.json

Merge pull request #9839 from kjac/netcore/feature/minify-js-resources

2021-03-15 15:08:35 +11:00

Umbraco.Web.UI.Client.proj.DotSettings

…