Shannon 49fc068b38 Merge remote-tracking branch 'origin/7.3.6' into dev-v7 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/UmbracoContext.cs

2016-01-27 15:42:06 +01:00

..

.nuget

updates nuget.exe ... we should really use the methodolgy that we've got in the new identity projects where we don't commit this file, instead we go get the latest from the web during build (but that would probably mean moving to powershell)

2015-05-05 11:58:33 +10:00

packages

updates repo config

2015-04-02 14:59:03 +11:00

SQLCE4Umbraco

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00

umbraco.businesslogic

Ensures that all property data is deleted for a doc type when it is being deleted, updates the ChangeDocType to not use the legacy EnsuredPage, updates the non-legacy EnsuredPage.ClientTools to support the legacy logic.

2016-01-26 12:13:53 +01:00

umbraco.cms

Ensuring we only do the base SetupNode stuff if its actually a media type and not a folder requested.

2016-01-27 09:27:56 +01:00

umbraco.controls

Minor css tweak to tabview control

2015-09-24 15:30:28 +02:00

Umbraco.Core

Merge remote-tracking branch 'origin/7.3.6' into dev-v7

2016-01-27 15:42:06 +01:00

umbraco.datalayer

U4-7410 Version issue with MySql.Data after upgrade to 7.3.1.

2015-11-18 19:39:10 +01:00

umbraco.editorControls

Code sample No.5

2016-01-05 23:20:47 +01:00

umbraco.interfaces

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00

umbraco.MacroEngines

updates to latest examine

2015-08-13 15:30:28 +02: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

Update to MVC5

2015-07-30 17:08:39 +02:00

Umbraco.Tests

Should hopefully fix unit tests

2016-01-27 15:30:34 +01:00

Umbraco.Web

Merge remote-tracking branch 'origin/7.3.6' into dev-v7

2016-01-27 15:42:06 +01:00

Umbraco.Web.UI

Fixes: U4-7845 Show drop zone in media section + fix recycle bin for content section + localise texts

2016-01-27 13:25:54 +01:00

Umbraco.Web.UI.Client

Merge pull request #1059 from umbraco/temp-U4-7832-U4-7772

2016-01-27 15:12:23 +01:00

UmbracoExamine

Corrects spelling of localStorateDir to localStorageDir

2016-01-06 12:17:48 +01:00

WebPi

Update for WebPI

2014-04-09 09:35:02 +02:00

NuGet.Config

UI Polish

2015-11-11 11:42:02 +01:00

SolutionInfo.cs

creates new EditorValidationResolver for external validators to work (internal for now), bumps version

2016-01-20 16:57:31 +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

Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed)

2014-10-19 13:00:54 +02:00

umbraco.sln

updates sln docs and removes pdf test bits

2015-04-01 11:22:10 +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