Umbraco-CMS

Files

Shannon 9a9237e78e Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs

2014-03-06 20:22:32 +11:00

Importing

Additional tests for Macro import and export

2014-01-19 15:23:04 +01:00

BaseServiceTest.cs

modified media service tests to not have to create data in teh base tests

2013-12-19 12:27:21 +11:00

ContentServicePerformanceTest.cs

backports data type service updates and fixes unit tests with correct seeding value.

2013-12-16 17:17:23 +11:00

ContentServiceTests.cs

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