Shannon 1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar ...

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx

2014-10-02 21:46:39 +10:00

..

App_Browsers

…

config

contour reference deleted

2014-09-23 20:18:46 +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 branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar

2014-10-02 21:46:39 +10:00

Umbraco

canvasdesigner.*.js added to ignore file

2014-09-30 09:24:38 +02:00

umbraco_client

Updates the content type editor to have the list view customization inline instead of in a dialog.

2014-10-02 18:52:38 +10:00

Views

Canvas views

2014-09-23 16:36:04 +02:00

xslt

…

default.aspx

…

Global.asax

…

packages.config

Updating json.net dependency to 6.0.4

2014-08-20 10:44:05 +02:00

Umbraco.Web.UI.csproj

Updates the content type editor to have the list view customization inline instead of in a dialog.

2014-10-02 18:52:38 +10:00

web.Template.config

Merge branch '7.1.5' into 7.2.0

2014-08-24 21:35:08 -06: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