Sebastiaan Janssen 437408464f Merge branch '6.1.5' into 6.2.0 ...

Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs

2013-09-02 12:29:47 +02:00

..

Actions

Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui

2013-08-25 15:50:07 +02:00

businesslogic

Merge branch '6.1.5' into 6.2.0

2013-09-02 12:29:47 +02:00

helpers

Merge with 6.0.4

2013-04-06 01:23:29 +06:00

Properties

Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too.

2013-01-07 23:24:29 +03:00

ClassDiagram1.cd

Cleaning up folder structure (U4-56)

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

packages.config

Updated to latest CDF version which contains some fixes.

2013-07-22 11:29:32 +10:00

PluginManagerExtensions.cs

Created PackageActionsResolver object to deal with IPackageAction plugins.

2012-08-01 23:03:26 +06:00

umbraco.cms.csproj

Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui

2013-08-25 15:50:07 +02:00