Umbraco-CMS

Files

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

Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs

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

Actions

Core.Resolution - umbraco.cms.Action should NOT reset resolution

2013-10-02 11:48:50 +02:00

businesslogic

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

2013-10-11 10:24:24 +02: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

…