Warren Buckley cb166526dc Merge remote-tracking branch 'origin/temp8' into temp8-logviewer ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json

2018-10-03 16:49:37 +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 remote-tracking branch 'origin/temp8' into temp8-logviewer

2018-10-03 16:49:37 +01: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

gets unpublish working

2018-10-03 14:27:48 +02:00

Umbraco

Merge branch temp8 into temp8-11502

2018-10-03 15:08:12 +02: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 remote-tracking branch 'origin/temp8' into temp8-logviewer

2018-10-03 16:49:37 +01: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

Remove obsolete stuff

2018-07-30 14:04:02 +02:00

web.Template.Release.config

Renormalize

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