Sebastiaan Janssen dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 ...

Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config

2014-08-04 13:32:44 +02:00

..

App_Browsers

…

config

Merge remote-tracking branch 'origin/7.1.5' into 7.2.0

2014-08-04 13:32:44 +02:00

MacroScripts

merge

2013-11-07 17:16:22 +01:00

Properties

Improved caching in debug mode by adding global yepnope filter

2014-02-07 15:45:52 +01:00

umbraco

Merge remote-tracking branch 'origin/7.1.5' into 7.2.0

2014-08-04 13:32:44 +02:00

Umbraco

Ignore Preview folder

2014-07-01 13:57:04 +02:00

umbraco_client

Undo formatting of query for now

2014-06-10 18:11:14 +02:00

Views

Split grid rendering into seperate editor views

2014-07-31 14:45:48 +02:00

xslt

…

default.aspx

…

Global.asax

…

packages.config

All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute.

2014-07-23 12:19:40 -07:00

Umbraco.Web.UI.csproj

Merge remote-tracking branch 'origin/7.1.5' into 7.2.0

2014-08-04 13:32:44 +02:00

web.Template.config

Web.config with less mime

2014-05-13 16:19:45 +02:00

web.Template.Debug.config

Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898

2014-04-28 12:49:28 +10:00

web.Template.Release.config

Made the whitespace consistent in config files.

2014-03-28 16:25:01 +00:00