Shannon 620fbde1db Merge branch '7.1.0-ImageCropper-JeavonWIP' of https://github.com/Jeavon/Umbraco-CMS into Jeavon-7.1.0-ImageCropper-JeavonWIP ...

Conflicts:
	src/Umbraco.Web/ImageCropperBaseExtensions.cs

2014-03-20 13:18:57 +11:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

…

umbraco.businesslogic

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

2014-03-18 18:47:49 +11:00

umbraco.cms

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

2014-03-19 09:34:37 +11:00

umbraco.controls

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

2014-03-17 14:15:14 +11:00

Umbraco.Core

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

2014-03-20 10:38:40 +11:00

umbraco.datalayer

…

umbraco.editorControls

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

2014-03-19 18:55:20 +11:00

umbraco.interfaces

…

umbraco.MacroEngines

U4-4373, U4-4374 - finalize fixes

2014-03-17 15:44:16 +01:00

umbraco.macroRenderings

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

2014-03-17 14:15:14 +11:00

Umbraco.MSBuild.Tasks

…

umbraco.providers

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

2014-03-18 18:53:04 +11:00

Umbraco.Tests

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

2014-03-20 09:54:13 +11:00

Umbraco.Web

Merge branch '7.1.0-ImageCropper-JeavonWIP' of https://github.com/Jeavon/Umbraco-CMS into Jeavon-7.1.0-ImageCropper-JeavonWIP

2014-03-20 13:18:57 +11:00

Umbraco.Web.UI

Make sure we use the latest ImageProcessor version in VS as well, not just in the nuget package.

2014-03-19 19:56:48 +01:00

Umbraco.Web.UI.Client

Fixes: U4-4481 Image cropper pre value editor doesn't validate properly

2014-03-20 13:03:30 +11:00

UmbracoExamine

…

UmbracoExamine.Azure

…

UmbracoExamine.PDF

…

UmbracoExamine.PDF.Azure

…

WebPi

…

SolutionInfo.cs

…

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

…

umbraco.sln.DotSettings

…

umbraco.vssscc

…