Shannon 6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 ...

Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config

2014-07-23 10:08:01 -07:00

..

App_Browsers

…

config

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

2014-06-25 11:02:04 +10: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

Fixes: U4-5252

2014-07-23 04:10:48 +10:00

Umbraco

Removes remaining yepnop dependencies

2014-05-05 12:59:34 +02:00

umbraco_client

Merge remote-tracking branch 'origin/6.2.1' into 7.1.4

2014-05-22 13:01:23 +10:00

Views

U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error

2013-11-19 15:12:47 +01:00

xslt

…

default.aspx

…

Global.asax

…

packages.config

Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - also ensures that ALL of the WebApi DLLs are copied local

2014-07-22 15:51:13 -07:00

Umbraco.Web.UI.csproj

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

2014-07-23 10:08:01 -07:00

web.Template.config

Specifying assembly for membership/user provider

2014-04-30 11:27:47 +10: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