Shannon 3df2d03fc8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 ...

Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
	src/Umbraco.Web/PublishedContentPropertyExtension.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.cms/businesslogic/template/Template.cs

2014-05-05 12:49:06 +10:00

..

umbraco

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

2014-04-24 16:33:04 +10:00

AttributeCollectionAdapter.cs

…

BasePageExtensions.cs

…

CompatibilityHelper.cs

Back to IPublishedContentProperty (for 6 only)

2014-04-30 16:53:14 +02:00

content.cs

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

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

default.aspx.cs

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

2014-02-13 16:22:51 +11:00

EnsureSystemPathsApplicationStartupHandler.cs

…

helper.cs

Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string

2014-04-14 18:32:28 +10:00

item.cs

Fixes: U4-4039 @Umbraco.Field("writerName") etc. don't work any more

2014-01-14 11:43:56 +11:00

keepAliveService.cs

…

library.cs

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

2014-02-13 16:22:51 +11:00

macro.cs

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

2014-05-05 12:49:06 +10:00

MacroCacheContent.cs

…

NotFoundHandlers.cs

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

2013-10-03 12:51:46 +10:00

page.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-29 16:05:52 +02:00

publishingService.cs

Removes unpublish context menu option since it's not currently implemented, cleans up some code.

2013-11-05 09:38:54 +11:00

PublishQueue.cs

…

python.cs

Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)

2013-10-03 12:45:40 +10:00

requestModule.cs

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

2013-10-03 12:51:46 +10:00

ScriptingMacroResult.cs

…

showField.cs

…

template.cs

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

2013-10-03 12:51:46 +10:00

UmbracoContext.cs

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

UmbracoPage.cs

…

umbracoPageHolder.cs

…

UmbracoRequest.cs

Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column

2013-09-24 19:27:13 +10:00

UmbracoResponse.cs

Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column

2013-09-24 19:27:13 +10:00

UmbracoServerUtility.cs

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

2013-10-03 12:51:46 +10:00

viewstateMoverModule.cs

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

XsltExtensionAttribute.cs

Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/

2013-09-04 13:18:23 +10:00