Warren Buckley 31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping ...

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs

2018-10-09 09:25:00 +01:00

..

App_Plugins/ModelsBuilder

Fix up modelsbuilder dashboard - we now use ng-bind-html directive as opposed to ng-bind-html-unsafe

2018-06-13 12:27:22 +01:00

config

Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089

2018-10-08 10:23:53 +02: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

Merge remote-tracking branch 'origin/temp8' into temp8-serilog

2018-07-31 09:51:44 +01:00

umbraco/developer/Packages

Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping

2018-10-09 08:53:40 +01:00

Umbraco

Merge branch 'temp8' into temp8-3087-tree-grouping

2018-10-09 09:25:00 +01:00

Views

Fix various build issues

2018-09-10 16:23:27 +02:00

default.aspx

Renormalize

2018-06-29 19:52:40 +02:00

Global.asax

Renormalize

2018-06-29 19:52:40 +02:00

Umbraco.Web.UI.csproj

Removed all keys which are not being referenced anywhere in the code base.

2018-10-08 11:58:22 +02:00

web.Template.config

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

2018-10-01 14:32:46 +02:00

web.Template.Debug.config

Changes compilation batch mode to true uses Roslyn compiler for views

2018-09-07 13:10:55 +10:00

web.Template.Release.config

Renormalize

2018-06-29 19:52:40 +02:00