Stephan 04c654c290 Fix merges

2018-09-06 15:59:10 +02:00

..

App_Browsers

Renormalize

2018-06-29 19:52:40 +02: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 origin/dev-v7 into temp8

2018-09-06 13:07:09 +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

u4-8310 - Added error message to the xml file.

2018-08-29 14:35:20 +01:00

Umbraco

Merge pull request #2900 from umbraco/temp8-validation-quirks

2018-09-06 15:00:05 +02:00

Views

Pass UrlProvider in from grid editor too

2018-07-30 16:18:59 +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

Fix merges

2018-09-06 15:59:10 +02:00

web.Template.config

Handle binding redirects

2018-09-04 19:44:24 +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