Shannon 92c7b4446b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs

2013-10-18 11:27:32 +11:00

..

.nuget

Updating nuspec files and build

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

DesktopMediaUploader

…

packages

Upgrades to latest AutoMapper lib

2013-09-27 13:16:25 +10:00

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

Working on user timeouts - now have the user timeout time being nicely tracked in the back office with a bit of injector magic both on the client side and the server side with filters. Now to wire up the call to get remaining seconds if a request hasn't been made for a specified amount of time, then we can add UI notification about timeout period.

2013-10-15 18:46:44 +11:00

umbraco.cms

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

2013-10-18 11:27:32 +11:00

umbraco.controls

labels for localization support

2013-10-09 15:07:09 +02:00

Umbraco.Core

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

2013-10-18 11:27:32 +11:00

umbraco.datalayer

Obsoletes all legacy installer classes from the legacy data layer.

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

umbraco.editorControls

Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly

2013-10-04 10:01:57 +10:00

umbraco.interfaces

Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support

2013-09-25 17:57:44 +10:00

umbraco.MacroEngines

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

2013-10-04 14:54:18 +02:00

Umbraco.MSBuild.Tasks

…

umbraco.providers

Fixes lots of membership provider stuff

2013-10-17 17:40:29 +11:00

Umbraco.Tests

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

2013-10-18 11:27:32 +11:00

Umbraco.Web

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

2013-10-18 11:27:32 +11:00

Umbraco.Web.UI

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

2013-10-18 11:27:32 +11:00

Umbraco.Web.UI.Client

The user change password dashboard now works and adheres to the membership provider rules.

2013-10-17 14:46:16 +11: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

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

2013-10-11 10:24:24 +02:00

umbraco.sln.DotSettings

Added events.Service and xmlhelper.service

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

umbraco.vssscc

…