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

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs

2020-03-02 08:34:52 +01:00

..

assets/img

…

gulp

basic setup for differentiating compile modes in gulp + only compile sourcemaps in dev mode

2019-12-06 09:34:53 +01:00

lib

Merge pull request #6790 from stevemegson/v8/pr/6230

2020-01-23 12:28:51 +00:00

src

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

2020-03-02 08:34:52 +01:00

test

fixes info notifications to appear in blue (#7351)

2020-01-05 13:28:58 +01:00

.babelrc

…

.eslintrc

…

gulpfile.js

basic setup for differentiating compile modes in gulp + only compile sourcemaps in dev mode

2019-12-06 09:34:53 +01:00

package-lock.json

Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700)

2020-02-24 11:11:33 +00:00

package.json

update angular-aria to 1.7.9 (#7606)

2020-02-10 11:48:39 +01:00

Umbraco.Web.UI.Client.proj.DotSettings

…