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

..

App_Plugins/ModelsBuilder

Revert recent change to Forms dashboard back into XML config - now that we have a way to modify from Umbraco Forms component

2018-12-11 09:43:47 +00:00

config

Merge remote-tracking branch 'origin/dev-v7' into temp8

2018-12-20 16:58:01 +11:00

Content

Port 7.7 - WIP

2017-09-08 19:39:13 +02:00

Media

Normalises whitespace (replace tabs) and add EOF line

2017-10-05 19:17:06 +01:00

Properties

Revert "Temp8 tinymce"

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

umbraco

Add missing localization of dialogs (#3844)

2018-12-31 13:37:58 +00:00

Umbraco

Merge branch 'dev-v7' into temp8

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

Views

Revert "Temp8 tinymce"

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

.eslintignore

Added eslintignore file

2018-12-03 09:50:24 +01:00

default.aspx

Removes umbraco.aspx

2018-12-19 15:30:07 +01:00

Global.asax

Revert "Temp8 tinymce"

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

Umbraco.Web.UI.csproj

Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access

2019-01-02 11:58:24 +01:00

web.Template.config

Revert "Temp8 tinymce"

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

web.Template.Debug.config

Revert "Temp8 tinymce"

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

web.Template.Release.config

Revert "Temp8 tinymce"

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