Shannon edc4dc6f7f Fixed merge issues

2013-09-10 11:51:57 +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

delete fontawesome

2013-09-02 15:40:14 +02:00

umbraco.cms

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

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

umbraco.controls

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

2013-08-28 11:08:23 +10:00

Umbraco.Core

Fixed merge issues

2013-09-10 11:51:57 +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.2.0' into 7.0.0

2013-09-10 11:49:05 +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

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 remote-tracking branch 'origin/6.2.0' into 7.0.0

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

Umbraco.Tests

Fixed merge issues

2013-09-10 11:51:57 +10:00

Umbraco.Web

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

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

Umbraco.Web.UI

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

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

Umbraco.Web.UI.Client

tutorials index.ngdoc update to include part 4

2013-09-09 20:26:54 +02: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

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

Fix a strange VS2012 build targets problem

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

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

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

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