yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3ca8b356eeec2672fbc0e5fae4db1aa86ebe98e3
Umbraco-CMS/src/Umbraco.Web/PublishedCache
History
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
..
XmlPublishedCache
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-23 21:57:22 +02:00
ContextualPublishedCache.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
ContextualPublishedCacheOfT.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
ContextualPublishedContentCache.cs
fix merge + public
2013-04-10 14:02:16 -02:00
ContextualPublishedMediaCache.cs
fix merge + public
2013-04-10 14:02:16 -02:00
IPublishedCache.cs
Web.PublishedCache - add XPathNavigatorIsNavigable to caches
2013-09-16 17:17:38 +02:00
IPublishedCaches.cs
Web.PublishedCache - IPublishedCaches doesn't return !contextual caches anymore
2013-04-04 05:10:53 -02:00
IPublishedContentCache.cs
fix merge + public
2013-04-10 14:02:16 -02:00
IPublishedMediaCache.cs
fix merge + public
2013-04-10 14:02:16 -02:00
PublishedCaches.cs
Web.PublishedCache - IPublishedCaches doesn't return !contextual caches anymore
2013-04-04 05:10:53 -02:00
PublishedCachesResolver.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00