Sebastiaan Janssen aceb5c7971 Merge branch 'dev-v7' into temp8 ...

# Conflicts:
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Web.UI.Client/src/less/helveticons.less
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs

2019-01-03 10:32:34 +01:00

..

assets/img

…

docs

Revert "Temp8 tinymce"

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

lib

Markdown editor: Fix the redo button + remove the button hover flicker

2018-12-09 14:29:39 +01:00

src

Merge branch 'dev-v7' into temp8

2019-01-03 10:32:34 +01:00

test

changing from click and focus shorthands

2018-11-28 13:22:30 +01:00

.babelrc

Revert "Temp8 tinymce"

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

.eslintrc

Revert "Temp8 tinymce"

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

gulpfile.js

don't ship with moments libraries including locales

2018-11-29 14:24:15 +01:00

package-lock.json

Using npx for running gulp (#3938)

2018-12-31 14:10:31 +00:00

package.json

Using npx for running gulp (#3938)

2018-12-31 14:10:31 +00:00

setupgulp.bat

Revert "Temp8 tinymce"

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

Umbraco.Web.UI.Client.proj.DotSettings

Revert "Temp8 tinymce"

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