Shannon 0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 ...

Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln

2013-08-07 10:29:34 +10:00

..

Actions

Got the legacy refresh action working (should work for all trees)

2013-08-05 18:27:05 +10:00

businesslogic

Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

2013-08-07 10:29:34 +10:00

helpers

Merge with 6.0.4

2013-04-06 01:23:29 +06: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

ClassDiagram1.cd

…

packages.config

Updated to latest CDF version which contains some fixes.

2013-07-22 11:29:32 +10:00

PluginManagerExtensions.cs

…

umbraco.cms.csproj

Got the legacy refresh action working (should work for all trees)

2013-08-05 18:27:05 +10:00