Shannon 67171db955 Fixes merge issues... but now have to fix all the unit tests

2013-09-18 13:26:09 +10:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

Fixes merge issues with new member stuff regarding the column controlId -> propertyEditorAlias change. Removed the old sqlce sql scripts (

2013-09-11 13:19:35 +10:00

umbraco.businesslogic

Updated SettingsForTest to return mockable umbraco settings so we can set whatever we want. Fixing up unit tests. Removes calls to CleanUmbracoSettingsConfig and EnsureUmbracoSettingsConfig since we should be dealing with the mockable settings.

2013-09-16 19:33:21 +10:00

umbraco.cms

Fixes broken doctype editor

2013-09-17 13:43:47 +02:00

umbraco.controls

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

Umbraco.Core

Fixes merge issues... but now have to fix all the unit tests

2013-09-18 13:26:09 +10:00

umbraco.datalayer

Obsoletes all legacy installer classes from the legacy data layer.

2013-09-10 11:43:07 +10:00

umbraco.editorControls

Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests

2013-09-16 15:52:59 +10:00

umbraco.interfaces

Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-11 13:07:22 +10:00

umbraco.MacroEngines

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

2013-09-17 00:27:17 +10:00

umbraco.macroRenderings

…

Umbraco.MSBuild.Tasks

…

umbraco.providers

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

2013-09-10 11:49:05 +10:00

Umbraco.Tests

Fixes merge issues... but now have to fix all the unit tests

2013-09-18 13:26:09 +10:00

Umbraco.Web

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

2013-09-18 12:59:46 +10:00

Umbraco.Web.UI

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

2013-09-18 12:59:46 +10:00

Umbraco.Web.UI.Client

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

2013-09-18 10:49:18 +10:00

UmbracoExamine

Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/

2013-09-04 13:18:23 +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

Fix a strange VS2012 build targets problem

2013-08-20 18:08:34 +02:00

umbraco.sln

…

umbraco.sln.DotSettings

…

umbraco.vssscc

…