Stephan
|
3ca8b356ee
|
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
src/Umbraco.Core/Cache/CacheProviderBase.cs
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
src/Umbraco.Core/Cache/NullCacheProvider.cs
src/Umbraco.Core/Cache/StaticCacheProvider.cs
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Dynamics/PropertyResult.cs
src/Umbraco.Core/Models/IPublishedContentProperty.cs
src/Umbraco.Core/Models/PublishedItemType.cs
src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
src/Umbraco.Core/PublishedContentExtensions.cs
src/Umbraco.Core/PublishedContentHelper.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
src/Umbraco.Tests/LibraryTests.cs
src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
src/Umbraco.Web/ExamineExtensions.cs
src/Umbraco.Web/Models/DynamicPublishedContent.cs
src/Umbraco.Web/Models/XmlPublishedContent.cs
src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
src/Umbraco.Web/PublishedContentExtensions.cs
src/Umbraco.Web/Templates/TemplateUtilities.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/WebBootManager.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
|
2013-09-23 21:57:22 +02:00 |
|
Stephan
|
0415a31d0e
|
PublishedContent - the big refactoring
|
2013-09-16 17:17:45 +02:00 |
|
Shannon
|
42c86a05b8
|
Completes U4-2390 Remove VersionID Guid in IPublishedContent properties
|
2013-09-10 17:37:10 +10:00 |
|
shannon@ShandemVaio.home
|
580cb340ac
|
Cleaning up folder structure (U4-56)
|
2012-06-22 20:39:48 +04:00 |
|