Shannon d37d31246e Merge remote-tracking branch 'origin/dev-v7' into dev-v8 ...

Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Tests/Persistence/SyntaxProvider/MySqlSyntaxProviderTests.cs
	src/Umbraco.Web.UI/umbraco/create/content.ascx
	src/Umbraco.Web.UI/umbraco/create/member.ascx
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs

2016-03-16 15:02:53 +01:00

..

DatabaseAnnotations

Fixes upgrade issues with MySql, along with a few other things:

2015-09-11 17:49:47 +02:00

DatabaseModelDefinitions

Merge remote-tracking branch 'origin/7.4.0' into dev-v8

2015-12-18 11:23:58 +01:00

Factories

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

2016-03-16 15:02:53 +01:00

FaultHandling

some r# cleanup

2015-12-22 17:25:09 +01:00

Mappers

Removes the old Log/ILog along with the concept of an ExternalLogger, updates the IAuditService to handle what the Log used to do

2015-12-23 15:22:45 +01:00

Migrations

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

2016-03-16 15:02:53 +01:00

Querying

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

2016-03-16 15:02:53 +01:00

Relators

U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims - this also ensures that no empty/null sections can be added to the user object since this is where the original exception was coming from.

2016-01-26 17:05:46 +01:00

Repositories

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

2016-03-16 15:02:53 +01:00

SqlSyntax

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

2016-03-16 15:02:53 +01:00

UnitOfWork

creates ServicesCompositionRoot

2015-12-21 14:27:36 +01:00

DatabasenodeLockExtensions.cs

Persistence - add support for locking repositories

2015-08-26 14:00:53 +02:00

DatabaseProviders.cs

…

DatabaseSchemaHelper.cs

Merge remote-tracking branch 'origin/7.4.0' into dev-v8

2015-12-18 11:23:58 +01:00

DbConnectionExtensions.cs

Fix log type

2015-07-30 18:14:29 +02:00

DefaultDatabaseFactory.cs

…

EntityNotFoundException.cs

…

IDatabaseFactory.cs

…

LockedRepository.cs

Persistence - add support for locking repositories

2015-08-26 14:00:53 +02:00

LockingRepository.cs

Persistence - add support for locking repositories

2015-08-26 14:00:53 +02:00

PetaPoco.cs

Merge branch 'master-v7' into dev-v8

2016-03-10 19:20:15 +01:00

PetaPocoCommandExtensions.cs

…

PetaPocoConnectionExtensions.cs

…

PetaPocoExtensions.cs

…

PetaPocoSqlExtensions.cs

…

RecordPersistenceType.cs

…

RepositoryFactory.cs

it builds! ... but not sure it works yet.

2016-03-10 19:47:10 +01:00

TransactionType.cs

…

UmbracoDatabase.cs

Merge branch 'master-v7' into dev-v8

2016-03-10 19:20:15 +01:00