Merge dev-v7.6 into dev-v8

2016-12-14 14:06:30 +01:00
parent 04066e901f 4863052a08
commit 07a05317ff
44 changed files with 1067 additions and 453 deletions
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -398,7 +398,8 @@ namespace Umbraco.Web.Security
            var viewProperties = new List<UmbracoProperty>();

            foreach (var prop in memberType.PropertyTypes
-                    .Where(x => builtIns.Contains(x.Alias) == false && memberType.MemberCanEditProperty(x.Alias)))
+                    .Where(x => builtIns.Contains(x.Alias) == false && memberType.MemberCanEditProperty(x.Alias))
+                    .OrderBy(p => p.SortOrder))
            {
                var value = string.Empty;
                if (member != null)