Shannon 5b7e9c712e Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 ...

Conflicts:
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs

2013-12-04 13:50:55 +11:00

..

App_Browsers

…

config

Fixes potential xss

2013-12-04 12:42:40 +11:00

install

adds umbraco session id to UserData so we can use for csrf

2013-11-29 12:42:50 +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.1

2013-12-04 13:50:55 +11:00

Umbraco

content dashboard

2013-11-21 11:09:20 +01:00

umbraco_client

Fixes csrf issue

2013-11-29 12:17:58 +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

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

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

web.Template.config

Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0

2013-10-18 11:33:38 +11:00

web.Template.Debug.config

Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs

2013-10-04 10:53:22 +10: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