Stephan 98c8d637f4 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs

2013-12-13 13:05:10 +01: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

Reverted to Newtonsoft.Json 4.5.11

2013-11-13 11:28:14 +11: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

Fixes: U4-3638 - U7 - Preview mode seems permanent and shows incorrect content on front of website, when using same browser as admin login

2013-12-12 17:30:27 +11:00

umbraco.cms

Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled

2013-12-10 12:53:33 +11:00

umbraco.controls

fixes serverside part of legacy pickers

2013-11-18 11:49:11 +01:00

Umbraco.Core

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

2013-12-13 13:05:10 +01:00

umbraco.datalayer

Obsoletes all legacy installer classes from the legacy data layer.

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

umbraco.editorControls

turns off imagecropper toxml which has caused issues

2013-11-19 14:19:41 +01:00

umbraco.interfaces

puts IDataValueSetter back in so it can be used by backwards compatible data

2013-12-05 16:18:45 +11:00

umbraco.MacroEngines

Fixes: U4-2967 Inline macros error out when trying to access the Model

2013-12-06 11:22:16 +11: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

Fixes: U4-3741 GetMemberFromLoginNameAndPassword Always Return Null

2013-12-09 13:08:06 +11:00

Umbraco.Tests

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

2013-12-13 13:05:10 +01:00

Umbraco.Web

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

2013-12-13 13:05:10 +01:00

Umbraco.Web.UI

doh, didn't mean to commit this config change

2013-12-13 16:54:16 +11:00

Umbraco.Web.UI.Client

adds version number to help dialog

2013-12-12 12:28:43 +01:00

UmbracoExamine

Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure.

2013-10-29 11:39:34 +11: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

Whitespace

2013-11-07 11:24:40 +00:00

umbraco.sln

Got more member reset password working based on the provider config.

2013-10-11 11:44:48 +11: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