Shannon b3defcb007 fixes merge issues

2013-08-15 13:05:09 +10:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

…

umbraco.businesslogic

Converted over pre-value config to be a dictionary, not an array. To do that I needed to create a new PreValueCollection object which encapsulates support for legacy (array based) pre-vals which get converted to a dictionary and newer dictionary pre-vals... which we will now require because we'll support pre-value overrides eventually. Fixed up the mapper unit tests and added other unit tests.

2013-08-14 19:24:20 +10:00

umbraco.cms

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02: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

fixes merge issues

2013-08-15 13:05:09 +10:00

umbraco.datalayer

…

umbraco.editorControls

Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected.

2013-08-14 13:38:28 +10:00

umbraco.interfaces

Converted the DataType tree to the new tree structure, now need to start creating the pre-value editor. Obsoleted IDataType and a bunch of other things associated with IDataType. Obsoleted old tree classes that we've replaced so far.

2013-08-13 18:19:56 +10:00

umbraco.MacroEngines

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

2013-08-13 18:22:45 +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

…

umbraco.providers

…

Umbraco.Tests

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

2013-08-15 12:59:05 +10:00

Umbraco.Web

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

2013-08-15 12:59:05 +10:00

Umbraco.Web.UI

remove un-needed files

2013-08-15 12:40:16 +10:00

Umbraco.Web.UI.Client

fixes up legacy trees with the correct alias and forces legacy root nodes to load the dashboard route.

2013-08-15 12:57:56 +10:00

umbraco.webservices

…

UmbracoExamine

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

2013-08-13 18:22:45 +10:00

UmbracoExamine.Azure

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

2013-08-13 18:22:45 +10:00

UmbracoExamine.PDF

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

2013-08-13 18:22:45 +10:00

UmbracoExamine.PDF.Azure

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

2013-08-13 18:22:45 +10:00

WebPi

…

SolutionInfo.cs

…

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

2013-08-07 13:48:21 +02:00

umbraco.sln.DotSettings

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

umbraco.vssscc

…