Shannon c0380e491b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
	src/umbraco.controls/TreePicker/SimpleContentPicker.cs

2013-12-19 11:41:03 +11:00

..

App_Browsers

…

config

Merge branch '6.2.0-membershipprovider' into 6.2.0

2013-12-13 17:17:24 +11:00

install

Merge branch '6.2.0-membershipprovider' into 6.2.0

2013-12-13 17:17:24 +11:00

MacroScripts

merge

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

Properties

merge

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

umbraco

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2013-12-19 11:41:03 +11:00

Umbraco

Fixes up the auth http post

2013-12-11 18:53:00 +11:00

umbraco_client

removes the xquery tests - we don't need these and r# keeps wanting to run them

2013-12-16 13:22:52 +11: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

Removes uGoLive from the core (for now until it is rebuilt against v7 )

2013-11-28 10:51:54 +11:00

Umbraco.Web.UI.csproj

proj file

2013-12-16 13:23:07 +11:00

web.Template.config

Completes: U4-3792 Move appSettings, connectionStrings back to web.config

2013-12-06 11:52:47 +11:00

web.Template.Debug.config

Completes: U4-3792 Move appSettings, connectionStrings back to web.config

2013-12-06 11:52:47 +11:00

web.Template.Release.config

Moves appSettings to external file and updates the code that modifies the app settings.

2013-10-04 10:34:00 +10:00