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

Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/workflow/Notification.cs
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj

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

..

.nuget

…

DesktopMediaUploader

…

packages

Reverted to Newtonsoft.Json 4.5.11

2013-11-13 11:28:14 +11:00

SQLCE4Umbraco

…

umbraco.businesslogic

fixes up the double member creation in the createuser method

2014-01-08 16:29:09 +11:00

umbraco.cms

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

2014-01-13 14:08:23 +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

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

2014-01-13 14:08: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

fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration

2014-01-09 13:32:39 +11:00

Umbraco.Tests

Removes the version specific info from the CDF and Examine references in all proj files.

2014-01-13 14:02:50 +11:00

Umbraco.Web

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

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

Umbraco.Web.UI

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

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

Umbraco.Web.UI.Client

Fixed some null checks

2014-01-10 12:20:49 +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

Whitespace

2013-11-07 11:24:40 +00:00

umbraco.sln

Fixed as per issue comments, but also implemented for another 3 overloads

2013-11-07 12:50:26 +00:00

umbraco.sln.DotSettings

…

umbraco.vssscc

…