Shannon 08dc94a535 Merge branch 'temp8' into temp-tinymce ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html

2018-11-22 15:38:58 +11: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' into temp-tinymce

2018-11-22 15:38:58 +11:00

Content

…

Media

…

Properties

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

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

umbraco

Spotted some minor typos

2018-11-13 15:06:58 +01:00

Umbraco

fix authorize upgrade screen

2018-11-20 12:33:26 +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

Merge branch 'temp8' into temp8-231-send-to-publish-with-variants

2018-11-01 14:02:43 +11:00

web.Template.config

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

2018-10-22 16:03:01 +11: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