Benjamin Carleski bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev ...

# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs

2020-02-11 16:53:13 -08: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 'umbraco/temp-7538-image-url-generator' into netcore/dev

2020-02-11 16:53:13 -08: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

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

2020-02-07 10:04:28 +01:00

package.json

Bump tinymce from 4.9.2 to 4.9.7 in /src/Umbraco.Web.UI.Client

2020-02-03 03:27:33 +00:00

Umbraco.Web.UI.Client.proj.DotSettings

…