Shannon 0fc5af5e17 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 ...

Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config

2014-02-20 23:06:13 +11:00

..

Actions

Enables change content type action for v7 as well (see issue 1468)

2014-02-19 21:48:17 +01:00

businesslogic

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

2014-02-20 23:06:13 +11:00

helpers

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

2013-09-25 19:23:41 +10:00

Properties

Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too.

2013-01-07 23:24:29 +03:00

packages.config

Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task

2014-01-09 18:08:13 +11:00

PluginManagerExtensions.cs

Changes the web.config template to use a linked resources (one file)

2013-11-26 20:03:13 +11:00

umbraco.cms.csproj

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

2014-01-13 14:08:23 +11:00