Shannon ee7ee81098 fixes merge issue

2014-01-16 20:51:23 +11:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

…

umbraco.businesslogic

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

2014-01-16 20:49:19 +11:00

umbraco.cms

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

2014-01-14 16:28:48 +11:00

umbraco.controls

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

2014-01-13 14:08:23 +11:00

Umbraco.Core

fixes merge issue

2014-01-16 20:51:23 +11:00

umbraco.datalayer

…

umbraco.editorControls

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

2014-01-13 14:08:23 +11:00

umbraco.interfaces

puts IDataValueSetter back in so it can be used by backwards compatible data

2013-12-05 16:18:45 +11:00

umbraco.MacroEngines

Fixes: U4-2967 Inline macros error out when trying to access the Model

2013-12-06 11:22:16 +11:00

Umbraco.MSBuild.Tasks

…

umbraco.providers

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

2014-01-16 20:15:35 +11:00

Umbraco.Tests

Fixes: U4-3855 Preview cookie should be a session cookie not persisted

2014-01-16 20:47:13 +11:00

Umbraco.Web

Completes: U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets

2014-01-16 19:11:03 +11:00

Umbraco.Web.UI

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

2014-01-16 20:09:18 +11:00

Umbraco.Web.UI.Client

Fixes: U4-4054 Multinode Treepicker datatype - selecting a start node sends to content section

2014-01-16 19:47:27 +11:00

UmbracoExamine

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

2014-01-13 14:08:23 +11:00

UmbracoExamine.Azure

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

2014-01-13 14:08:23 +11:00

UmbracoExamine.PDF

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

2014-01-13 14:08:23 +11:00

UmbracoExamine.PDF.Azure

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

2014-01-13 14:08:23 +11:00

WebPi

…

SolutionInfo.cs

…

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

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

2014-01-16 20:09:18 +11:00

umbraco.sln.DotSettings

…

umbraco.vssscc

…