diff --git a/src/SQLCE4Umbraco/app.config b/src/SQLCE4Umbraco/app.config
index 44298137ae..8f828418f3 100644
--- a/src/SQLCE4Umbraco/app.config
+++ b/src/SQLCE4Umbraco/app.config
@@ -6,6 +6,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
index b2645ec30f..f4b1597a7d 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
@@ -222,19 +222,38 @@ namespace Umbraco.Core.Models.PublishedContent
}
}
-
+
+ var converterMeta = _converter as IPropertyValueConverterMeta;
+
// get the cache levels, quietely fixing the inconsistencies (no need to throw, really)
- _sourceCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.Source);
- _objectCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.Object);
- _objectCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.XPath);
+ if (converterMeta != null)
+ {
+ _sourceCacheLevel = converterMeta.GetPropertyCacheLevel(this, PropertyCacheValue.Source);
+ _objectCacheLevel = converterMeta.GetPropertyCacheLevel(this, PropertyCacheValue.Object);
+ _objectCacheLevel = converterMeta.GetPropertyCacheLevel(this, PropertyCacheValue.XPath);
+ }
+ else
+ {
+ _sourceCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.Source);
+ _objectCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.Object);
+ _objectCacheLevel = GetCacheLevel(_converter, PropertyCacheValue.XPath);
+ }
if (_objectCacheLevel < _sourceCacheLevel) _objectCacheLevel = _sourceCacheLevel;
if (_xpathCacheLevel < _sourceCacheLevel) _xpathCacheLevel = _sourceCacheLevel;
+ // get the CLR type of the converted value
if (_converter != null)
{
- var attr = _converter.GetType().GetCustomAttribute(false);
- if (attr != null)
- _clrType = attr.Type;
+ if (converterMeta != null)
+ {
+ _clrType = converterMeta.GetPropertyValueType(this);
+ }
+ else
+ {
+ var attr = _converter.GetType().GetCustomAttribute(false);
+ if (attr != null)
+ _clrType = attr.Type;
+ }
}
}
diff --git a/src/Umbraco.Core/Profiling/WebProfiler.cs b/src/Umbraco.Core/Profiling/WebProfiler.cs
index 139c020d3d..51dc650ed4 100644
--- a/src/Umbraco.Core/Profiling/WebProfiler.cs
+++ b/src/Umbraco.Core/Profiling/WebProfiler.cs
@@ -104,7 +104,7 @@ namespace Umbraco.Core.Profiling
///
public string Render()
{
- return MiniProfiler.RenderIncludes(RenderPosition.BottomRight).ToString();
+ return MiniProfiler.RenderIncludes(RenderPosition.Right).ToString();
}
///
diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyValueConverterMeta.cs b/src/Umbraco.Core/PropertyEditors/IPropertyValueConverterMeta.cs
new file mode 100644
index 0000000000..4c545c2f50
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/IPropertyValueConverterMeta.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Core.PropertyEditors
+{
+ ///
+ /// Provides published content properties converter meta data.
+ ///
+ public interface IPropertyValueConverterMeta : IPropertyValueConverter
+ {
+ ///
+ /// Gets the type of values returned by the converter.
+ ///
+ /// The property type.
+ /// The CLR type of values returned by the converter.
+ Type GetPropertyValueType(PublishedPropertyType propertyType);
+
+ ///
+ /// Gets the property cache level of a specified value.
+ ///
+ /// The property type.
+ /// The property value.
+ /// The property cache level of the specified value.
+ PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType, PropertyCacheValue cacheValue);
+ }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1660ae19d2..bc0fdff936 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -55,9 +55,9 @@
True
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
+
False
- ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll
+ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
False
@@ -407,6 +407,7 @@
+
diff --git a/src/Umbraco.Core/app.config b/src/Umbraco.Core/app.config
index 44298137ae..8f828418f3 100644
--- a/src/Umbraco.Core/app.config
+++ b/src/Umbraco.Core/app.config
@@ -6,6 +6,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 3d897fa2a7..55d4c4b8ef 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -9,7 +9,7 @@
-
+
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 042a2885a7..cef2946f32 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -128,6 +128,14 @@
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index 640abec1b5..cd0f080005 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -31,7 +31,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
"'Umbraco' is the danish name for an allen key",
"Umbraco has been around since 2005, that's a looong time in IT",
"More than 400 people from all over the world meet each year in Denmark in June for our annual conference CodeGarden",
- "While you install Umbraco someone else on the other side of the planet probably does it too",
+ "While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
"You can extend Umbraco without modifying the source code and using either JavaScript or C#"
];
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a786e26151..7bccd734e8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -157,9 +157,9 @@
False
..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll
-
- ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll
- True
+
+ False
+ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
False
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 806e288bf8..c206ad9271 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -22,7 +22,7 @@
-
+
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
index 7a2836eb8b..2f253855f3 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Web.PropertyEditors
[PreValueField("startNode", "Node type", "treesource")]
public string StartNode { get; set; }
- [PreValueField("filter", "Filter out items with type", "textstring", Description = "Seperate with comma")]
+ [PreValueField("filter", "Allow items of type", "textstring", Description = "Seperate with comma")]
public string Filter { get; set; }
[PreValueField("minNumber", "Minimum number of items", "number")]
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 610c31ad91..91b9eeae9f 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -135,13 +135,9 @@
False
..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll
-
+
False
- ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll
- True
-
-
- ..\packages\MiniProfiler.Mvc4.3.0.11\lib\net40\MiniProfiler.Mvc.dll
+ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
False
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 7f26063331..b52e30edac 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -9,7 +9,6 @@ using System.Web.Http;
using System.Web.Mvc;
using System.Web.Routing;
using ClientDependency.Core.Config;
-using StackExchange.Profiling.Mvc;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Dictionary;
@@ -95,8 +94,8 @@ namespace Umbraco.Web
//set model binder
ModelBinders.Binders.Add(new KeyValuePair(typeof(RenderModel), new RenderModelBinder()));
- //add the profiling action filter
- GlobalFilters.Filters.Add(new ProfilingActionFilter());
+ ////add the profiling action filter
+ //GlobalFilters.Filters.Add(new ProfilingActionFilter());
//Register a custom renderer - used to process property editor dependencies
var renderer = new DependencyPathRenderer();
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 5bfab3f92e..a86ef1716f 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -18,8 +18,7 @@
-
-
+
diff --git a/src/umbraco.MacroEngines/app.config b/src/umbraco.MacroEngines/app.config
index b859ea170a..a2f25c8809 100644
--- a/src/umbraco.MacroEngines/app.config
+++ b/src/umbraco.MacroEngines/app.config
@@ -14,6 +14,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/umbraco.datalayer/app.config b/src/umbraco.datalayer/app.config
index 44298137ae..8f828418f3 100644
--- a/src/umbraco.datalayer/app.config
+++ b/src/umbraco.datalayer/app.config
@@ -6,6 +6,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/umbraco.editorControls/app.config b/src/umbraco.editorControls/app.config
index b9e3ef148b..610def5a12 100644
--- a/src/umbraco.editorControls/app.config
+++ b/src/umbraco.editorControls/app.config
@@ -18,6 +18,10 @@
+
+
+
+
\ No newline at end of file