Stephan
|
36d6e4b4da
|
Merge branch '7.0.0' into 7.0.0-pubcontent
Conflicts:
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
src/Umbraco.Core/PublishedContentHelper.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web/Models/XmlPublishedContent.cs
src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
src/Umbraco.Web/Templates/TemplateUtilities.cs
|
2013-09-26 08:57:01 +02:00 |
|
Shannon
|
1e9a17babe
|
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 |
|
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
|
ac19ac7a6b
|
PublishedContent - use PublishedContentModelFactory in XmlPublishedCache
|
2013-09-16 17:17:46 +02:00 |
|
Stephan
|
0415a31d0e
|
PublishedContent - the big refactoring
|
2013-09-16 17:17:45 +02:00 |
|
Stephan
|
f63514e8ea
|
Web.PublishedCache - add XPathNavigatorIsNavigable to caches
|
2013-09-16 17:17:38 +02:00 |
|
Shannon
|
7538698e7b
|
updated most of the calls from the legacy UmbracoSettings to use the new way - nearly done.
|
2013-09-13 18:36:41 +10:00 |
|
Shannon
|
3618722574
|
Fixed some merging issues.
|
2013-06-20 15:57:23 +10:00 |
|
Stephan
|
5d89ab1e2a
|
Web.UI - fix nasty preview bug introduced in 9a92dea49ede
|
2013-05-03 20:09:15 -02:00 |
|
Stephan
|
106d733d08
|
Web.PublishedCache - support XPathExpression
|
2013-04-10 12:49:45 -02:00 |
|
Stephan
|
c5b6bb52e0
|
Web.PublishedCache - refactor how caches manage preview
|
2013-03-31 18:47:25 -02:00 |
|
Stephan
|
4201d678fa
|
XmlPublishedCache - GetXml() can be private, no need for internal
|
2013-04-04 15:24:29 -02:00 |
|
Stephan
|
23525300bb
|
Web.PublishedCache - add XPathNavigator support
|
2013-04-03 11:19:10 -02:00 |
|
Stephan
|
8d33488923
|
Web.PublishedCache - make parts of XmlPublishedCache virtual
|
2013-03-31 18:40:55 -02:00 |
|
Shannon Deminick
|
182107286c
|
Fixes merge issues
|
2013-04-02 23:08:43 +06:00 |
|
Stephan
|
47474d31d6
|
Web.PublishedCache - rename LegacyXmlCache into XmlPublishedCache
|
2013-03-22 15:02:26 -01:00 |
|