Shannon 500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs

2013-07-24 13:10:43 +10:00

..

.nuget

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

DesktopMediaUploader

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

packages

Streamlined the profiling in the macro class.

2013-05-13 22:13:52 -10:00

SQLCE4Umbraco

upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct

2013-05-27 01:23:49 -10:00

umbraco.businesslogic

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-23 13:41:42 +10:00

umbraco.cms

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

umbraco.controls

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

Umbraco.Core

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

umbraco.datalayer

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00

umbraco.editorControls

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

umbraco.interfaces

WIP - refactored some of the lastest changes with publishing based on Morten's feedback.

2013-02-11 20:07:23 +06:00

umbraco.MacroEngines

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00

umbraco.macroRenderings

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-23 13:41:42 +10:00

Umbraco.MSBuild.Tasks

Added Umbraco.MSBuild.Tasks to separate solution and configured to build to correct /lib path.

2012-06-27 21:26:38 +04:00

umbraco.providers

Merge branch '6.1.2' into 7.0.0

2013-06-20 10:09:39 +10:00

Umbraco.Tests

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

Umbraco.Web

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

Umbraco.Web.UI

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-24 13:10:43 +10:00

Umbraco.Web.UI.Client

Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication.

2013-07-23 18:55:31 +10:00

umbraco.webservices

Merge with 6.0.5

2013-04-29 12:31:13 -02:00

UmbracoExamine

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-03 20:24:02 +10:00

UmbracoExamine.Azure

Upgrades required projects to .Net 4.5

2013-05-26 13:33:43 -10:00

UmbracoExamine.PDF

Upgrades required projects to .Net 4.5

2013-05-26 13:33:43 -10:00

UmbracoExamine.PDF.Azure

Upgrades required projects to .Net 4.5

2013-05-26 13:33:43 -10:00

WebPi

Merge with 6.0.6

2013-05-05 23:39:52 -10:00

SolutionInfo.cs

Reverting SolutionInfo.

2012-11-27 10:05:26 -01:00

Umbraco.MSBuild.Tasks.sln

Added Umbraco.MSBuild.Tasks to separate solution and configured to build to correct /lib path.

2012-06-27 21:26:38 +04:00

umbraco.presentation.targets

If you never had VS2010 installed, the build now works, checking if the Publishing Tasks dll exists now

2013-06-23 14:57:53 +02:00

umbraco.sln

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00

umbraco.sln.DotSettings

Add DotSettings file for custom code inspections. In this case: Replace

2013-04-11 07:15:06 -02:00

umbraco.vssscc

Changes all xslt transforms to use VS transforms. #U4-62

2012-06-22 22:01:16 +04:00