From 80be614731039e7c895c04bc9d6c55a3712a13d4 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Mon, 14 Sep 2015 11:06:03 +0200
Subject: [PATCH 01/36] Fixes: U4-7075 Enable Content and Media section by
 default for new backoffice users

---
 src/Umbraco.Core/Services/UserService.cs       |  3 +++
 src/Umbraco.Tests/Services/UserServiceTests.cs | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 74002646da..55d7dd9742 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -146,6 +146,9 @@ namespace Umbraco.Core.Services
                     IsLockedOut = false,
                     IsApproved = true
                 };
+                //adding default sections content and media
+                user.AddAllowedSection("content");
+                user.AddAllowedSection("media");
 
                 if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(user), this))
                     return user;
diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs
index f3100aa133..c7002ce79d 100644
--- a/src/Umbraco.Tests/Services/UserServiceTests.cs
+++ b/src/Umbraco.Tests/Services/UserServiceTests.cs
@@ -398,6 +398,10 @@ namespace Umbraco.Tests.Services
 
             var user1 = ServiceContext.UserService.CreateUserWithIdentity("test1", "test1@test.com", userType);
 
+            var result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
+            //expect 2 sections by default
+            Assert.AreEqual(2, result1.AllowedSections.Count());
+
             //adds some allowed sections
             user1.AddAllowedSection("test1");
             user1.AddAllowedSection("test2");
@@ -405,8 +409,9 @@ namespace Umbraco.Tests.Services
             user1.AddAllowedSection("test4");
             ServiceContext.UserService.Save(user1);
 
-            var result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
-            Assert.AreEqual(4, result1.AllowedSections.Count());
+            result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
+            //expect 6 sections including the two default sections
+            Assert.AreEqual(6, result1.AllowedSections.Count());
 
             //simulate clearing the sections
             foreach (var s in user1.AllowedSections)
@@ -419,11 +424,9 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(result1);
 
             //assert
-
             //re-get
             result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
             Assert.AreEqual(2, result1.AllowedSections.Count());
-
         }
 
         [Test]
@@ -448,7 +451,6 @@ namespace Umbraco.Tests.Services
             var result2 = ServiceContext.UserService.GetUserById((int)user2.Id);
             Assert.IsFalse(result1.AllowedSections.Contains("test"));
             Assert.IsFalse(result2.AllowedSections.Contains("test"));
-
         }
 
         [Test]
@@ -546,7 +548,7 @@ namespace Umbraco.Tests.Services
             Assert.That(updatedItem.StartMediaId, Is.EqualTo(originalUser.StartMediaId));
             Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
             Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
-            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(0));
+            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(2));
         }
     }
 }

From 62611a7255cb6daad7f0caa80998377818097e91 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Sep 2015 10:54:56 +0200
Subject: [PATCH 02/36] U4-7157 remove ~/umbraco/webservice.asmx

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   1 -
 src/Umbraco.Web.UI/umbraco/webService.asmx    |   1 -
 src/Umbraco.Web/Umbraco.Web.csproj            |   5 -
 .../umbraco/webService.asmx                   |   1 -
 .../umbraco/webService.asmx.cs                | 217 ------------------
 5 files changed, 225 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/umbraco/webService.asmx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index bb30ea09b9..811295a34d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2258,7 +2258,6 @@
     <Content Include="Umbraco\Users\EditUser.aspx" />
     <Content Include="Umbraco\Users\EditUserType.aspx" />
     <!--<Content Include="Umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="Umbraco\webService.asmx" />
     <Content Include="Umbraco\Webservices\ajax.js" />
     <Content Include="Umbraco\Webservices\CacheRefresher.asmx">
       <SubType>Form</SubType>
diff --git a/src/Umbraco.Web.UI/umbraco/webService.asmx b/src/Umbraco.Web.UI/umbraco/webService.asmx
deleted file mode 100644
index 19848579d6..0000000000
--- a/src/Umbraco.Web.UI/umbraco/webService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="c#" Codebehind="webService.asmx.cs" Class="umbraco.webService" %>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 39b693af90..7a4c6a4cd0 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1830,10 +1830,6 @@
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\users\UserPermissions.cs" />
     <Compile Include="umbraco.presentation\umbraco\users\UserTypeTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\webService.asmx.cs">
-      <DependentUpon>webService.asmx</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\webservices\ajaxHelpers.cs" />
     <Compile Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx.cs">
       <DependentUpon>CacheRefresher.asmx</DependentUpon>
@@ -2119,7 +2115,6 @@
       <SubType>ASPXCodeBehind</SubType>
     </Content>
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="umbraco.presentation\umbraco\webService.asmx" />
     <Content Include="umbraco.presentation\umbraco\webservices\CacheRefresher.asmx">
       <SubType>Form</SubType>
     </Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx
deleted file mode 100644
index 19848579d6..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="c#" Codebehind="webService.asmx.cs" Class="umbraco.webService" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs
deleted file mode 100644
index a297825dda..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Web;
-using System.Web.Services;
-using System.Xml;
-using UmbracoExamine;
-using System.Collections.Generic;
-using Examine;
-using umbraco.presentation;
-using System.Linq;
-
-namespace umbraco
-{
-
-    //TODO: There's no app checking security in here which means that any authorized user can query for all content and all media 
-    // with all information exposed even when they don't have access to content or media.
-
-    /// <summary>
-    /// Summary description for webService.
-    /// </summary>
-    /// 
-
-    [WebService(Namespace = "http://umbraco.org/webservices/")]
-    public class webService : System.Web.Services.WebService
-    {
-        public webService()
-        {
-            //CODEGEN: This call is required by the ASP.NET Web Services Designer
-            InitializeComponent();
-        }
-
-        [WebMethod]
-        public XmlNode GetNode(int NodeId, string ContextID)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BasePages.BasePage.ValidateUserContextID(ContextID))
-            {
-                return new cms.businesslogic.CMSNode(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-        [WebMethod]
-        public XmlNode GetNodeValidate(int NodeId, string Login, string Password)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BusinessLogic.User.validateCredentials(Login, Password))
-            {
-                return new cms.businesslogic.CMSNode(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-        [WebMethod]
-        public XmlNode GetDocument(int NodeId, string ContextID)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BasePages.BasePage.ValidateUserContextID(ContextID))
-            {
-                return new cms.businesslogic.web.Document(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-        [WebMethod]
-        public XmlNode GetMedia(int NodeId, string ContextID)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BasePages.BasePage.ValidateUserContextID(ContextID))
-            {
-                return new cms.businesslogic.media.Media(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-        [WebMethod]
-        public XmlNode GetMediaValidate(int NodeId, string Login, string Password)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BusinessLogic.User.validateCredentials(Login, Password))
-            {
-                return new cms.businesslogic.media.Media(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-
-        [WebMethod]
-        public XmlNode GetDocumentValidate(int NodeId, string Login, string Password)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BusinessLogic.User.validateCredentials(Login, Password))
-            {
-                return new cms.businesslogic.web.Document(NodeId).ToXml(xd, false);
-            }
-            else
-                return null;
-        }
-
-        [WebMethod]
-        public XmlNode GetDocumentsBySearchValidate(string Query, int StartNodeId, string Login, string Password)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BusinessLogic.User.validateCredentials(Login, Password))
-            {
-                return doQuery(Query, xd, StartNodeId);
-            }
-            else
-            {
-                XmlNode result = xd.CreateNode(XmlNodeType.Element, "error", "");
-                result.AppendChild(xmlHelper.addTextNode(xd, "error", "Not a valid login"));
-                return result;
-            }
-        }
-
-        [WebMethod]
-        public XmlNode GetDocumentsBySearch(string Query, int StartNodeId, string ContextID)
-        {
-            XmlDocument xd = new XmlDocument();
-            if (BasePages.BasePage.ValidateUserContextID(ContextID))
-            {
-                return doQuery(Query.ToLower(), xd, StartNodeId);
-            }
-            else
-            {
-                XmlNode result = xd.CreateNode(XmlNodeType.Element, "error", "");
-                result.AppendChild(xmlHelper.addTextNode(xd, "error", "Not a valid login"));
-                return result;
-            }
-        }
-
-        private XmlNode doQuery(string Query, XmlDocument xd, int StartNodeId)
-        {
-            XmlNode result = xd.CreateNode(XmlNodeType.Element, "documents", "");
-            try
-            {
-                //if the query starts with "*" then query all fields
-                var internalSearcher = UmbracoContext.Current.InternalSearchProvider;
-                var criteria = internalSearcher.CreateSearchCriteria(IndexTypes.Content);
-                IEnumerable<SearchResult> results;
-                if (Query.StartsWith("*"))
-                {
-                    results = internalSearcher.Search("*", true);
-                }
-                else
-                {
-                    var operation = criteria.NodeName(Query.ToLower());
-                    if (StartNodeId > 0)
-                    {
-                        operation.Or().Id(StartNodeId);
-                    }
-
-                    results = internalSearcher.Search(operation.Compile()).Take(20);
-                }
-                
-                //var criteria = new SearchCriteria(Query
-                //    , Query.StartsWith("*") ? new string[] { } : new string[] { "nodeName", "id" }
-                //    , new string[] { }
-                //    , false
-                //    , StartNodeId > 0 ? (int?)StartNodeId : null
-                //    , 20);
-
-                foreach (var r in results)
-                {
-                    XmlElement x = xd.CreateElement("document");
-                    x.SetAttribute("id", r.Id.ToString());
-                    x.SetAttribute("nodeName", r.Fields["nodeName"]);
-                    result.AppendChild(x);
-                }
-            }
-            catch (Exception ee)
-            {
-                XmlElement x = xd.CreateElement("document");
-                x.SetAttribute("id", "0");
-                x.SetAttribute("nodeName", "Error in search: " + ee.ToString());
-                result.AppendChild(x);
-            }
-            return result;
-        }
-
-        #region Component Designer generated code
-
-        //Required by the Web Services Designer 
-        private IContainer components = null;
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-        }
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && components != null)
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #endregion
-
-    }
-}

From 05046638142c4289d5f9a4404d31e20b897b296c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Sep 2015 11:28:12 +0200
Subject: [PATCH 03/36] Fixes: U4-7158 Fix OrderBy query string parameter which
 can allow SQL Injection

---
 .../Persistence/Repositories/VersionableRepositoryBase.cs  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
index a7de116470..56b0b63ad5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -521,7 +522,8 @@ WHERE EXISTS(
                     //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
                     return "umbracoNode.nodeUser";
                 default:
-                    return orderBy;
+                    //ensure invalid SQL cannot be submitted
+                    return Regex.Replace(orderBy, @"[^\w\.,`\[\]@-]", "");
             }
         }
 
@@ -540,7 +542,8 @@ WHERE EXISTS(
                 case "VERSIONDATE":
                     return "UpdateDate";
                 default:
-                    return orderBy;
+                    //ensure invalid SQL cannot be submitted
+                    return Regex.Replace(orderBy, @"[^\w\.,`\[\]@-]", "");
             }
         }
 

From c8dc10f2e32998acba9a9f050b210a69d88475e5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Sep 2015 11:44:22 +0200
Subject: [PATCH 04/36] Fixes: U4-7159 XSS issue with EditMacro.aspx

---
 src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
index 93447605b3..c9225ac7c1 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
@@ -4,6 +4,7 @@
 
 <%@ Import Namespace="Umbraco.Core.Configuration" %>
 <%@ Import Namespace="Umbraco.Web" %>
+<%@ Import Namespace="Umbraco.Core" %>
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
@@ -15,7 +16,7 @@
             $(document).ready(function () {
                 Umbraco.Dialogs.EditMacro.getInstance().init({
                     useAspNetMasterPages: <%=UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages.ToString().ToLower() %>,
-                    codeEditorElementId: "<%=Request.GetItemAsString("objectId")%>",
+                    codeEditorElementId: "<%=Request.CleanForXss("objectId") %>",
                     renderingEngine: "<%=Request.GetItemAsString("renderingEngine", "Mvc")%>",
                     macroAlias: '<%= _macroAlias %>'
                 });

From d50e49ad37fd5ca7bad2fd6e8fc994f3408ae70c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Sep 2015 11:55:21 +0200
Subject: [PATCH 05/36] Fixes: U4-7120 SQL Fail upgrading om 7.2.4 to 7.3 - due
 to index on master col

---
 .../MigrateAndRemoveTemplateMasterColumn.cs     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
index cb0ad58a49..01db36abd9 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero
@@ -118,6 +119,22 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
             }
 
 
+            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
+
+            //in some databases there's an index (IX_Master) on the master column which needs to be dropped first
+            var foundIndex = dbIndexes.FirstOrDefault(x => x.TableName.InvariantEquals("cmsTemplate") && x.ColumnName.InvariantEquals("master"));
+            if (foundIndex != null)
+            {
+                Delete.Index(foundIndex.IndexName).OnTable("cmsTemplate");
+            }
+
             if (cols.Any(x => x.ColumnName.InvariantEquals("master") && x.TableName.InvariantEquals("cmsTemplate")))
             {
                 Delete.Column("master").FromTable("cmsTemplate");    

From 5fab1ea4362ed92f9260e2c727e8adc9f4660eff Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 1 Oct 2015 08:52:26 +0200
Subject: [PATCH 06/36] U4-7164 Nuget Update-Package UmbracoCms fails if I have
 removed dashboard section

#U4-7164 Fixed Due in version 7.3.1
---
 build/NuSpecs/tools/Dashboard.config.install.xdt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt
index e4d621f693..605bbb825e 100644
--- a/build/NuSpecs/tools/Dashboard.config.install.xdt
+++ b/build/NuSpecs/tools/Dashboard.config.install.xdt
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
     <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
       <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
@@ -20,7 +20,7 @@
     </tab>
   </section>
 
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
       <control showOnce="true" addPanel="true" panelCaption="">
         views/dashboard/developer/developerdashboardvideos.html
@@ -29,7 +29,7 @@
     <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
   </section>
   
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
       <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
       <control>
         views/dashboard/developer/examinemanagement.html
@@ -39,10 +39,10 @@
       <control>
         views/dashboard/developer/xmldataintegrityreport.html
       </control>
-    </tab>	
+    </tab>  
   </section>
   
-  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
     <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
     <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
@@ -52,7 +52,7 @@
     </tab>
   </section>
   
-  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
     <tab caption="Get Started" xdt:Transform="Insert">
       <access>
@@ -72,7 +72,7 @@
     <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
   </section>
   
-  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
     <tab caption="Get Started" xdt:Transform="Insert">
       <control showOnce="true" addPanel="true" panelCaption="">

From 14778422e60356fa89e7ba6da7738f0909662906 Mon Sep 17 00:00:00 2001
From: Patrik <rambo3swe@gmail.com>
Date: Mon, 5 Oct 2015 14:22:57 +0200
Subject: [PATCH 07/36] Updated readme with working intro video , that is for
 umbraco v7

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d4a024ddbc..5988cc2a19 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ The easiest way to get started is to run `build/build.bat` which will build both
  
 If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
 
-## Watch a five minute introduction video ##
+## Watch a introduction video ##
 
-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
 
 ## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
 

From 96d46c82fe37654aab73993b8f14fff9815c4860 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 6 Oct 2015 08:57:58 +0200
Subject: [PATCH 08/36] U4-7193 NuGet install doesn't add all bindingRedirects

#U4-7193 Fixed Due in version 7.3.1
---
 build/NuSpecs/tools/Web.config.install.xdt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index f7fbad09bd..c6a55cc981 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -172,23 +172,23 @@
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
-      <dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
-      <dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>	  
-      <dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>	  
-      <dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>	  	 
-	  <dependentAssembly>
+	  <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>

From 5e5207d4f34485b37dc014fe977898ef984e0879 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 6 Oct 2015 10:56:16 +0200
Subject: [PATCH 09/36] Fixes: U4-7194 XSS issue with regexws page, U4-7195 XSS
 issue with editview.aspx

---
 src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx            | 3 ++-
 src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx    | 3 ++-
 src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
index 6dd0954156..c2cbe45978 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
@@ -1,4 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="RegexWs.aspx.cs" Inherits="umbraco.presentation.dialogs.RegexWs" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -40,7 +41,7 @@
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <script type="text/javascript">
 	  function chooseRegex(regex) {
-		var target = top.right.document.getElementById('<%= Request.QueryString["target"] %>');
+		var target = top.right.document.getElementById('<%= Request.CleanForXss("target") %>');
 		target.value = regex;
 		UmbClientMgr.closeModalWindow(); 
 	}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx
index ca68fc4b2c..6f5518706c 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx
@@ -6,6 +6,7 @@
 
 <%@ Import Namespace="Umbraco.Core" %>
 <%@ Import Namespace="Umbraco.Core.IO" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -35,7 +36,7 @@
                     nameTxtBox: $("#<%= NameTxt.ClientID %>"),
                     aliasTxtBox: $("#<%= AliasTxt.ClientID %>"),
                     saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    templateId: '<%= Request.QueryString["templateID"] %>',
+                    templateId: '<%= Request.CleanForXss("templateID") %>',
                     codeEditorElementId: '<%= editorSource.ClientID %>',
                     modalUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/dialogs/editMacro.aspx"
                 });
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index a72e03b57e..cd739711fb 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
 	            {
 	                return TreeDefinitionCollection.Instance.FindTree<PartialViewsTree>().Tree.Alias;
 	            }
-	            return Request.QueryString["treeType"];
+	            return Request.CleanForXss("treeType");
 	        }
 	    }
 

From 52d2306e175596db6ca3be3b5f749450b27005a5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 6 Oct 2015 11:36:54 +0200
Subject: [PATCH 10/36] Fixes: U4-7196 XSS vulnerability in BrowseRepository

---
 .../umbraco/developer/Packages/BrowseRepository.aspx.cs      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
index 696aa8534a..647a84232a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
@@ -12,6 +12,7 @@ using System.Xml;
 using System.Xml.XPath;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Web;
 
 namespace umbraco.presentation.developer.packages {
     public partial class BrowseRepository : BasePages.UmbracoEnsuredPage {
@@ -31,8 +32,8 @@ namespace umbraco.presentation.developer.packages {
                 fb.Text = "<strong>" + ui.Text("errors", "filePermissionsError") + ":</strong><br/>" + ex.Message;
             }
 
-            string category = Request.QueryString["category"];
-            string repoGuid = Request.QueryString["repoGuid"];
+            string category = Request.CleanForXss("category");
+            string repoGuid = Request.CleanForXss("repoGuid");
 
             var repo = cms.businesslogic.packager.repositories.Repository.getByGuid(repoGuid);
             if (repo == null)

From 4925d55e8f919225f85653aa62cb0c375adf0989 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 6 Oct 2015 11:46:38 +0200
Subject: [PATCH 11/36] Fixes: U4-7197 open redirect vulnerability with
 ClientRedirect

---
 src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx b/src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx
index 72232c99cd..6f0bd7c008 100644
--- a/src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx
+++ b/src/Umbraco.Web.UI/umbraco/ClientRedirect.aspx
@@ -10,7 +10,7 @@
     <script type="text/javascript">
         
         var parts = window.location.href.split("?redirectUrl=");
-        if (parts.length != 2) {
+        if (parts.length !== 2) {
             window.location.href = "/";
         }
         else {
@@ -23,12 +23,12 @@
                 parser.href = parts[1];
 
                 // => "http:"
-                if (!parser.protocol || (parser.protocol.toLowerCase() != "http:" && parser.protocol.toLowerCase() != "https:")) {
+                if (!parser.protocol || (parser.protocol.toLowerCase() !== "http:" && parser.protocol.toLowerCase() !== "https:")) {
                     throw "invalid protocol";
                 };
 
                 // => "example.com"
-                if (!parser.hostname || parser.hostname == "") {
+                if (!parser.hostname || parser.hostname === "") {
                     throw "invalid hostname";
                 }
 
@@ -37,13 +37,15 @@
                 //parser.search => "?search=test"
 
                 // => "#hash"
-                if (parser.hash && parser.hash.indexOf("#/developer/framed/") != 0) {
+                if (parser.hash && parser.hash.indexOf("#/developer/framed/") !== 0) {
                     throw "invalid hash";
                 }
 
                 //parser.host;     // => "example.com:3000"
                 
-                window.location.href = parts[1];
+                if (parser.host === window.location.host) {
+                    window.location.href = parts[1];
+                }
 
             } catch (e) {
                 alert(e);

From 86d05ccf95ad2b7f1b75bad80d586dc1a0f24d7c Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 6 Oct 2015 21:03:00 +0200
Subject: [PATCH 12/36] add layouts prevalue editor to list view

---
 src/Umbraco.Web.UI.Client/src/less/forms.less | 10 +-
 .../src/less/listview.less                    | 92 ++++++++++++++++++-
 .../listview/layouts.prevalues.controller.js  | 86 +++++++++++++++++
 .../listview/layouts.prevalues.html           | 49 ++++++++++
 .../PropertyEditors/ListViewPropertyEditor.cs | 10 ++
 5 files changed, 241 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html

diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 1c529f6e01..38b63ad100 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -167,6 +167,12 @@ input[type="color"],
   vertical-align: middle;
 }
 
+input.-full-width-input {
+   width: 100%;
+   box-sizing: border-box;
+   padding: 4px 6px;
+}
+
 // Reset appearance properties for textual inputs and textarea
 // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
 input,
@@ -429,7 +435,7 @@ input[type="checkbox"][readonly] {
 
 
 //SD: NOTE: Had to change these to use our 'form' prefixed colors since we cannot
-// share colors with the notifications/alerts. Also had to change them so that 
+// share colors with the notifications/alerts. Also had to change them so that
 // we do not show any errors unless the containing element has the show-validation
 // class assigned.
 
@@ -453,7 +459,7 @@ input[type="checkbox"][readonly] {
   .formFieldState(@formInfoText, @formInfoText, @formInfoBackground);
 }
 
-// HTML5 invalid states 
+// HTML5 invalid states
 // Shares styles with the .control-group.error above
 
 .show-validation input:focus:invalid,
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index 05277420af..cb5500e5f9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -13,9 +13,9 @@
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0);
 }
 
-.dropdown-menu > li > a:hover, 
-.dropdown-menu > li > a:focus, 
-.dropdown-submenu:hover > a, 
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
 .dropdown-submenu:focus > a {
   color: @black;
   background: @grayLighter;
@@ -124,7 +124,7 @@
 }
 
 .umb-listview .selected i.icon, .umb-listview tbody tr:hover i.icon{display: none}
-.umb-listview .selected input[type="checkbox"], 
+.umb-listview .selected input[type="checkbox"],
 .umb-listview tr:hover input[type="checkbox"]{display: inline-block !important;}
 .umb-listview .inactive{color: @grayLight;}
 
@@ -242,3 +242,87 @@
 .table-striped tbody i:hover {
   display: none !important
 }
+
+/* ---------- LAYOUTS ---------- */
+
+.list-view-layouts {
+
+}
+
+.list-view-layout {
+   display: flex;
+   align-items: center;
+   padding: 10px 15px;
+   background: @grayLighter;
+   border-radius: 5px;
+   margin-bottom: 1px;
+}
+
+.list-view-layout__sort-handle {
+   font-size: 14px;
+   color: @grayLight;
+   margin-right: 15px;
+}
+
+.list-view-layout__name {
+   flex: 5;
+   font-weight: bold;
+   margin-right: 15px;
+   display: flex;
+   align-content: center;
+   flex-wrap: wrap;
+   line-height: 1.2em;
+}
+
+.list-view-layout__name-text {
+   margin-right: 3px;
+}
+
+.list-view-layout__system {
+   font-size: 10px;
+   font-weight: normal;
+}
+
+.list-view-layout__path {
+   flex: 10;
+   margin-right: 15px;
+}
+
+.list-view-layout__icon {
+   font-size: 18px;
+   margin-right: 10px;
+   vertical-align: middle;
+   border: 1px solid @grayLight;
+   border-radius: 5px;
+   background: #ffffff;
+   padding: 6px 8px;
+   display: block;
+}
+
+.list-view-layout__icon:hover,
+.list-view-layout__icon:focus,
+.list-view-layout__icon:active {
+   text-decoration: none;
+}
+
+.list-view-layout__remove-layout {
+   flex: 2;
+   text-align: right;
+   font-size: 20px;
+}
+
+.list-view-add-layout {
+   margin-top: 10px;
+   color: @blue;
+   border: 1px dashed #d9d9d9;
+   border-radius: 5px;
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   padding: 5px 0;
+   box-sizing: border-box;
+}
+
+.list-view-add-layout:hover {
+   text-decoration: none;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
new file mode 100644
index 0000000000..8f02207161
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
@@ -0,0 +1,86 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.PrevalueEditors.ListViewLayoutsPreValsController
+ * @function
+ *
+ * @description
+ * The controller for configuring layouts for list views
+ */
+(function() {
+   "use strict";
+
+   function ListViewLayoutsPreValsController($scope) {
+
+      var vm = this;
+      vm.focusLayoutName = false;
+
+      vm.layoutsSortableOptions = {
+         distance: 10,
+         tolerance: "pointer",
+         opacity: 0.7,
+         scroll: true,
+         cursor: "move",
+         handle: ".list-view-layout__sort-handle"
+      };
+
+      vm.addLayout = addLayout;
+      vm.removeLayout = removeLayout;
+      vm.openIconPicker = openIconPicker;
+
+      function activate() {
+
+
+
+      }
+
+      function addLayout() {
+
+         vm.focusLayoutName = false;
+
+         var layout = {
+            "name": "",
+            "path": "",
+            "icon": "icon-stop",
+            "selected": true
+         };
+
+         $scope.model.value.push(layout);
+
+      }
+
+      function removeLayout($index, layout) {
+         $scope.model.value.splice($index, 1);
+      }
+
+      function openIconPicker(layout) {
+
+         vm.iconPickerDialog = {};
+         vm.iconPickerDialog.view = "iconpicker";
+         vm.iconPickerDialog.show = true;
+
+         vm.iconPickerDialog.pickIcon = function(icon, color) {
+
+            layout.icon = icon;
+            vm.focusLayoutName = true;
+
+            vm.iconPickerDialog.show = false;
+            vm.iconPickerDialog = null;
+         };
+
+
+         vm.iconPickerDialog.close = function(oldModel) {
+
+            vm.iconPickerDialog.show = false;
+            vm.iconPickerDialog = null;
+         };
+
+
+      }
+
+      activate();
+
+   }
+
+   angular.module("umbraco").controller("Umbraco.PrevalueEditors.ListViewLayoutsPreValsController", ListViewLayoutsPreValsController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
new file mode 100644
index 0000000000..2d74be6640
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -0,0 +1,49 @@
+<div ng-controller="Umbraco.PrevalueEditors.ListViewLayoutsPreValsController as vm">
+
+   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+
+      <div class="list-view-layout" ng-repeat="layout in model.value">
+
+         <i class="icon-navigation list-view-layout__sort-handle"></i>
+
+         <div>
+
+            <a ng-if="layout.isSystem !== 1" href="" ng-click="vm.openIconPicker(layout)" class="list-view-layout__icon" umb-auto-focus>
+               <i class="{{ layout.icon }}"></i>
+            </a>
+
+            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+               <i class="{{ layout.icon }}"></i>
+            </div>
+
+         </div>
+
+         <div class="list-view-layout__name">
+            <input ng-if="layout.isSystem !== 1" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+            <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
+            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+         </div>
+
+         <div class="list-view-layout__path">
+            <input ng-if="layout.isSystem !== 1" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+         </div>
+
+         <div>
+            <input ng-if="layout.isSystem === 1" type="checkbox" ng-model="layout.selected" />
+            <umb-confirm-delete ng-if="layout.isSystem !== 1" confirm-action="vm.removeLayout($index, layout)"></umbraco-confirm-delete>
+         </div>
+
+      </div>
+
+      <a href="" class="list-view-add-layout" ng-click="vm.addLayout()">Add layout</a>
+
+   </div>
+
+   <umb-overlay
+      ng-if="vm.iconPickerDialog.show"
+      model="vm.iconPickerDialog"
+      view="vm.iconPickerDialog.view"
+      position="right">
+   </umb-overlay>
+
+</div>
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
index d2eb5f94ec..e146e545b9 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
@@ -33,6 +33,13 @@ namespace Umbraco.Web.PropertyEditors
                             new {alias = "updateDate", header = "Last edited", isSystem = 1},
                             new {alias = "owner", header = "Created by", isSystem = 1}
                         }
+                    },
+                    {
+                        "layouts", new[]
+                        {
+                            new {name = "List", path = "views/propertyeditors/listview/layouts/list/list.html", icon = "icon-list", isSystem = 1, selected = true},
+                            new {name = "Grid", path = "views/propertyeditors/listview/layouts/grid/grid.html", icon = "icon-thumbnails-small", isSystem = 1, selected = true}
+                        }
                     }
                 };
             }
@@ -51,6 +58,9 @@ namespace Umbraco.Web.PropertyEditors
             [PreValueField("orderDirection", "Order Direction", "views/propertyeditors/listview/orderdirection.prevalues.html")]
             public int OrderDirection { get; set; }
 
+            [PreValueField("layouts", "Layouts", "views/propertyeditors/listview/layouts.prevalues.html")]
+            public int Layouts { get; set; }
+
             [PreValueField("includeProperties", "Columns Displayed", "views/propertyeditors/listview/includeproperties.prevalues.html", 
                 Description = "The properties that will be displayed for each column")]
             public object IncludeProperties { get; set; }

From 99a9af833ea4d35670d6b9816cd49710ef9a33ca Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 7 Oct 2015 14:31:48 +0200
Subject: [PATCH 13/36] U4-7179: add layout selector to list view

---
 .../components/umblayoutselector.directive.js | 105 +++++++++++++++++
 src/Umbraco.Web.UI.Client/src/less/belle.less |   1 +
 .../less/components/umb-layout-selector.less  |  59 ++++++++++
 .../views/components/umb-layout-selector.html |  15 +++
 .../listview/layouts/list/list.html           |  83 ++++++++++++++
 .../listview/listview.controller.js           |  23 ++++
 .../propertyeditors/listview/listview.html    | 106 +++---------------
 7 files changed, 304 insertions(+), 88 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
new file mode 100644
index 0000000000..ea3eedd968
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
@@ -0,0 +1,105 @@
+(function() {
+   'use strict';
+
+   function LayoutSelectorDirective() {
+
+      function link(scope, el, attr, ctrl) {
+
+         scope.layoutDropDownIsOpen = false;
+         scope.showLayoutSelector = true;
+
+         function activate() {
+
+            setVisibility();
+
+            setActiveLayout(scope.layouts);
+
+         }
+
+         function setVisibility() {
+
+            var numberOfAllowedLayouts = getNumberOfAllowedLayouts(scope.layouts);
+
+            if(numberOfAllowedLayouts === 1) {
+               scope.showLayoutSelector = false;
+            }
+
+         }
+
+         function getNumberOfAllowedLayouts(layouts) {
+
+            var allowedLayouts = 0;
+
+            for (var i = 0; layouts.length > i; i++) {
+
+               var layout = layouts[i];
+
+               if(layout.selected === true) {
+                  allowedLayouts++;
+               }
+
+            }
+
+            return allowedLayouts;
+         }
+
+         function setActiveLayout(layouts) {
+
+            for (var i = 0; layouts.length > i; i++) {
+
+               var layout = layouts[i];
+
+               if(layout.name === scope.activeLayout.name && layout.path === scope.activeLayout.path) {
+                  layout.active = true;
+               }
+
+            }
+
+         }
+
+         scope.pickLayout = function(selectedLayout) {
+
+            for (var i = 0; scope.layouts.length > i; i++) {
+
+               var layout = scope.layouts[i];
+
+               layout.active = false;
+            }
+
+            selectedLayout.active = true;
+
+            scope.activeLayout = selectedLayout;
+
+            scope.layoutDropDownIsOpen = false;
+
+         };
+
+         scope.toggleLayoutDropdown = function() {
+            scope.layoutDropDownIsOpen = !scope.layoutDropDownIsOpen;
+         };
+
+         scope.closeLayoutDropdown = function() {
+            scope.layoutDropDownIsOpen = false;
+         };
+
+         activate();
+
+      }
+
+      var directive = {
+         restrict: 'E',
+         replace: true,
+         templateUrl: 'views/components/umb-layout-selector.html',
+         scope: {
+            layouts: '=',
+            activeLayout: '='
+         },
+         link: link
+      };
+
+      return directive;
+   }
+
+   angular.module('umbraco.directives').directive('umbLayoutSelector', LayoutSelectorDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 22e8fac980..f02cccf4d4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -95,6 +95,7 @@
 @import "components/umb-tabs.less";
 @import "components/umb-load-indicator.less";
 @import "components/umb-breadcrumbs.less";
+@import "components/umb-layout-selector.less";
 @import "components/overlays/umb-overlay-backdrop.less";
 
 @import "components/buttons/umb-button.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
new file mode 100644
index 0000000000..43e0c5ae52
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -0,0 +1,59 @@
+.umb-layout-selector {
+   display: inline-block;
+   position: relative;
+}
+
+.umb-layout-selector__active-layout {
+   box-sizing: border-box;
+   border: 1px solid transparent;
+   cursor: pointer;
+   height: 30px;
+   width: 30px;
+   margin: 0 8px;
+   font-size: 20px;
+   display: flex;
+   justify-content: center;
+   align-items: center;
+}
+
+.umb-layout-selector__active-layout:hover {
+   border-color: @grayLight;
+}
+
+.umb-layout-selector__dropdown {
+   position: absolute;
+   padding: 5px;
+   background: #333;
+   z-index: 999;
+   display: flex;
+   background: #fff;
+   flex-wrap: wrap;
+   flex-direction: column;
+   transform: translate(-50%,0);
+   left: 50%;
+}
+
+.umb-layout-selector__dropdown-item {
+   padding: 5px;
+   margin: 3px 5px;
+   display: flex;
+   align-content: center;
+   justify-content: center;
+   border: 1px solid transparent;
+   flex-direction: column;
+   cursor: pointer;
+}
+
+.umb-layout-selector__dropdown-item:hover {
+   border: 1px solid @grayLight;
+}
+
+.umb-layout-selector__dropdown-item.-active {
+   border: 1px solid @blue;
+}
+
+.umb-layout-selector__dropdown-item-icon {
+   font-size: 20px;
+   color: @gray;
+   text-align: center;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
new file mode 100644
index 0000000000..a7b2e0e556
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -0,0 +1,15 @@
+<div class="umb-layout-selector" ng-show="showLayoutSelector">
+
+   <div class="umb-layout-selector__active-layout" ng-click="toggleLayoutDropdown()">
+      <i class="{{ activeLayout.icon }}"></i>
+   </div>
+
+   <div ng-if="layoutDropDownIsOpen" class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn" on-outside-click="closeLayoutDropdown()">
+
+      <div ng-repeat="layout in layouts | filter:{selected:true}" class="umb-layout-selector__dropdown-item" ng-click="pickLayout(layout)" ng-class="{'-active': layout.active }">
+         <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon"></i>
+      </div>
+
+   </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
new file mode 100644
index 0000000000..d3363f613d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -0,0 +1,83 @@
+<table class="table table-striped">
+    <thead>
+        <tr>
+            <td style="width: 35px">
+                <input type="checkbox" ng-click="selectAll($event)" ng-checked="isSelectedAll()">
+            </td>
+            <td>
+                <a href="#" ng-click="sort('Name', true)" prevent-default class="sortable">
+                    <localize key="general_name">Name</localize>
+                    <i class="icon" ng-class="{'icon-navigation-up': isSortDirection('Name', 'asc'), 'icon-navigation-down': isSortDirection('Name', 'desc')}"></i>
+                </a>
+            </td>
+
+            <td ng-repeat="column in options.includeProperties">
+                <a href="#" ng-click="sort(column.alias, column.allowSorting)" ng-class="{'sortable':column.allowSorting}" prevent-default>
+                    <span ng-bind="column.header"></span>
+                    <i class="icon" ng-class="{'icon-navigation-up': isSortDirection(column.alias, 'asc'), 'icon-navigation-down': isSortDirection(column.alias, 'desc')}"></i>
+                </a>
+            </td>
+        </tr>
+    </thead>
+
+    <tbody ng-show="listViewResultSet.totalItems === 0">
+        <tr>
+            <td colspan="{{options.includeProperties.length + 2}}">
+                <p><localize key="content_listViewNoItems">There are no items show in the list.</localize></p>
+            </td>
+        </tr>
+    </tbody>
+
+    <tbody ng-show="listViewResultSet.totalItems > 0">
+        <tr ng-repeat="result in listViewResultSet.items"
+            ng-class="{selected:result.selected}">
+
+            <td>
+                <i class="icon {{result.icon}}" ng-class="getIcon(result)"></i>
+                <input type="checkbox" ng-model="result.selected" no-dirty-check>
+            </td>
+            <td>
+                <a ng-class="{inactive: (entityType === 'content' && !result.published) || isTrashed}"
+                   href="#{{result.editPath}}"
+                   ng-bind="result.name"></a>
+            </td>
+
+            <td ng-repeat="column in options.includeProperties">
+                <span>{{result[column.alias]}}</span>
+            </td>
+        </tr>
+    </tbody>
+
+    <tfoot ng-show="pagination.length > 1">
+        <tr>
+            <th colspan="{{options.includeProperties.length + 2}}">
+                <div class="pull-left">
+                </div>
+                <div class="pagination pagination-right">
+                    <ul>
+                        <li ng-class="{disabled:options.pageNumber <= 1}">
+                            <a href="#" ng-click="prev()" prevent-default>
+                                <localize key="general_previous">Previous</localize>
+                            </a>
+                        </li>
+
+                        <li ng-repeat="pgn in pagination"
+                            ng-class="{active:pgn.isActive}">
+
+                            <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
+                               ng-bind="pgn.name ? pgn.name : pgn.val"
+                               ng-if="pgn.val != '...'"></a>
+                            <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
+                        </li>
+
+                        <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
+                            <a href="#" ng-click="next()" prevent-default>
+                                <localize key="general_next">Next</localize>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </th>
+        </tr>
+    </tfoot>
+</table>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 0569c9faca..5ac02b9045 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -51,6 +51,8 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
     $scope.pagination = [];
     $scope.isNew = false;
     $scope.actionInProgress = false;
+    $scope.layout = {};
+    $scope.layout.activeLayout = {};
     $scope.listViewResultSet = {
         totalPages: 0,
         items: []
@@ -71,6 +73,9 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
         allowBulkDelete: true,        
     };
 
+    // set active layout
+    $scope.layout.activeLayout = getFirstAllowedLayout($scope.model.config.layouts);
+
     //update all of the system includeProperties to enable sorting
     _.each($scope.options.includeProperties, function(e, i) {
         
@@ -91,6 +96,24 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
         }
     });
 
+    function getFirstAllowedLayout(layouts) {
+
+       var firstAllowedLayout = {};
+
+       for (var i = 0; layouts.length > i; i++) {
+
+          var layout = layouts[i];
+
+          if (layout.selected === true) {
+             firstAllowedLayout = layout;
+             break;
+          }
+
+       }
+
+       return firstAllowedLayout;
+    }
+
     function showNotificationsAndReset(err, reload, successMsg) {
 
         //check if response is ysod
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 211524caf0..6bed8145a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -44,96 +44,26 @@
 
             <span ng-bind="bulkStatus" ng-show="isAnythingSelected()" class="pull-right"></span>
 
-            <form class="form-search pull-right" novalidate ng-show="!actionInProgress">
-                <div class="inner-addon left-addon">
-                    <i class="icon icon-search" ng-click="enterSearch($event)"></i>
-                    <input type="text" class="form-control" localize="placeholder" placeholder="@general_typeToSearch" ng-model="options.filter" prevent-enter-submit no-dirty-check>
-                </div>
-            </form>
+            <div class="pull-right">
+
+               <form class="form-search pull-right" novalidate ng-show="!actionInProgress">
+                   <div class="inner-addon left-addon">
+                       <i class="icon icon-search" ng-click="enterSearch($event)"></i>
+                       <input type="text" class="form-control" localize="placeholder" placeholder="@general_typeToSearch" ng-model="options.filter" prevent-enter-submit no-dirty-check>
+                   </div>
+               </form>
+
+               <umb-layout-selector
+                  ng-if="model.config.layouts"
+                  layouts="model.config.layouts"
+                  active-layout="layout.activeLayout">
+               </umb-layout-selector>
+
+            </div>
+
         </div>
 
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <td style="width: 35px">
-                        <input type="checkbox" ng-click="selectAll($event)" ng-checked="isSelectedAll()">
-                    </td>
-                    <td>
-                        <a href="#" ng-click="sort('Name', true)" prevent-default class="sortable">
-                            <localize key="general_name">Name</localize>
-                            <i class="icon" ng-class="{'icon-navigation-up': isSortDirection('Name', 'asc'), 'icon-navigation-down': isSortDirection('Name', 'desc')}"></i>
-                        </a>
-                    </td>
+        <div ng-include="layout.activeLayout.path"></div>
 
-                    <td ng-repeat="column in options.includeProperties">
-                        <a href="#" ng-click="sort(column.alias, column.allowSorting)" ng-class="{'sortable':column.allowSorting}" prevent-default>
-                            <span ng-bind="column.header"></span>
-                            <i class="icon" ng-class="{'icon-navigation-up': isSortDirection(column.alias, 'asc'), 'icon-navigation-down': isSortDirection(column.alias, 'desc')}"></i>
-                        </a>
-                    </td>
-                </tr>
-            </thead>
-
-            <tbody ng-show="listViewResultSet.totalItems === 0">
-                <tr>
-                    <td colspan="{{options.includeProperties.length + 2}}">
-                        <p><localize key="content_listViewNoItems">There are no items show in the list.</localize></p>
-                    </td>
-                </tr>
-            </tbody>
-
-            <tbody ng-show="listViewResultSet.totalItems > 0">
-                <tr ng-repeat="result in listViewResultSet.items"
-                    ng-class="{selected:result.selected}">
-
-                    <td>
-                        <i class="icon {{result.icon}}" ng-class="getIcon(result)"></i>
-                        <input type="checkbox" ng-model="result.selected" no-dirty-check>
-                    </td>
-                    <td>
-                        <a ng-class="{inactive: (entityType === 'content' && !result.published) || isTrashed}"
-                           href="#{{result.editPath}}"
-                           ng-bind="result.name"></a>
-                    </td>
-
-                    <td ng-repeat="column in options.includeProperties">
-                        <span>{{result[column.alias]}}</span>
-                    </td>
-                </tr>
-            </tbody>
-
-            <tfoot ng-show="pagination.length > 1">
-                <tr>
-                    <th colspan="{{options.includeProperties.length + 2}}">
-                        <div class="pull-left">
-                        </div>
-                        <div class="pagination pagination-right">
-                            <ul>
-                                <li ng-class="{disabled:options.pageNumber <= 1}">
-                                    <a href="#" ng-click="prev()" prevent-default>
-                                        <localize key="general_previous">Previous</localize>
-                                    </a>
-                                </li>
-
-                                <li ng-repeat="pgn in pagination"
-                                    ng-class="{active:pgn.isActive}">
-
-                                    <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
-                                       ng-bind="pgn.name ? pgn.name : pgn.val"
-                                       ng-if="pgn.val != '...'"></a>
-                                    <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
-                                </li>
-
-                                <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
-                                    <a href="#" ng-click="next()" prevent-default>
-                                        <localize key="general_next">Next</localize>
-                                    </a>
-                                </li>
-                            </ul>
-                        </div>
-                    </th>
-                </tr>
-            </tfoot>
-        </table>
     </div>
 </div>

From 8ae40751a93b0c017fb8397d0fbd1a7bd93176a4 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 7 Oct 2015 19:17:26 +0200
Subject: [PATCH 14/36] U4-7204 The grid: The insert control overlay do not
 close on mouse out

---
 .../src/common/directives/events/events.directive.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/events/events.directive.js
index ed827dd2d0..8d42e2a983 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/events/events.directive.js
@@ -211,7 +211,7 @@ angular.module('umbraco.directives')
 
             link: function (scope, element, attrs, ctrl) {
                 var active = false;
-                var fn = $parse(attrs.delayedMouseleave);
+                var fn = $parse(attrs.onDelayedMouseleave);
 
                 var leave_f = function(event) {
                     var callback = function() {

From 246244a7746fd571d0d8a5e7a36b7121d0b037aa Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 7 Oct 2015 19:34:17 +0200
Subject: [PATCH 15/36] U4-7205: set aliases to camelCase

---
 .../src/common/directives/editors/umbGenerateAlias.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbGenerateAlias.directive.js
index c323e45bde..4a52407972 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbGenerateAlias.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbGenerateAlias.directive.js
@@ -29,7 +29,7 @@ angular.module("umbraco.directives")
                     scope.alias = "Generating Alias...";
 
                     generateAliasTimeout = $timeout(function () {
-                      contentTypeResource.getSafeAlias(value, false).then(function(safeAlias){
+                      contentTypeResource.getSafeAlias(value, true).then(function(safeAlias){
                         scope.alias = safeAlias.alias;
                       });
                     }, 500);

From 3405a97ed4c7d7fb4e6c85d927ef58d2feb923ea Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 8 Oct 2015 21:26:34 +0200
Subject: [PATCH 16/36] U4-7215 Shared pagination for all layouts

---
 .../src/less/listview.less                    |  6 +++-
 .../listview/layouts/list/list.html           | 32 -------------------
 .../propertyeditors/listview/listview.html    | 27 ++++++++++++++++
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index cb5500e5f9..5e792bc4bf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -181,6 +181,10 @@
   color: #b0b0b0
 }
 
+.umb-listview .pagination {
+   text-align: center;
+}
+
 .umb-listview .pagination ul {
   -webkit-border-radius: 0px;
   -moz-border-radius: 0px;
@@ -195,7 +199,7 @@
   border:none;
   padding: 8px 4px 2px 4px;
   background: none;
-  font-size: 11px;
+  font-size: 12px;
   color: #b0b0b0
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index d3363f613d..07f6bffd29 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -48,36 +48,4 @@
         </tr>
     </tbody>
 
-    <tfoot ng-show="pagination.length > 1">
-        <tr>
-            <th colspan="{{options.includeProperties.length + 2}}">
-                <div class="pull-left">
-                </div>
-                <div class="pagination pagination-right">
-                    <ul>
-                        <li ng-class="{disabled:options.pageNumber <= 1}">
-                            <a href="#" ng-click="prev()" prevent-default>
-                                <localize key="general_previous">Previous</localize>
-                            </a>
-                        </li>
-
-                        <li ng-repeat="pgn in pagination"
-                            ng-class="{active:pgn.isActive}">
-
-                            <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
-                               ng-bind="pgn.name ? pgn.name : pgn.val"
-                               ng-if="pgn.val != '...'"></a>
-                            <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
-                        </li>
-
-                        <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
-                            <a href="#" ng-click="next()" prevent-default>
-                                <localize key="general_next">Next</localize>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </th>
-        </tr>
-    </tfoot>
 </table>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 6bed8145a4..645c8cee8e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -65,5 +65,32 @@
 
         <div ng-include="layout.activeLayout.path"></div>
 
+        <div class="pagination" ng-show="pagination.length > 1">
+
+           <ul>
+              <li ng-class="{disabled:options.pageNumber <= 1}">
+                   <a href="#" ng-click="prev()" prevent-default>
+                      <localize key="general_previous">Previous</localize>
+                   </a>
+              </li>
+
+              <li ng-repeat="pgn in pagination"
+                   ng-class="{active:pgn.isActive}">
+
+                   <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
+                      ng-bind="pgn.name ? pgn.name : pgn.val"
+                      ng-if="pgn.val != '...'"></a>
+                   <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
+              </li>
+
+              <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
+                   <a href="#" ng-click="next()" prevent-default>
+                      <localize key="general_next">Next</localize>
+                   </a>
+              </li>
+           </ul>
+
+        </div>
+
     </div>
 </div>

From a199525d0ffaf83725047ad2773d27632df6a254 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 8 Oct 2015 21:36:08 +0200
Subject: [PATCH 17/36] U4-7182: add flex box version of media image grid to
 list view

---
 .../src/assets/img/transparent.png            | Bin 0 -> 14993 bytes
 .../components/umbmediagrid.directive.js      | 139 ++++++++++++++
 src/Umbraco.Web.UI.Client/src/less/belle.less |   1 +
 .../src/less/components/umb-media-grid.less   | 172 ++++++++++++++++++
 .../src/views/components/umb-media-grid.html  |  39 ++++
 .../listview/layouts/grid/grid.html           |   8 +
 6 files changed, 359 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/assets/img/transparent.png
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html

diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/transparent.png b/src/Umbraco.Web.UI.Client/src/assets/img/transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec8b019cdb7d3a98379ce4af698250ad7a5163c1
GIT binary patch
literal 14993
zcmeI3&2Q^O5WxLZ9(okL6G9+3VEGA&FUKEozAPuDBz?3JDOFn_<@DC}Cb62>#&(;u
z2ZVqN7X&9HK-{_T4{+edp8yhn0XIOLkdVr*oy5r`Sw-S;K^rNtXJ=<-_qQ_>U;N3@
z;p=y|pV<}!;qJkH>zG_0q2D`?lHYIt_~w0bc`V#Niv{8FC+PQ<@a5M}3qtL8@3fP2
z+HaUnFf1T9uyJ8L49RRkuy)2Fa?Wug+PLTWb?LY7e~?7atxNBe+G;y&;=Z?k9pRJf
z!&B$_+^M<JPGj2|o5aBoCrBI*2Yzgh>r(31B=>Y!k;HULa$c8qX+W{lJ`$TjgvC;!
zEIVqsB35bztyHNPl~+Vv)k=z5REnys7fnMo4PBgkq{cS6vm&=^9=GmK!V#%1^^+tt
z6=gIU6-LEE5cL$TR;wwhuIRc<X2|iCpP;eq$M-TPQ$H;nJCPSAUf_$=FS3J+q%KJ`
z(CjnW*D#y~^5Y3RLQxr`P|*sivc{<0W}6L%D=p(>?~<%!va^)|<I}4UE5|qvE+Pl-
zU1C4Ew`vitGxHN(M1z!%>nM1Dhr}c%i`P~zA?yc95ch*M`<|)S?mqFl`Qa>Vfoj&8
z;jy>IjA}BoG!?QFvPk}!%?P6;h)#oG(8#jvXu5i_*-W!ae4&jT&!<~@(NdsMe&V@5
z+(HR%(2SHdRaUE~TFF#3vs8Uq)lF5MbCS&jKH4PvU6i0rye!OxegfC)UTx$hpSkFx
z-8K*WI6=OH4_Xbf_k!oSrmK?b)6}ADlrWMF8#yvE99!;c$WRTe>m^i9H@RrO<hm6&
z7c`ZK>#X$Mz#;Bu31aF-O;f9OS4P;dWlgJ8W!vdGGIkudQboF3wu{q1bIz6my%~9=
zGoiuU9J&{m1jCx`s;)|osa7Q$sus&~t&A#kYihMrLxzj>X^0hWmO|}&G0CT^xjZA;
zmiC?#{NCc|R59?<9ulG`#<Vo+(zG^bO=s3qs7+epCUR)^X*e{2v1=&{qxrICmJ>5?
z`8YR2koli8Ums)C$383lGgs-X^-kiTn~YF|cY7p5Hml9d@1h|LU@5d;54`{2C}MQ^
z?+#+Ky853SM4rh`ANf7(Hk4@+PX{(TyX-_4t7}@Z%hhPPj@b>OAxawF5cRMU`aMg@
z2lJR#-iMmOAc)$5iyNfftQwxPqJL2)=@cYuQCgvzr7VrX`5jvEgNt;2MOVp3(dh5Q
zbY2Zj&)BB(YG|5UzU6yKgY>y{p<sB<ivEw9DU1{H$cG!{QmI(76gUhmj=V7*bXp$i
z^)c;P#>51Uue3W`V>dTGvC9%+?$Io*@obbl_>pH$W%kgyRQ|I*`7m$t4LwY+z!wh!
zfUrf5i_HgUIW7Q%Epl9JK0wQH0U&IV<6`pxT8;|<VT&9Wn-9=(TmT4L<ha;;fR^I|
zK-eP3#pVOF92Wq>7CA09AE4#901&pwak2RTEyo3butkoG%?D^XE&zlra$IaaK+ACf
zAZ(H2V)Fr7jtc-`iyRl5572U400>*;xY&Gvmg53I*doWp<^!}G7XZQ*IW9IIpyjv#
z5Vpv1vH1Wk#|40}MUIQj2WUAi0E8`aTx>o-%W(l9Y?0$)^8s3p3jkq@OkCUfYn<38
z?{1FBOPXKZf9Z4bf~V;0AGZbJ`guY4;3Gl!>xNu^6@=qE!mTGef?$3j2u}q+zx&*0
zWbU&Et=-e{FZSOzH#=MU1N+sjk8jhLL~m}kgdacMy8Y+d>Q7WY*gI@}_u7LG{{gm0
BD<S{@

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
new file mode 100644
index 0000000000..6fe2a1391c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -0,0 +1,139 @@
+(function() {
+   'use strict';
+
+   function MediaGridDirective($filter, mediaHelper) {
+
+      function link(scope, el, attr, ctrl) {
+
+         scope.folders = [];
+         scope.mediaItems = [];
+         var itemMaxHeight = 200;
+
+         function activate() {
+
+            for (var i = 0; scope.items.length > i; i++) {
+
+               var item = scope.items[i];
+
+               setItemData(item);
+
+               setOriginalSize(item, itemMaxHeight);
+
+               seperateFolderAndMediaItems(item);
+
+            }
+
+            setFlexValues(scope.items);
+
+         }
+
+         function setItemData(item) {
+
+             item.isFolder = !mediaHelper.hasFilePropertyType(item);
+
+             if(!item.isFolder){
+                 item.thumbnail = mediaHelper.resolveFile(item, true);
+                 item.image = mediaHelper.resolveFile(item, false);
+             }
+         }
+
+         function setOriginalSize(item, maxHeight) {
+
+             //set to a square by default
+             item.originalWidth = maxHeight;
+             item.originalHeight = maxHeight;
+             item.aspectRatio = 1;
+
+             var widthProp = _.find(item.properties, function(v) { return (v.alias === "umbracoWidth"); });
+
+             if (widthProp && widthProp.value) {
+                 item.originalWidth = parseInt(widthProp.value, 10);
+                 if (isNaN(item.originalWidth)) {
+                     item.originalWidth = maxHeight;
+                 }
+             }
+
+             var heightProp = _.find(item.properties, function(v) { return (v.alias === "umbracoHeight"); });
+
+             if (heightProp && heightProp.value) {
+                 item.originalHeight = parseInt(heightProp.value, 10);
+                 if (isNaN(item.originalHeight)) {
+                     item.originalHeight = maxHeight;
+                 }
+             }
+
+             item.aspectRatio = item.originalWidth / item.originalHeight;
+
+         }
+
+         function seperateFolderAndMediaItems(item) {
+
+            if(item.isFolder){
+               scope.folders.push(item);
+            } else {
+               scope.mediaItems.push(item);
+            }
+
+         }
+
+         function setFlexValues(items) {
+
+            var flexSortArray = scope.mediaItems;
+            var smallestImageWidth = null;
+            var widestImageAspectRatio = null;
+
+            // sort array after image width with the widest image first
+            flexSortArray = $filter('orderBy')(flexSortArray, 'originalWidth', true);
+
+            // find widest image aspect ratio
+            widestImageAspectRatio = flexSortArray[0].aspectRatio;
+
+            // find smallest image width
+            smallestImageWidth = flexSortArray[flexSortArray.length - 1].originalWidth;
+
+            for (var i = 0; flexSortArray.length > i; i++) {
+
+               var mediaItem = flexSortArray[i];
+               var flex = 1 / (widestImageAspectRatio / mediaItem.aspectRatio);
+
+               if (flex === 0) {
+                  flex = 1;
+               }
+
+               var imageMinWidth = smallestImageWidth * flex;
+
+               var flexStyle = {
+                  "flex": flex + " 1 " + imageMinWidth + "px",
+                  "max-width": mediaItem.originalWidth + "px"
+               };
+
+               mediaItem.flexStyle = flexStyle;
+
+            }
+
+         }
+
+         scope.toggleSelectItem = function(item) {
+            item.selected = !item.selected;
+         };
+
+         activate();
+
+      }
+
+      var directive = {
+         restrict: 'E',
+         replace: true,
+         templateUrl: 'views/components/umb-media-grid.html',
+         scope: {
+            items: '='
+         },
+         link: link
+      };
+
+      return directive;
+   }
+
+   angular.module('umbraco.directives').directive('umbMediaGrid', MediaGridDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index f02cccf4d4..b6f4536b95 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -95,6 +95,7 @@
 @import "components/umb-tabs.less";
 @import "components/umb-load-indicator.less";
 @import "components/umb-breadcrumbs.less";
+@import "components/umb-media-grid.less";
 @import "components/umb-layout-selector.less";
 @import "components/overlays/umb-overlay-backdrop.less";
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
new file mode 100644
index 0000000000..66e1885042
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -0,0 +1,172 @@
+.umb-media-grid {
+   display: flex;
+   flex-wrap: wrap;
+   flex-direction: row;
+   width: 100%;
+   margin-bottom: 30px;
+}
+
+/* ---------- FOLDERS --------- */
+
+.umb-media-grid__folders {
+   display: flex;
+   flex-direction: row;
+   flex-wrap: wrap;
+   width: 100%;
+   margin-bottom: 20px;
+}
+
+.umb-media-grid__folder {
+   background: @grayLighter;
+   margin: 5px;
+   display: flex;
+   align-items: center;
+   padding: 10px 30px 10px 20px;
+   box-sizing: border-box;
+   flex: 1 1 200px;
+   border: 1px solid transparent;
+   transition: border 0.2s;
+   position: relative;
+}
+
+.umb-media-grid__folder.-selected {
+   background: rgba(255, 255, 255, 0.6);
+}
+
+.umb-media-grid__folder:focus,
+.umb-media-grid__folder:active {
+   text-decoration: none;
+}
+
+.umb-media-grid__folder:hover {
+   text-decoration: none;
+   border: 1px solid @blue;
+}
+
+.umb-media-grid__folder-icon {
+   font-size: 20px;
+   color: @gray;
+   margin-right: 20px;
+}
+
+.umb-media-grid__folder-name {
+   font-size: 13px;
+}
+
+/* ---------- MEDIA ---------- */
+
+.umb-media-grid__media {
+   display: flex;
+   flex-direction: row;
+   flex-wrap: wrap;
+   width: 100%;
+   align-items: center;
+}
+
+.umb-media-grid__item {
+   margin: 7px;
+   position: relative;
+   background: @grayLighter;
+}
+
+.umb-media-grid__item:hover {
+   text-decoration: none;
+}
+
+.umb-media-grid__item-image-placeholder {
+   width: 200px;
+   height: 200px;
+   display: inline-block;
+}
+
+.umb-media-grid__item-image {
+   width: 100%;
+   max-width: 100%;
+   height: auto;
+}
+
+.umb-media-grid__item-image.-faded {
+   opacity: 0.5;
+   transition: opacity 100ms ease-in;
+}
+
+.umb-media-grid__item-overlay {
+   display: none;
+   position: absolute;
+   right: 0;
+   bottom: 0;
+   left: 0;
+   z-index: 100;
+   padding: 5px;
+   overflow: hidden;
+   color: white;
+   text-align: center;
+   white-space: nowrap;
+   background: black;
+   background: rgba(0, 0, 0, 0.4);
+}
+
+.umb-media-grid__item:hover .umb-media-grid__item-overlay {
+   display: block;
+}
+
+.umb-media-grid__item-name {
+   text-align: center;
+   color: @gray;
+   font-size: 12px;
+   position: absolute;
+   bottom: 20px;
+   right: 0;
+   left: 0;
+}
+
+.umb-media-grid__item-icon {
+   color: @gray;
+   position: absolute;
+   top: 50%;
+   left: 50%;
+   font-size: 40px;
+   transform: translate(-50%,-50%);
+}
+
+.umb-media-grid__select {
+   opacity: 0;
+   border: 1px solid #ffffff;
+   width: 30px;
+   height: 30px;
+   background: rgba(0, 0, 0, 0.4);
+   position: absolute;
+   top: 10px;
+   right: 10px;
+   z-index: 10;
+   border-radius: 50px;
+}
+
+.umb-media-grid__select.-size-20 {
+   width: 20px;
+   height: 20px;
+}
+
+.umb-media-grid__select:hover {
+   background: @blue;
+   transition: background 0.2s;
+}
+
+.umb-media-grid__select.-selected {
+   opacity: 1;
+   background: @blue;
+}
+
+.umb-media-grid__select-icon {
+   position: absolute;
+   top: 50%;
+   left: 50%;
+   transform: translate(-50%, -50%);
+   color: white;
+}
+
+.umb-media-grid__item:hover .umb-media-grid__select,
+.umb-media-grid__folder:hover .umb-media-grid__select{
+   opacity: 1;
+   transition: opacity 0.2s;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
new file mode 100644
index 0000000000..f84770bb3d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -0,0 +1,39 @@
+<div class="umb-media-grid">
+
+   <div class="umb-media-grid__folders">
+
+      <a href="#{{folder.editPath}}" class="umb-media-grid__folder" ng-repeat="folder in folders">
+
+         <i class="umb-media-grid__folder-icon {{ folder.icon }}"></i>
+
+         <div class="umb-media-grid__folder-name">{{ folder.name }}</div>
+
+         <div class="umb-media-grid__select -size-20" ng-click="toggleSelectItem(folder)" ng-class="{'-selected': folder.selected}" prevent-default>
+            <i class="icon-check umb-media-grid__select-icon"></i>
+         </div>
+
+      </a>
+
+   </div>
+
+   <div class="umb-media-grid__media">
+
+      <a href="#{{item.editPath}}" ng-repeat="item in mediaItems" ng-style="item.flexStyle" class="umb-media-grid__item">
+
+         <div class="umb-media-grid__select" ng-click="toggleSelectItem(item)" ng-class="{'-selected': item.selected}" prevent-default>
+            <i class="icon-check umb-media-grid__select-icon"></i>
+         </div>
+
+         <div class="umb-media-grid__item-overlay">{{item.name}}</div>
+
+         <img class="umb-media-grid__item-image" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" ng-class="{'-faded': item.selected}" />
+
+         <img class="umb-media-grid__item-image" ng-if="!item.thumbnail" src="assets/img/transparent.png" alt="{{item.name}}" />
+
+         <i class="umb-media-grid__item-icon {{ item.icon }}" ng-if="!item.thumbnail"></i>
+
+      </a>
+
+   </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
new file mode 100644
index 0000000000..5dcb1f0c30
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -0,0 +1,8 @@
+<div ng-if="entityType === 'media'">
+
+   <umb-media-grid
+      ng-if="listViewResultSet.items"
+      items="listViewResultSet.items">
+   </umb-media-grid>
+
+<div>

From ffc52d01056b4a1f64af931ee7109cd348643456 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Thu, 8 Oct 2015 13:12:43 +0200
Subject: [PATCH 18/36] Fixes U4-7177 Tree dialogs disappear after opening

---
 .../src/common/services/dialog.service.js     | 76 ++++++++-----------
 .../src/common/services/navigation.service.js | 75 +++++++++---------
 2 files changed, 71 insertions(+), 80 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
index 89c1ea6975..263397787d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
@@ -2,13 +2,13 @@
  * @ngdoc service
  * @name umbraco.services.dialogService
  *
- * @requires $rootScope 
+ * @requires $rootScope
  * @requires $compile
  * @requires $http
  * @requires $log
  * @requires $q
  * @requires $templateCache
- *  
+ *
  * @description
  * Application-wide service for handling modals, overlays and dialogs
  * By default it injects the passed template url into a div to body of the document
@@ -22,10 +22,10 @@
  * <pre>
  *    var dialog = dialogService.open({template: 'path/to/page.html', show: true, callback: done});
  *    functon done(data){
- *      //The dialog has been submitted 
+ *      //The dialog has been submitted
  *      //data contains whatever the dialog has selected / attached
- *    }     
- * </pre> 
+ *    }
+ * </pre>
  */
 
 angular.module('umbraco.services')
@@ -38,12 +38,12 @@ angular.module('umbraco.services')
         for (var i = 0; i < dialogs.length; i++) {
             var dialog = dialogs[i];
 
-            //very special flag which means that global events cannot close this dialog - currently only used on the login 
+            //very special flag which means that global events cannot close this dialog - currently only used on the login
             // dialog since it's special and cannot be closed without logging in.
             if (!dialog.manualClose) {
                 dialog.close(args);
             }
-            
+
         }
     }
 
@@ -56,28 +56,18 @@ angular.module('umbraco.services')
             //this is not entirely enough since the damn webforms scriploader still complains
             if (dialog.iframe) {
                 dialog.element.find("iframe").attr("src", "about:blank");
-                $timeout(function () {
-                    //we need to do more than just remove the element, this will not destroy the 
-                    // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
-                    // take care of this ourselves we have memory leaks.
-                    dialog.element.remove();
-                    //SD: No idea why this is required but was there before - pretty sure it's not required
-                    $("#" + dialog.element.attr("id")).remove();
-                    dialog.scope.$destroy();
-                }, 1000);
-            } else {
-                //we need to do more than just remove the element, this will not destroy the 
-                // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
-                // take care of this ourselves we have memory leaks.
-                dialog.element.remove();
-                //SD: No idea why this is required but was there before - pretty sure it's not required
-                $("#" + dialog.element.attr("id")).remove();
-                dialog.scope.$destroy();
             }
-        }
 
-        //remove 'this' dialog from the dialogs array
-        dialogs = _.reject(dialogs, function (i) { return i === dialog; });
+            dialog.scope.$destroy();
+
+            //we need to do more than just remove the element, this will not destroy the
+            // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
+            // take care of this ourselves we have memory leaks.
+            dialog.element.remove();
+
+            //remove 'this' dialog from the dialogs array
+            dialogs = _.reject(dialogs, function (i) { return i === dialog; });
+        }
     }
 
     /** Internal method that handles opening all dialogs */
@@ -93,17 +83,17 @@ angular.module('umbraco.services')
             template: "views/common/notfound.html",
             callback: undefined,
             closeCallback: undefined,
-            element: undefined,          
+            element: undefined,
             // It will set this value as a property on the dialog controller's scope as dialogData,
-            // used to pass in custom data to the dialog controller's $scope. Though this is near identical to 
-            // the dialogOptions property that is also set the the dialog controller's $scope object. 
+            // used to pass in custom data to the dialog controller's $scope. Though this is near identical to
+            // the dialogOptions property that is also set the the dialog controller's $scope object.
             // So there's basically 2 ways of doing the same thing which we're now stuck with and in fact
             // dialogData has another specially attached property called .selection which gets used.
             dialogData: undefined
         };
 
         var dialog = angular.extend(defaults, options);
-        
+
         //NOTE: People should NOT pass in a scope object that is legacy functoinality and causes problems. We will ALWAYS
         // destroy the scope when the dialog is closed regardless if it is in use elsewhere which is why it shouldn't be done.
         var scope = options.scope || $rootScope.$new();
@@ -156,7 +146,7 @@ angular.module('umbraco.services')
 
             dialog.element.css("width", dialog.width);
 
-            //Autoshow 
+            //Autoshow
             if (dialog.show) {
                 dialog.element.modal('show');
             }
@@ -167,7 +157,7 @@ angular.module('umbraco.services')
         else {
 
             //We need to load the template with an httpget and once it's loaded we'll compile and assign the result to the container
-            // object. However since the result could be a promise or just data we need to use a $q.when. We still need to return the 
+            // object. However since the result could be a promise or just data we need to use a $q.when. We still need to return the
             // $modal object so we'll actually return the modal object synchronously without waiting for the promise. Otherwise this openDialog
             // method will always need to return a promise which gets nasty because of promises in promises plus the result just needs a reference
             // to the $modal object which will not change (only it's contents will change).
@@ -177,7 +167,7 @@ angular.module('umbraco.services')
                     // Build modal object
                     dialog.element.html(template);
 
-                    //append to body or other container element  
+                    //append to body or other container element
                     dialog.container.append(dialog.element);
 
                     // Compile modal content
@@ -224,8 +214,8 @@ angular.module('umbraco.services')
                     scope.close = function (data) {
                         dialog.close(data);
                     };
-                    
-                    //NOTE: This can ONLY ever be used to show the dialog if dialog.show is false (autoshow). 
+
+                    //NOTE: This can ONLY ever be used to show the dialog if dialog.show is false (autoshow).
                     // You CANNOT call show() after you call hide(). hide = close, they are the same thing and once
                     // a dialog is closed it's resources are disposed of.
                     scope.show = function () {
@@ -237,7 +227,7 @@ angular.module('umbraco.services')
                             //just show normally
                             dialog.element.modal('show');
                         }
-                        
+
                     };
 
                     scope.select = function (item) {
@@ -266,11 +256,11 @@ angular.module('umbraco.services')
 
                     dialog.scope = scope;
 
-                    //Autoshow 
+                    //Autoshow
                     if (dialog.show) {
                         scope.show();
                     }
-                    
+
                 });
 
             //Return the modal object outside of the promise!
@@ -368,7 +358,7 @@ angular.module('umbraco.services')
          * @param {Function} options.callback callback function
          * @returns {Object} modal object
          */
-        contentPicker: function (options) {           
+        contentPicker: function (options) {
 
             options.treeAlias = "content";
             options.section = "content";
@@ -424,7 +414,7 @@ angular.module('umbraco.services')
          * @returns {Object} modal object
          */
         memberPicker: function (options) {
-            
+
             options.treeAlias = "member";
             options.section = "member";
 
@@ -511,7 +501,7 @@ angular.module('umbraco.services')
         * @name umbraco.services.dialogService#embedDialog
         * @methodOf umbraco.services.dialogService
         * @description
-        * Opens a dialog to an embed dialog 
+        * Opens a dialog to an embed dialog
         */
         embedDialog: function (options) {
             options.template = 'views/common/dialogs/rteembed.html';
@@ -546,4 +536,4 @@ angular.module('umbraco.services')
             return openDialog(options);
         }
     };
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index f404419340..11c62f1aec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -2,14 +2,14 @@
  * @ngdoc service
  * @name umbraco.services.navigationService
  *
- * @requires $rootScope 
+ * @requires $rootScope
  * @requires $routeParams
  * @requires $log
  * @requires $location
  * @requires dialogService
  * @requires treeService
  * @requires sectionResource
- *	
+ *
  * @description
  * Service to handle the main application navigation. Responsible for invoking the tree
  * Section navigation and search, and maintain their state for the entire application lifetime
@@ -17,10 +17,10 @@
  */
 function navigationService($rootScope, $routeParams, $log, $location, $q, $timeout, $injector, dialogService, umbModelMapper, treeService, notificationsService, historyService, appState, angularHelper) {
 
-    
+
     //used to track the current dialog object
     var currentDialog = null;
-    
+
     //the main tree event handler, which gets assigned via the setupTreeEvents method
     var mainTreeEventHandler = null;
     //tracks the user profile dialog
@@ -35,8 +35,8 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             appState.setMenuState("showMenuDialog", false);
             appState.setGlobalState("stickyNavigation", false);
             appState.setGlobalState("showTray", false);
-            
-            //$("#search-form input").focus();    
+
+            //$("#search-form input").focus();
             break;
         case 'menu':
             appState.setGlobalState("navMode", "menu");
@@ -87,7 +87,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
         /** initializes the navigation service */
         init: function() {
 
-            //keep track of the current section - initially this will always be undefined so 
+            //keep track of the current section - initially this will always be undefined so
             // no point in setting it now until it changes.
             $rootScope.$watch(function () {
                 return $routeParams.section;
@@ -95,7 +95,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 appState.setSectionState("currentSection", newVal);
             });
 
-            
+
         },
 
         /**
@@ -107,7 +107,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
          * Shows the legacy iframe and loads in the content based on the source url
          * @param {String} source The URL to load into the iframe
          */
-        loadLegacyIFrame: function (source) {            
+        loadLegacyIFrame: function (source) {
             $location.path("/" + appState.getSectionState("currentSection") + "/framed/" + encodeURIComponent(source));
         },
 
@@ -149,7 +149,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
         showTree: function (sectionAlias, syncArgs) {
             if (sectionAlias !== appState.getSectionState("currentSection")) {
                 appState.setSectionState("currentSection", sectionAlias);
-                
+
                 if (syncArgs) {
                     this.syncTree(syncArgs);
                 }
@@ -165,7 +165,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             appState.setGlobalState("showTray", false);
         },
 
-        /** 
+        /**
             Called to assign the main tree event handler - this is called by the navigation controller.
             TODO: Potentially another dev could call this which would kind of mung the whole app so potentially there's a better way.
         */
@@ -179,7 +179,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 
             //when a tree node is synced this event will fire, this allows us to set the currentNode
             mainTreeEventHandler.bind("treeSynced", function (ev, args) {
-                
+
                 if (args.activate === undefined || args.activate === true) {
                     //set the current selected node
                     appState.setTreeState("selectedNode", args.node);
@@ -196,7 +196,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 
                 //Set the current action node (this is not the same as the current selected node!)
                 appState.setMenuState("currentNode", args.node);
-                
+
                 if (args.event && args.event.altKey) {
                     args.skipDefault = true;
                 }
@@ -220,7 +220,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 ev.preventDefault();
 
                 if (n.metaData && n.metaData["jsClickCallback"] && angular.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") {
-                    //this is a legacy tree node!                
+                    //this is a legacy tree node!
                     var jsPrefix = "javascript:";
                     var js;
                     if (n.metaData["jsClickCallback"].startsWith(jsPrefix)) {
@@ -243,7 +243,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 else if (n.routePath) {
                     //add action to the history service
                     historyService.add({ name: n.name, link: n.routePath, icon: n.icon });
-                    
+
                     //put this node into the tree state
                     appState.setTreeState("selectedNode", args.node);
                     //when a node is clicked we also need to set the active menu node to this node
@@ -269,7 +269,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
          * The path format is: ["itemId","itemId"], and so on
          * so to sync to a specific document type node do:
          * <pre>
-         * navigationService.syncTree({tree: 'content', path: ["-1","123d"], forceReload: true});  
+         * navigationService.syncTree({tree: 'content', path: ["-1","123d"], forceReload: true});
          * </pre>
          * @param {Object} args arguments passed to the function
          * @param {String} args.tree the tree alias to sync to
@@ -287,7 +287,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             if (!args.tree) {
                 throw "args.tree cannot be null";
             }
-            
+
             if (mainTreeEventHandler) {
                 //returns a promise
                 return mainTreeEventHandler.syncTree(args);
@@ -297,8 +297,8 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             return angularHelper.rejectedPromise();
         },
 
-        /** 
-            Internal method that should ONLY be used by the legacy API wrapper, the legacy API used to 
+        /**
+            Internal method that should ONLY be used by the legacy API wrapper, the legacy API used to
             have to set an active tree and then sync, the new API does this in one method by using syncTree
         */
         _syncPath: function(path, forceReload) {
@@ -322,8 +322,8 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             }
         },
 
-        /** 
-            Internal method that should ONLY be used by the legacy API wrapper, the legacy API used to 
+        /**
+            Internal method that should ONLY be used by the legacy API wrapper, the legacy API used to
             have to set an active tree and then sync, the new API does this in one method by using syncTreePath
         */
         _setActiveTreeType: function (treeAlias, loadChildren) {
@@ -331,7 +331,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 mainTreeEventHandler._setActiveTreeType(treeAlias, loadChildren);
             }
         },
-        
+
         /**
          * @ngdoc method
          * @name umbraco.services.navigationService#hideTree
@@ -356,7 +356,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
          * @methodOf umbraco.services.navigationService
          *
          * @description
-         * Hides the tree by hiding the containing dom element. 
+         * Hides the tree by hiding the containing dom element.
          * This always returns a promise!
          *
          * @param {Event} event the click event triggering the method, passed from the DOM element
@@ -382,7 +382,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 
                             //NOTE: This is assigning the current action node - this is not the same as the currently selected node!
                             appState.setMenuState("currentNode", args.node);
-                            
+
                             //ensure the current dialog is cleared before creating another!
                             if (currentDialog) {
                                 dialogService.close(currentDialog);
@@ -400,13 +400,13 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                         }
                     }
 
-                    //there is no default or we couldn't find one so just continue showing the menu                    
+                    //there is no default or we couldn't find one so just continue showing the menu
 
                     setMode("menu");
 
                     appState.setMenuState("currentNode", args.node);
                     appState.setMenuState("menuActions", data.menuItems);
-                    appState.setMenuState("dialogTitle", args.node.name);                    
+                    appState.setMenuState("dialogTitle", args.node.name);
 
                     //we're not opening a dialog, return null.
                     deferred.resolve(null);
@@ -437,7 +437,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 throw "action cannot be null";
             }
             if (!node) {
-                throw "node cannot be null";                
+                throw "node cannot be null";
             }
             if (!section) {
                 throw "section cannot be null";
@@ -456,9 +456,9 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 var menuAction = action.metaData["jsAction"].split('.');
                 if (menuAction.length !== 2) {
 
-                    //if it is not two parts long then this most likely means that it's a legacy action                         
+                    //if it is not two parts long then this most likely means that it's a legacy action
                     var js = action.metaData["jsAction"].replace("javascript:", "");
-                    //there's not really a different way to acheive this except for eval 
+                    //there's not really a different way to acheive this except for eval
                     eval(js);
                 }
                 else {
@@ -551,7 +551,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                 modalClass: "umb-modal-left",
                 show: true
             });
-            
+
             return service.helpDialog;
         },
 
@@ -564,13 +564,13 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
          * Opens a dialog, for a given action on a given tree node
          * uses the dialogService to inject the selected action dialog
          * into #dialog div.umb-panel-body
-         * the path to the dialog view is determined by: 
+         * the path to the dialog view is determined by:
          * "views/" + current tree + "/" + action alias + ".html"
          * The dialog controller will get passed a scope object that is created here with the properties:
          *  scope.currentNode = the selected tree node
          *  scope.currentAction = the selected menu item
          *  so that the dialog controllers can use these properties
-         * 
+         *
          * @param {Object} args arguments passed to the function
          * @param {Scope} args.scope current scope passed to the dialog
          * @param {Object} args.action the clicked action containing `name` and `alias`
@@ -590,6 +590,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             //ensure the current dialog is cleared before creating another!
             if (currentDialog) {
                 dialogService.close(currentDialog);
+                currentDialog = null;
             }
 
             setMode("dialog");
@@ -649,14 +650,14 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             }
 
             //TODO: some action's want to launch a new window like live editing, we support this in the menu item's metadata with
-            // a key called: "actionUrlMethod" which can be set to either: Dialog, BlankWindow. Normally this is always set to Dialog 
-            // if a URL is specified in the "actionUrl" metadata. For now I'm not going to implement launching in a blank window, 
+            // a key called: "actionUrlMethod" which can be set to either: Dialog, BlankWindow. Normally this is always set to Dialog
+            // if a URL is specified in the "actionUrl" metadata. For now I'm not going to implement launching in a blank window,
             // though would be v-easy, just not sure we want to ever support that?
 
             var dialog = dialogService.open(
                 {
                     container: $("#dialog div.umb-modalcolumn-body"),
-                    //The ONLY reason we're passing in scope to the dialogService (which is legacy functionality) is 
+                    //The ONLY reason we're passing in scope to the dialogService (which is legacy functionality) is
                     // for backwards compatibility since many dialogs require $scope.currentNode or $scope.currentAction
                     // to exist
                     scope: dialogScope,
@@ -685,9 +686,9 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 	     * hides the currently open dialog
 	     */
         hideDialog: function (showMenu) {
-            
+
             setMode("default");
-          
+
             if(showMenu){
                 this.showMenu(undefined, { skipDefault: true, node: appState.getMenuState("currentNode") });
             }

From 9e94f326aa2a390f98b6c2c56d666ca531f95d86 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Thu, 8 Oct 2015 15:46:08 +0200
Subject: [PATCH 19/36] Removes static text from doctype delete

---
 .../src/views/documenttypes/delete.html                     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
index 357780473b..6a33565ec8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
@@ -6,14 +6,14 @@
         </p>
 
         <p>
-        	<i class="icon-alert red"></i> <strong class="red">2345 Documents</strong> will be deleted permanently if you delete this document type,
-        	please confirm you want to delete these as well.
+        	<i class="icon-alert red"></i> <strong class="red">All Documents</strong>
+            using this document type will be deleted permanently, please confirm you want to delete these as well.
         </p>
 
         <hr />
 
         <label class="checkbox">
-        		<input type="checkbox" ng-model="confirmed" /> Delete all 2345 documents using {{currentNode.name}}
+        		<input type="checkbox" ng-model="confirmed" /> Delete {{currentNode.name}} and all documents using this type
         </label>
 
         <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">

From 67bdcfedf1ac9d322469e0a32bd400c5529ff019 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Fri, 9 Oct 2015 08:53:37 +0200
Subject: [PATCH 20/36] Membertype view path incorrect

---
 .../src/views/membertypes/edit.controller.js                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
index 1f36c0c13b..499650c9c5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
@@ -18,13 +18,13 @@
 		vm.currentNode = null;
 		vm.contentType = {};
 		vm.page = {};
-      vm.page.loading = false;
-      vm.page.saveButtonState = "init";
+        vm.page.loading = false;
+        vm.page.saveButtonState = "init";
 		vm.page.navigation = [
 			{
 				"name": "Design",
 				"icon": "icon-document-dashed-line",
-				"view": "views/membertype/views/design/design.html",
+				"view": "views/membertypes/views/design/design.html",
 				"active": true
 			}
 		];

From fc06bbf116a802fd0f5303dad843f6d1a9153951 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Fri, 9 Oct 2015 08:56:11 +0200
Subject: [PATCH 21/36] Rolls back a grunt file path issue

---
 src/Umbraco.Web.UI.Client/gruntFile.js | 30 ++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index 880c1e5685..5982df7643 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -1,6 +1,6 @@
 module.exports = function (grunt) {
 
-    
+
 
     // Default task.
     grunt.registerTask('default', ['jshint:dev', 'build', 'karma:unit']);
@@ -18,7 +18,7 @@ module.exports = function (grunt) {
     grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
 
     //triggered from grunt
-    grunt.registerTask('build', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'recess:canvasdesigner', 'postcss', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
+    grunt.registerTask('build', ['concat', 'recess:build', 'recess:installer', 'recess:canvasdesigner', 'postcss', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
 
     //triggered from grunt dev vs or grunt vs
     grunt.registerTask('build-dev', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'postcss', 'bower-install-simple', 'bower', 'copy']);
@@ -92,7 +92,7 @@ module.exports = function (grunt) {
                 ' * Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n */\n',
         src: {
             js: ['src/**/*.js', 'src/*.js'],
-            
+
             common: ['src/common/**/*.js'],
             controllers: ['src/**/*.controller.js'],
 
@@ -143,17 +143,21 @@ module.exports = function (grunt) {
             vendor: {
                 files: [{ dest: '<%= distdir %>/lib', src: '**', expand: true, cwd: 'lib/' }]
             },
+
             views: {
-                files: [{ dest: '<%= distdir %>/views', src: ['**/*.*', '!**/*.controller.js'], expand: true, cwd: 'src/views/' }]
+                files: [{ dest: '<%= distdir %>/views', src: ['**/*.*', '!**/*.controller.js'], expand: true, cwd: 'src/views' }]
             },
+
             app: {
                 files: [
                     { dest: '<%= distdir %>/js', src: '*.js', expand: true, cwd: 'src/' }
                 ]
             },
+
             mocks: {
                 files: [{ dest: '<%= distdir %>/js', src: '*.js', expand: true, cwd: 'src/common/mocks/' }]
             },
+
             vs: {
                 files: [
                     //everything except the index.html root file!
@@ -197,6 +201,7 @@ module.exports = function (grunt) {
                     footer: "\n\n})();"
                 }
             },
+
             canvasdesignerJs: {
                 src: ['src/canvasdesigner/canvasdesigner.global.js', 'src/canvasdesigner/canvasdesigner.controller.js', 'src/canvasdesigner/editors/*.js', 'src/canvasdesigner/lib/*.js'],
                 dest: '<%= distdir %>/js/canvasdesigner.panel.js'
@@ -324,6 +329,18 @@ module.exports = function (grunt) {
            }
         },
 
+        ngTemplateCache: {
+            views: {
+                files: {
+                    '<%= distdir %>/js/umbraco.views.js': 'src/views/**/*.html'
+                },
+                options: {
+                    trim: 'src/',
+                    module: 'umbraco.views'
+                }
+            }
+        },
+
         watch: {
             docs: {
                 files: ['docs/src/**/*.md'],
@@ -435,7 +452,7 @@ module.exports = function (grunt) {
             }
         },
 
-        bower: {            
+        bower: {
             dev: {
                 dest: '<%= distdir %>/lib',
                 options: {
@@ -473,7 +490,7 @@ module.exports = function (grunt) {
                         },
                         'angular-dynamic-locale': {
                             files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
-                        },                        
+                        },
                         'ng-file-upload': {
                             keepExpandedHierarchy: false,
                             files: ['ng-file-upload.min.js']
@@ -530,4 +547,5 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-ngdocs');
 
     grunt.loadNpmTasks('grunt-eslint');
+    grunt.loadNpmTasks('grunt-hustler');
 };

From dee16b3b70b22e756c50514a6cf105af95d3ec32 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Fri, 9 Oct 2015 10:41:03 +0200
Subject: [PATCH 22/36] Fixed: U4-7176 Content copy should relate to original
 by default

---
 .../src/views/content/content.copy.controller.js   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
index fc3015ed09..9f2c967dfa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
@@ -7,7 +7,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	        searchText = value + "...";
 	    });
 
-	    $scope.relateToOriginal = false;
+	    $scope.relateToOriginal = true;
 	    $scope.dialogTreeEventHandler = $({});
 	    $scope.busy = false;
 	    $scope.searchInfo = {
@@ -42,7 +42,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	            $scope.target = args.node;
 	            $scope.target.selected = true;
 	        }
-	        
+
 	    }
 
 	    function nodeExpandedHandler(ev, args) {
@@ -50,7 +50,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 
 	            //iterate children
 	            _.each(args.children, function (child) {
-	                //check if any of the items are list views, if so we need to add a custom 
+	                //check if any of the items are list views, if so we need to add a custom
 	                // child: A node to activate the search
 	                if (child.metaData.isContainer) {
 	                    child.hasChildren = true;
@@ -78,18 +78,18 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	        $scope.searchInfo.results = [];
 	    }
 
-	    // method to select a search result 
+	    // method to select a search result
 	    $scope.selectResult = function (evt, result) {
 	        result.selected = result.selected === true ? false : true;
 	        nodeSelectHandler(evt, { event: evt, node: result });
 	    };
 
-	    //callback when there are search results 
+	    //callback when there are search results
 	    $scope.onSearchResults = function (results) {
 	        $scope.searchInfo.results = results;
 	        $scope.searchInfo.showSearch = true;
 	    };
-        
+
 	    $scope.copy = function () {
 
 	        $scope.busy = true;
@@ -129,4 +129,4 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
 	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
 	    });
-	});
\ No newline at end of file
+	});

From 9d220b40af601877453f461e153fa149166be703 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Fri, 9 Oct 2015 11:09:27 +0200
Subject: [PATCH 23/36] Fixed: U4-7207 Cant save partial view more then once

---
 src/Umbraco.Web/WebServices/SaveFileController.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs
index 24f6917e76..9cb26df581 100644
--- a/src/Umbraco.Web/WebServices/SaveFileController.cs
+++ b/src/Umbraco.Web/WebServices/SaveFileController.cs
@@ -104,6 +104,9 @@ namespace Umbraco.Web.WebServices
                 view.Path = filename;
             view.Content = contents;
 
+            
+
+
             Attempt<IPartialView> attempt;
             try
             {
@@ -125,7 +128,8 @@ namespace Umbraco.Web.WebServices
                                 attempt.Exception);
             }
 
-            return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader"));
+
+            return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader"), new { name = view.Name, path = view.Path });
         }
 
         /// <summary>

From fe5c5991d9dcd32831efb54e55419fbf49afbf0e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 9 Oct 2015 13:36:17 +0200
Subject: [PATCH 24/36] list view - clearfix header

---
 .../propertyeditors/listview/listview.html    | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 645c8cee8e..402746c994 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -5,44 +5,40 @@
     </div>
 
     <div class="row-fluid" ng-switch-when="false">
-        <div class="umb-sub-header">
 
-            <div class="btn-group" ng-show="listViewAllowedTypes && listViewAllowedTypes.length > 0">
-                <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                    <localize key="actions_create">Create</localize>
-                    <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu">
-                    <li ng-repeat="contentType in listViewAllowedTypes">
-                        <a href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
-                            <i class="icon-{{contentType.cssClass}}"></i>
-                            {{contentType.name}}
-                        </a>
-                    </li>
-                </ul>
-            </div>
+        <div class="umb-sub-header clearfix">
+           <div class="pull-left">
+               <div class="btn-group" ng-show="listViewAllowedTypes && listViewAllowedTypes.length > 0">
+                   <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                       <localize key="actions_create">Create</localize>
+                       <span class="caret"></span>
+                   </a>
+                   <ul class="dropdown-menu">
+                       <li ng-repeat="contentType in listViewAllowedTypes">
+                           <a href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
+                               <i class="icon-{{contentType.cssClass}}"></i>
+                               {{contentType.name}}
+                           </a>
+                       </li>
+                   </ul>
+               </div>
 
-            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed && options.allowBulkPublish">
-                <a class="btn btn-success" ng-disabled="actionInProgress" ng-click="publish()" prevent-default>
-                    <localize key="actions_publish">Publish</localize>
-                </a>
+               <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed && options.allowBulkPublish">
+                   <a class="btn btn-success" ng-disabled="actionInProgress" ng-click="publish()" prevent-default>
+                       <localize key="actions_publish">Publish</localize>
+                   </a>
+               </div>
+               <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed && options.allowBulkUnpublish">
+                   <a class="btn btn-warning" ng-disabled="actionInProgress" ng-click="unpublish()" prevent-default>
+                       <localize key="actions_unpublish">Unpublish</localize>
+                   </a>
+               </div>
+               <div class="btn-group" ng-show="isAnythingSelected()" ng-if="options.allowBulkDelete">
+                   <a class="btn btn-danger" ng-disabled="actionInProgress" ng-click="delete()" prevent-default>
+                       <localize key="actions_delete">Delete</localize>
+                   </a>
+               </div>
             </div>
-            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed && options.allowBulkUnpublish">
-                <a class="btn btn-warning" ng-disabled="actionInProgress" ng-click="unpublish()" prevent-default>
-                    <localize key="actions_unpublish">Unpublish</localize>
-                </a>
-            </div>
-            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="options.allowBulkDelete">
-                <a class="btn btn-danger" ng-disabled="actionInProgress" ng-click="delete()" prevent-default>
-                    <localize key="actions_delete">Delete</localize>
-                </a>
-            </div>
-
-            <div class="umb-loader-wrapper" ng-show="actionInProgress">
-                <div class="umb-loader"></div>
-            </div>
-
-            <span ng-bind="bulkStatus" ng-show="isAnythingSelected()" class="pull-right"></span>
 
             <div class="pull-right">
 
@@ -61,6 +57,12 @@
 
             </div>
 
+            <div class="umb-loader-wrapper" ng-show="actionInProgress">
+                <div class="umb-loader"></div>
+            </div>
+
+            <span ng-bind="bulkStatus" ng-show="isAnythingSelected()" class="pull-right"></span>
+
         </div>
 
         <div ng-include="layout.activeLayout.path"></div>

From 84e15249c710a298226ec4fa8ccb12a0e2f946bd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 9 Oct 2015 14:40:19 +0200
Subject: [PATCH 25/36] U4-7182: clear folders and media items before pushing
 new data + add watcher for updated data.

---
 .../components/umbmediagrid.directive.js      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index 6fe2a1391c..c7858df500 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -11,6 +11,9 @@
 
          function activate() {
 
+            scope.folders = [];
+            scope.mediaItems = [];
+
             for (var i = 0; scope.items.length > i; i++) {
 
                var item = scope.items[i];
@@ -23,7 +26,9 @@
 
             }
 
-            setFlexValues(scope.items);
+            if(scope.mediaItems.length > 0) {
+               setFlexValues(scope.mediaItems);
+            }
 
          }
 
@@ -76,9 +81,9 @@
 
          }
 
-         function setFlexValues(items) {
+         function setFlexValues(mediaItems) {
 
-            var flexSortArray = scope.mediaItems;
+            var flexSortArray = mediaItems;
             var smallestImageWidth = null;
             var widestImageAspectRatio = null;
 
@@ -117,7 +122,13 @@
             item.selected = !item.selected;
          };
 
-         activate();
+         var unbindItemsWatcher = scope.$watch('items', function(newValue, oldValue){
+            activate();
+         });
+
+         scope.$on('$destroy', function(){
+           unbindItemsWatcher();
+         });
 
       }
 

From e4a8804058f7545d5ed20704331454ece5c49bd1 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 9 Oct 2015 14:43:54 +0200
Subject: [PATCH 26/36] U4-7181: Add uploader to media list view

---
 .../listview/layouts/grid/grid.html           | 28 ++++++++---
 .../grid/grid.listviewlayout.controller.js    | 48 +++++++++++++++++++
 2 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
index 5dcb1f0c30..2c46da8159 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -1,8 +1,24 @@
-<div ng-if="entityType === 'media'">
+<div ng-controller="Umbraco.PropertyEditors.ListView.GridLayoutController as vm">
 
-   <umb-media-grid
-      ng-if="listViewResultSet.items"
-      items="listViewResultSet.items">
-   </umb-media-grid>
+   <div
+   ng-if="entityType === 'media'"
+   on-drag-leave="vm.dragLeave()"
+   on-drag-end="vm.dragLeave()"
+   on-drag-enter="vm.dragEnter()">
 
-<div>
+      <umb-file-dropzone
+         parent-id="{{vm.nodeId}}"
+         files-uploaded="vm.onUploadComplete"
+         accept="{{vm.acceptedFileTypes}}"
+         hide-dropzone="{{!vm.activeDrag && listViewResultSet.items.length > 0 }}"
+         compact="{{ listViewResultSet.items.length > 0 }}"
+         files-queued="vm.onFilesQueue">
+      </umb-file-dropzone>
+
+      <umb-media-grid
+         items="listViewResultSet.items">
+      </umb-media-grid>
+
+   <div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
new file mode 100644
index 0000000000..99f660017f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -0,0 +1,48 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.DocumentType.EditController
+ * @function
+ *
+ * @description
+ * The controller for the content type editor
+ */
+(function() {
+   "use strict";
+
+   function ListViewGridLayoutController($scope, $routeParams, mediaHelper) {
+
+      var vm = this;
+
+      vm.nodeId = $routeParams.id;
+      vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+      vm.activeDrag = false;
+
+      vm.dragEnter = dragEnter;
+      vm.dragLeave = dragLeave;
+		vm.onFilesQueue = onFilesQueue;
+      vm.onUploadComplete = onUploadComplete;
+
+      function dragEnter(el, event) {
+         vm.activeDrag = true;
+      }
+
+      function dragLeave(el, event) {
+         vm.activeDrag = false;
+      }
+
+		function onFilesQueue() {
+			vm.activeDrag = false;
+		}
+
+      function onUploadComplete() {
+
+			// call reload function on list view parent controller
+         $scope.reloadView($scope.contentId);
+
+      }
+
+   }
+
+   angular.module("umbraco").controller("Umbraco.PropertyEditors.ListView.GridLayoutController", ListViewGridLayoutController);
+
+})();

From 9297b2753609821f96ff3b104cfbcac944b9996e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 13 Oct 2015 09:15:39 +0200
Subject: [PATCH 27/36] fix paths on document types and member types views

---
 .../src/views/documenttypes/edit.controller.js            | 8 ++++----
 .../src/views/mediatypes/edit.controller.js               | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index ba0ad1a3a3..64157d3183 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -24,23 +24,23 @@
 			{
 				"name": "Design",
 				"icon": "icon-document-dashed-line",
-				"view": "views/documentType/views/design/design.html",
+				"view": "views/documenttypes/views/design/design.html",
 				"active": true
 			},
 			{
 				"name": "List view",
 				"icon": "icon-list",
-				"view": "views/documentType/views/listview/listview.html"
+				"view": "views/documenttypes/views/listview/listview.html"
 			},
 			{
 				"name": "Permissions",
 				"icon": "icon-keychain",
-				"view": "views/documentType/views/permissions/permissions.html"
+				"view": "views/documenttypes/views/permissions/permissions.html"
 			},
 			{
 				"name": "Templates",
 				"icon": "icon-layout",
-				"view": "views/documentType/views/templates/templates.html"
+				"view": "views/documenttypes/views/templates/templates.html"
 			}
 		];
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index 4292295438..c872c593d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -24,18 +24,18 @@
 			{
 				"name": "Design",
 				"icon": "icon-document-dashed-line",
-				"view": "views/mediaType/views/design/design.html",
+				"view": "views/mediatypes/views/design/design.html",
 				"active": true
 			},
 			{
 				"name": "List view",
 				"icon": "icon-list",
-				"view": "views/mediaType/views/listview/listview.html"
+				"view": "views/mediatypes/views/listview/listview.html"
 			},
 			{
 				"name": "Permissions",
 				"icon": "icon-keychain",
-				"view": "views/mediaType/views/permissions/permissions.html"
+				"view": "views/mediatypes/views/permissions/permissions.html"
 			}
 		];
 

From 5709a41ee0c04beed91959856160d4737da83378 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 13 Oct 2015 09:56:04 +0200
Subject: [PATCH 28/36] Fixed: U4-7172 When a locked field is unlock, focus and
 select value

---
 .../src/common/directives/components/umblockedfield.directive.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
index bd4279a161..d5a9e34ac7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
@@ -49,6 +49,7 @@
 
 				$timeout(function() {
 					input.focus();
+					input.select();
 					input.on("blur", onBlurHandler);
 				});
 

From 7135f9a268f940e887e89dea5de341129cb60bcb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 13 Oct 2015 13:12:28 +0200
Subject: [PATCH 29/36] Removes message that is no longer correct

---
 build/NuSpecs/tools/ReadmeUpgrade.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt
index 29aa41b55a..894f5e5f93 100644
--- a/build/NuSpecs/tools/ReadmeUpgrade.txt
+++ b/build/NuSpecs/tools/ReadmeUpgrade.txt
@@ -10,9 +10,6 @@
 
 Don't forget to build!
 
-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
-file (and config files in the config folder). 
-
 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
 

From 4142f478610242dc7a85a4cde98cf422f2e21c9b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 13 Oct 2015 13:48:58 +0200
Subject: [PATCH 30/36] U4-6125 Installing MySQL Web Provider Breaks Page
 Publishing

#U4-6125 Fixed Due in version 7.3.1
---
 build/NuSpecs/tools/Web.config.install.xdt | 5 +++++
 src/Umbraco.Web.UI/web.Template.config     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index c6a55cc981..df13aa3dec 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -48,6 +48,11 @@
   <system.web xdt:Transform="InsertIfMissing" />
   <system.web>
     <siteMap xdt:Transform="Remove" />
+	<siteMap xdt:Transform="Insert">
+      <providers xdt:Transform="Insert">
+        <remove name="MySqlSiteMapProvider"  xdt:Transform="Insert" />
+      </providers>
+      </siteMap>	
     <httpRuntime xdt:Transform="InsertIfMissing" />
     <httpRuntime targetFramework="4.5" xdt:Transform="SetAttributes(targetFramework)" />
     <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 221aecfbd0..924a5436f8 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -150,6 +150,11 @@
         <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
       </providers>
     </roleManager>
+    <siteMap>
+      <providers>
+        <remove name="MySqlSiteMapProvider" />
+      </providers>
+      </siteMap>
   </system.web>
 
   <system.webServer>

From dda247fea571a40530461b85d4a25db5edac8214 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sat, 26 Sep 2015 22:41:56 +0200
Subject: [PATCH 31/36] Implemented decimal property editor

---
 src/Umbraco.Core/Constants-PropertyEditors.cs |  5 ++
 src/Umbraco.Core/CoreBootManager.cs           |  1 +
 .../Models/DataTypeDatabaseType.cs            |  4 +-
 src/Umbraco.Core/Models/PropertyType.cs       |  3 +
 .../Models/Rdbms/PropertyDataDto.cs           | 17 ++++--
 .../Persistence/Factories/PropertyFactory.cs  | 14 ++++-
 .../PropertyEditors/DecimalValidator.cs       | 30 ++++++++++
 .../PropertyEditors/PropertyValueEditor.cs    | 10 ++++
 .../ValueConverters/DecimalValueConverter.cs  | 31 ++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +
 .../src/views/prevalueeditors/decimal.html    | 11 ++++
 .../src/views/prevalueeditors/number.html     |  2 +-
 .../propertyeditors/decimal/decimal.html      |  9 +++
 .../propertyeditors/integer/integer.html      |  1 -
 .../PropertyEditors/DecimalPropertyEditor.cs  | 57 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 16 files changed, 190 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Core/PropertyEditors/DecimalValidator.cs
 create mode 100644 src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
 create mode 100644 src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index a719e845b1..1a1eda2ae2 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -158,6 +158,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string IntegerAlias = "Umbraco.Integer";
 
+            /// <summary>
+            /// Alias for the Decimal datatype.
+            /// </summary>
+            public const string DecimalAlias = "Umbraco.Decimal";
+
             /// <summary>
             /// Alias for the listview datatype.
             /// </summary>
diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index b4e3d06273..49829513bb 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -431,6 +431,7 @@ namespace Umbraco.Core
                     new Lazy<Type>(() => typeof (DelimitedManifestValueValidator)),
                     new Lazy<Type>(() => typeof (EmailValidator)),
                     new Lazy<Type>(() => typeof (IntegerValidator)),
+                    new Lazy<Type>(() => typeof (DecimalValidator)),
                 });
 
             //by default we'll use the db server registrar unless the developer has the legacy
diff --git a/src/Umbraco.Core/Models/DataTypeDatabaseType.cs b/src/Umbraco.Core/Models/DataTypeDatabaseType.cs
index e45cdd1a73..1db8ac65cb 100644
--- a/src/Umbraco.Core/Models/DataTypeDatabaseType.cs
+++ b/src/Umbraco.Core/Models/DataTypeDatabaseType.cs
@@ -21,6 +21,8 @@ namespace Umbraco.Core.Models
         [EnumMember]
         Integer,
         [EnumMember]
-        Date
+        Date,
+        [EnumMember]
+        Decimal
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 239792bf08..69c714c85a 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -402,6 +402,9 @@ namespace Umbraco.Core.Models
                 if (DataTypeDatabaseType == DataTypeDatabaseType.Integer && type == typeof(int))
                     return true;
 
+                if (DataTypeDatabaseType == DataTypeDatabaseType.Decimal && type == typeof(decimal))
+                    return true;
+
                 if (DataTypeDatabaseType == DataTypeDatabaseType.Date && type == typeof(DateTime))
                     return true;
 
diff --git a/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs b/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs
index 4e59f0275b..63e3104d12 100644
--- a/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs
@@ -33,6 +33,10 @@ namespace Umbraco.Core.Models.Rdbms
         [NullSetting(NullSetting = NullSettings.Null)]
         public int? Integer { get; set; }
 
+        [Column("dataDecimal")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public decimal? Decimal { get; set; }
+
         [Column("dataDate")]
         [NullSetting(NullSetting = NullSettings.Null)]
         public DateTime? Date { get; set; }
@@ -55,22 +59,27 @@ namespace Umbraco.Core.Models.Rdbms
         {
             get
             {
-                if(Integer.HasValue)
+                if (Integer.HasValue)
                 {
                     return Integer.Value;
                 }
+
+                if (Decimal.HasValue)
+                {
+                    return Decimal.Value;
+                }
                 
-                if(Date.HasValue)
+                if (Date.HasValue)
                 {
                     return Date.Value;
                 }
                 
-                if(string.IsNullOrEmpty(VarChar) == false)
+                if (string.IsNullOrEmpty(VarChar) == false)
                 {
                     return VarChar;
                 }
 
-                if(string.IsNullOrEmpty(Text) == false)
+                if (string.IsNullOrEmpty(Text) == false)
                 {
                     return Text;
                 }
diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index 4e3653bf9e..8d51b627ea 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -63,7 +63,9 @@ namespace Umbraco.Core.Persistence.Factories
 
                 //Check if property has an Id and set it, so that it can be updated if it already exists
                 if (property.HasIdentity)
+                {
                     dto.Id = property.Id;
+                }
 
                 if (property.DataTypeDatabaseType == DataTypeDatabaseType.Integer)
                 {
@@ -82,11 +84,21 @@ namespace Umbraco.Core.Persistence.Factories
                         }
                     }
                 }
+                else if (property.DataTypeDatabaseType == DataTypeDatabaseType.Decimal && property.Value != null)
+                {
+                    decimal val;
+                    if (decimal.TryParse(property.Value.ToString(), out val))
+                    {
+                        dto.Decimal = val;
+                    }
+                }
                 else if (property.DataTypeDatabaseType == DataTypeDatabaseType.Date && property.Value != null && string.IsNullOrWhiteSpace(property.Value.ToString()) == false)
                 {
                     DateTime date;
-                    if(DateTime.TryParse(property.Value.ToString(), out date))
+                    if (DateTime.TryParse(property.Value.ToString(), out date))
+                    {
                         dto.Date = date;
+                    }
                 }
                 else if (property.DataTypeDatabaseType == DataTypeDatabaseType.Ntext && property.Value != null)
                 {
diff --git a/src/Umbraco.Core/PropertyEditors/DecimalValidator.cs b/src/Umbraco.Core/PropertyEditors/DecimalValidator.cs
new file mode 100644
index 0000000000..632821bc24
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/DecimalValidator.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// A validator that validates that the value is a valid decimal
+    /// </summary>
+    [ValueValidator("Decimal")]
+    internal sealed class DecimalValidator : ManifestValueValidator, IPropertyValidator
+    {
+        public override IEnumerable<ValidationResult> Validate(object value, string config, PreValueCollection preValues, PropertyEditor editor)
+        {
+            if (value != null && value.ToString() != string.Empty)
+            {
+                var result = value.TryConvertTo<decimal>();
+                if (result.Success == false)
+                {
+                    yield return new ValidationResult("The value " + value + " is not a valid decimal", new[] { "value" });
+                }
+            }
+        }
+
+        public IEnumerable<ValidationResult> Validate(object value, PreValueCollection preValues, PropertyEditor editor)
+        {
+            return Validate(value, "", preValues, editor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
index 8b00164059..3ddc557693 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
@@ -133,6 +133,8 @@ namespace Umbraco.Core.PropertyEditors
                 case "INT":
                 case "INTEGER":
                     return DataTypeDatabaseType.Integer;
+                case "DECIMAL":
+                    return DataTypeDatabaseType.Decimal;
                 case "STRING":
                     return DataTypeDatabaseType.Nvarchar;
                 case "TEXT":
@@ -202,6 +204,11 @@ namespace Umbraco.Core.PropertyEditors
                         ? Attempt<object>.Succeed((int)(long)result.Result) 
                         : result;
 
+                case DataTypeDatabaseType.Decimal:
+                    //ensure these are nullable so we can return a null if required
+                    valueType = typeof(decimal?);
+                    break;
+
                 case DataTypeDatabaseType.Date:
                     //ensure these are nullable so we can return a null if required
                     valueType = typeof(DateTime?);
@@ -283,6 +290,7 @@ namespace Umbraco.Core.PropertyEditors
                     }
                     return property.Value.ToString();
                 case DataTypeDatabaseType.Integer:
+                case DataTypeDatabaseType.Decimal:
                     //we can just ToString() any of these types
                     return property.Value.ToString();
                 case DataTypeDatabaseType.Date:
@@ -325,6 +333,7 @@ namespace Umbraco.Core.PropertyEditors
             {
                 case DataTypeDatabaseType.Date:
                 case DataTypeDatabaseType.Integer:
+                case DataTypeDatabaseType.Decimal:
                     return new XText(ConvertDbToString(property, propertyType, dataTypeService));                    
                 case DataTypeDatabaseType.Nvarchar:
                 case DataTypeDatabaseType.Ntext:
@@ -354,6 +363,7 @@ namespace Umbraco.Core.PropertyEditors
                     property.Value.ToXmlString<string>();
                     return property.Value.ToXmlString<string>();
                 case DataTypeDatabaseType.Integer:
+                case DataTypeDatabaseType.Decimal:
                     return property.Value.ToXmlString(property.Value.GetType());                
                 case DataTypeDatabaseType.Date:
                     //treat dates differently, output the format as xml format
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
new file mode 100644
index 0000000000..32fe356764
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
@@ -0,0 +1,31 @@
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Core.PropertyEditors.ValueConverters
+{
+    [PropertyValueType(typeof(decimal))]
+    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    public class DecimalValueConverter : PropertyValueConverterBase
+    {
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            return Constants.PropertyEditors.DecimalAlias.Equals(propertyType.PropertyEditorAlias);
+        }
+
+        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            if (source == null) return 0M;
+
+            // in XML a decimal is a string
+            var sourceString = source as string;
+            if (sourceString != null)
+            {
+                decimal d;
+                return (decimal.TryParse(sourceString, out d)) ? d : 0M;
+            }
+
+            // in the database an a decimal is an a decimal 
+            // default value is zero
+            return (source is decimal) ? source : 0M;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 15e00bcb8f..ae3ca88db1 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -456,7 +456,9 @@
     <Compile Include="Persistence\Repositories\RepositoryCacheOptions.cs" />
     <Compile Include="Persistence\Repositories\TaskRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskTypeRepository.cs" />
+    <Compile Include="PropertyEditors\DecimalValidator.cs" />
     <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\DecimalValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />
     <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html
new file mode 100644
index 0000000000..c4e4c95e39
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html
@@ -0,0 +1,11 @@
+<div>
+    <input name="decimalField" class="umb-editor umb-number" 
+           type="number" 
+           ng-model="model.value"
+           val-server="value"
+           fix-number />
+
+    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number">Not a number</span>
+    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
+    
+</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html
index 6d7b8c4c78..e7490e2703 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html
@@ -3,7 +3,7 @@
            type="number" 
            ng-model="model.value"
            val-server="value"
-            fix-number />
+           fix-number />
 
     <span class="help-inline" val-msg-for="numberField" val-toggle-msg="number">Not a number</span>
     <span class="help-inline" val-msg-for="numberField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
new file mode 100644
index 0000000000..823a7b40ad
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -0,0 +1,9 @@
+<div class="umb-editor">
+    <input name="decimalField" type="number" class="umb-editor umb-number"
+        ng-model="model.value"
+        val-server="value"
+        fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
+    
+    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number">Not a number</span>
+    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
+</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 251a6066d8..28a81b035f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -6,5 +6,4 @@
     
     <span class="help-inline" val-msg-for="integerField" val-toggle-msg="number">Not a number</span>
     <span class="help-inline" val-msg-for="integerField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
-    
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
new file mode 100644
index 0000000000..f636e8cdb2
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
@@ -0,0 +1,57 @@
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    [PropertyEditor(Constants.PropertyEditors.DecimalAlias, "Decimal", "decimal", "decimal", IsParameterEditor = true)]
+    public class DecimalPropertyEditor : PropertyEditor
+    {
+        /// <summary>
+        /// Overridden to ensure that the value is validated
+        /// </summary>
+        /// <returns></returns>
+        protected override PropertyValueEditor CreateValueEditor()
+        {
+            var editor = base.CreateValueEditor();
+            editor.Validators.Add(new DecimalValidator());
+            return editor;
+        }
+        
+        protected override PreValueEditor CreatePreValueEditor()
+        {
+            return new DecimalPreValueEditor();
+        }
+
+        /// <summary>
+        /// A custom pre-value editor class to deal with the legacy way that the pre-value data is stored.
+        /// </summary>
+        internal class DecimalPreValueEditor : PreValueEditor
+        {
+            public DecimalPreValueEditor()
+            {
+                //create the fields
+                Fields.Add(new PreValueField(new DecimalValidator())
+                {
+                    Description = "Enter the minimum amount of number to be entered",
+                    Key = "min",
+                    View = "decimal",
+                    Name = "Minimum"
+                });
+                Fields.Add(new PreValueField(new DecimalValidator())
+                {
+                    Description = "Enter the intervals amount between each step of number to be entered",
+                    Key = "step",
+                    View = "decimal",
+                    Name = "Step Size"
+                });
+                Fields.Add(new PreValueField(new DecimalValidator())
+                {
+                    Description = "Enter the maximum amount of number to be entered",
+                    Key = "max",
+                    View = "decimal",
+                    Name = "Maximum"
+                });
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f8744e58c2..07c378714b 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -307,6 +307,7 @@
     <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
     <Compile Include="Models\PublishedContentWithKeyBase.cs" />
     <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
+    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
     <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />

From b48b18ec8a3b5d58c8d7d8362c45d1bd90323162 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sat, 26 Sep 2015 22:46:47 +0200
Subject: [PATCH 32/36] Added migration for 7.4.0 for additional column
 required for decimal property editor

---
 .../AddDataDecimalColumn.cs                   | 29 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs

diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs
new file mode 100644
index 0000000000..f238c1ac24
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs
@@ -0,0 +1,29 @@
+using System.Linq;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFourZero
+{
+    [Migration("7.4.0", 1, GlobalSettings.UmbracoMigrationName)]
+    public class AddDataDecimalColumn : MigrationBase
+    {
+        public AddDataDecimalColumn(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            //Don't exeucte if the column is already there
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
+
+            if (columns.Any(x => x.TableName.InvariantEquals("cmsPropertyData") && x.ColumnName.InvariantEquals("dataDecimal")) == false)
+                Create.Column("dataDecimal").OnTable("cmsPropertyData").AsDecimal(18, 9).Nullable();
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ae3ca88db1..a0999741ee 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -405,6 +405,7 @@
     <Compile Include="Persistence\Mappers\AccessMapper.cs" />
     <Compile Include="Persistence\Mappers\DomainMapper.cs" />
     <Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFourZero\AddDataDecimalColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\AddExternalLoginsTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\AddForeignKeysForLanguageAndDictionaryTables.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\AddServerRegistrationColumnsAndLock.cs" />

From 09ec87c1c799ddbbb060fab6159efc770d667269 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sun, 27 Sep 2015 07:44:57 +0200
Subject: [PATCH 33/36] Added unit tests for decimal conversion in property
 editor value editors

---
 .../PropertyEditorValueEditorTests.cs         | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
index 9ab275e5fb..7bf8f1dd30 100644
--- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
@@ -5,12 +5,29 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.PropertyEditors
 {
     [TestFixture]
     public class PropertyEditorValueEditorTests
     {
+        [SetUp]
+        public virtual void TestSetup()
+        {
+            ShortStringHelperResolver.Current = new ShortStringHelperResolver(new DefaultShortStringHelper(SettingsForTests.GetDefault()));
+            Resolution.Freeze();
+        }
+
+        [TearDown]
+        public virtual void TestTearDown()
+        {
+            ResolverCollection.ResetAll();
+            Resolution.Reset();
+        }
+
         [TestCase("{prop1: 'val1', prop2: 'val2'}", true)]
         [TestCase("{1,2,3,4}", false)]
         [TestCase("[1,2,3,4]", true)]
@@ -46,6 +63,47 @@ namespace Umbraco.Tests.PropertyEditors
             Assert.AreEqual(expected, result.Result);
         }
 
+        // The following decimal tests have not been added as [TestCase]s
+        // as the decimal type cannot be used as an attribute parameter
+        [Test]
+        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type()
+        {
+            var valueEditor = new PropertyValueEditor
+            {
+                ValueType = "DECIMAL"
+            };
+
+            var result = valueEditor.TryConvertValueToCrlType("12.34");
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(12.34M, result.Result);
+        }
+
+        [Test]
+        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Other_Separator()
+        {
+            var valueEditor = new PropertyValueEditor
+            {
+                ValueType = "DECIMAL"
+            };
+
+            var result = valueEditor.TryConvertValueToCrlType("12,34");
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(12.34M, result.Result);
+        }
+
+        [Test]
+        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Empty_String()
+        {
+            var valueEditor = new PropertyValueEditor
+            {
+                ValueType = "DECIMAL"
+            };
+
+            var result = valueEditor.TryConvertValueToCrlType(string.Empty);
+            Assert.IsTrue(result.Success);
+            Assert.IsNull(result.Result);
+        }
+        
         [Test]
         public void Value_Editor_Can_Convert_To_Date_Clr_Type()
         {
@@ -78,6 +136,35 @@ namespace Umbraco.Tests.PropertyEditors
             Assert.AreEqual(expected, result);
         }
 
+        [Test]
+        public void Value_Editor_Can_Serialize_Decimal_Value()
+        {
+            var value = 12.34M;
+            var valueEditor = new PropertyValueEditor
+                {
+                    ValueType = "DECIMAL"
+                };
+
+            var prop = new Property(1, Guid.NewGuid(), new PropertyType("test", DataTypeDatabaseType.Decimal), value);
+
+            var result = valueEditor.ConvertDbToEditor(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
+            Assert.AreEqual("12.34", result);
+        }
+
+        [Test]
+        public void Value_Editor_Can_Serialize_Decimal_Value_With_Empty_String()
+        {
+            var valueEditor = new PropertyValueEditor
+                {
+                    ValueType = "DECIMAL"
+                };
+
+            var prop = new Property(1, Guid.NewGuid(), new PropertyType("test", DataTypeDatabaseType.Decimal), string.Empty);
+
+            var result = valueEditor.ConvertDbToEditor(prop, prop.PropertyType, new Mock<IDataTypeService>().Object);
+            Assert.AreEqual(string.Empty, result);
+        }
+
         [Test]
         public void Value_Editor_Can_Serialize_Date_Value()
         {

From 7efa0bed46f0f4bf4f12962cb4a5d09b1ecab515 Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Mon, 12 Oct 2015 22:05:40 +0100
Subject: [PATCH 34/36] Added pattern to integer and decimal property editor
 views to support numeric keyboards on mobile

---
 .../src/views/propertyeditors/decimal/decimal.html    | 11 +++++++----
 .../src/views/propertyeditors/integer/integer.html    | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index 823a7b40ad..64730bbfb2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -1,8 +1,11 @@
 <div class="umb-editor">
-    <input name="decimalField" type="number" class="umb-editor umb-number"
-        ng-model="model.value"
-        val-server="value"
-        fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
+    <input name="decimalField" 
+           type="number"
+           pattern="[0-9]+([,\.][0-9]+)?"
+           class="umb-editor umb-number"
+           ng-model="model.value"
+           val-server="value"
+           fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
     
     <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number">Not a number</span>
     <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 28a81b035f..ff82be99b2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -1,8 +1,11 @@
 <div class="umb-editor">
-    <input name="integerField" type="number" class="umb-editor umb-number "
-        ng-model="model.value"
-        val-server="value"
-        fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
+    <input name="integerField"
+           type="number"
+           pattern="[0-9]*"
+           class="umb-editor umb-number "
+           ng-model="model.value"
+           val-server="value"
+           fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
     
     <span class="help-inline" val-msg-for="integerField" val-toggle-msg="number">Not a number</span>
     <span class="help-inline" val-msg-for="integerField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>

From d92af31b0a718af72496e8e241250ba66f6e0ceb Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Wed, 14 Oct 2015 09:39:25 +0200
Subject: [PATCH 35/36] Fixes: U4-7246 Integer datatype PropertyEditor is
 missing ValueType definition

---
 src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
index e93f16d7e8..7e0ac8443f 100644
--- a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [PropertyEditor(Constants.PropertyEditors.IntegerAlias, "Numeric", "integer", IsParameterEditor = true)]
+    [PropertyEditor(Constants.PropertyEditors.IntegerAlias, "Numeric", "integer", IsParameterEditor = true, ValueType = "integer")]
     public class IntegerPropertyEditor : PropertyEditor
     {
         /// <summary>

From 327a00aaf4b6f12e8221631968965dcf1db05646 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 14 Oct 2015 12:07:50 +0200
Subject: [PATCH 36/36] Fixes issue with migrations running with a Decimal
 column:

The logic would produce incorrect syntax.
Fixed the default string column for sql server, made them all consistent.
Moved ctor logic for shared sql syntax providers to the base class.
Created formatted Decimal column definitions so that a custom precision/scale works.
Set the migration to use the default precision/scale values.
Removes the pattern validators because they don't do anything... due to the fix-number directive which has it's own issues but we won't solve those now.
---
 .../AddDataDecimalColumn.cs                   |  2 +-
 .../MicrosoftSqlSyntaxProviderBase.cs         | 13 +++++++++++++
 .../SqlSyntax/MySqlSyntaxProvider.cs          |  9 ++-------
 .../SqlSyntax/SqlCeSyntaxProvider.cs          | 14 +-------------
 .../SqlSyntax/SqlServerSyntaxProvider.cs      | 14 +-------------
 .../SqlSyntax/SqlSyntaxProviderBase.cs        | 19 ++++++++++++++++++-
 .../validation/valregex.directive.js          |  2 +-
 .../propertyeditors/decimal/decimal.html      |  1 -
 .../propertyeditors/integer/integer.html      |  1 -
 9 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs
index f238c1ac24..442b92d2b5 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/AddDataDecimalColumn.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFourZer
             var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
 
             if (columns.Any(x => x.TableName.InvariantEquals("cmsPropertyData") && x.ColumnName.InvariantEquals("dataDecimal")) == false)
-                Create.Column("dataDecimal").OnTable("cmsPropertyData").AsDecimal(18, 9).Nullable();
+                Create.Column("dataDecimal").OnTable("cmsPropertyData").AsDecimal().Nullable();
         }
 
         public override void Down()
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
index 84c6e6e824..a6d1d690ba 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
@@ -10,6 +10,19 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     public abstract class MicrosoftSqlSyntaxProviderBase<TSyntax> : SqlSyntaxProviderBase<TSyntax>
         where TSyntax : ISqlSyntaxProvider
     {
+        protected MicrosoftSqlSyntaxProviderBase()
+        {            
+            AutoIncrementDefinition = "IDENTITY(1,1)";
+            GuidColumnDefinition = "UniqueIdentifier";
+            RealColumnDefinition = "FLOAT";
+            BoolColumnDefinition = "BIT";
+            DecimalColumnDefinition = "DECIMAL(38,6)";
+            TimeColumnDefinition = "TIME"; //SQLSERVER 2008+
+            BlobColumnDefinition = "VARBINARY(MAX)";
+
+            InitColumnTypeMap();
+        }
+
         public override string RenameTable { get { return "sp_rename '{0}', '{1}'"; } }
 
         public override string AddColumn { get { return "ALTER TABLE {0} ADD {1}"; } }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
index 1b96855a3d..b151f84c08 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
@@ -18,10 +18,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         public MySqlSyntaxProvider(ILogger logger)
         {
             _logger = logger;
-            DefaultStringLength = 255;
-            StringLengthColumnDefinitionFormat = StringLengthUnicodeColumnDefinitionFormat;
-            StringColumnDefinition = string.Format(StringLengthColumnDefinitionFormat, DefaultStringLength);
-
+            
             AutoIncrementDefinition = "AUTO_INCREMENT";
             IntColumnDefinition = "int(11)";
             BoolColumnDefinition = "tinyint(1)";
@@ -29,9 +26,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             TimeColumnDefinition = "time";
             DecimalColumnDefinition = "decimal(38,6)";
             GuidColumnDefinition = "char(36)";
-
-            InitColumnTypeMap();
-
+            
             DefaultValueFormat = "DEFAULT {0}";
         }
 
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index 4ac513a110..1c6e1bba52 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -15,19 +15,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     {
         public SqlCeSyntaxProvider()
         {
-            StringLengthColumnDefinitionFormat = StringLengthUnicodeColumnDefinitionFormat;
-            StringColumnDefinition = string.Format(StringLengthColumnDefinitionFormat, DefaultStringLength);
-
-            AutoIncrementDefinition = "IDENTITY(1,1)";
-            StringColumnDefinition = "NVARCHAR(255)";
-            GuidColumnDefinition = "UniqueIdentifier";
-            RealColumnDefinition = "FLOAT";
-            BoolColumnDefinition = "BIT";
-            DecimalColumnDefinition = "DECIMAL(38,6)";
-            TimeColumnDefinition = "TIME"; //SQLSERVER 2008+
-            BlobColumnDefinition = "VARBINARY(MAX)";
-
-            InitColumnTypeMap();
+            
         }
 
         public override bool SupportsClustered()
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 53198cdf5e..9cb0ce327d 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -13,19 +13,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     {
         public SqlServerSyntaxProvider()
         {
-            StringLengthColumnDefinitionFormat = StringLengthUnicodeColumnDefinitionFormat;
-            StringColumnDefinition = string.Format(StringLengthColumnDefinitionFormat, DefaultStringLength);
-
-            AutoIncrementDefinition = "IDENTITY(1,1)";
-            StringColumnDefinition = "VARCHAR(8000)";
-            GuidColumnDefinition = "UniqueIdentifier";
-            RealColumnDefinition = "FLOAT";
-            BoolColumnDefinition = "BIT";
-            DecimalColumnDefinition = "DECIMAL(38,6)";
-            TimeColumnDefinition = "TIME"; //SQLSERVER 2008+
-            BlobColumnDefinition = "VARBINARY(MAX)";
-
-            InitColumnTypeMap();
+            
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index 7c08e34a98..c2b81aa753 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -32,6 +32,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                   FormatPrimaryKey,
                                   FormatIdentity
                               };
+
+            //defaults for all providers
+            StringLengthColumnDefinitionFormat = StringLengthUnicodeColumnDefinitionFormat;
+            StringColumnDefinition = string.Format(StringLengthColumnDefinitionFormat, DefaultStringLength);
+            DecimalColumnDefinition = string.Format(DecimalColumnDefinitionFormat, DefaultDecimalPrecision, DefaultDecimalScale);
+
+            InitColumnTypeMap();
         }
 
         public string GetWildcardPlaceholder()
@@ -41,9 +48,12 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         public string StringLengthNonUnicodeColumnDefinitionFormat = "VARCHAR({0})";
         public string StringLengthUnicodeColumnDefinitionFormat = "NVARCHAR({0})";
+        public string DecimalColumnDefinitionFormat = "DECIMAL({0},{1})";
 
         public string DefaultValueFormat = "DEFAULT ({0})";
         public int DefaultStringLength = 255;
+        public int DefaultDecimalPrecision = 20;
+        public int DefaultDecimalScale = 9;
 
         //Set by Constructor
         public string StringColumnDefinition;
@@ -55,7 +65,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         public string GuidColumnDefinition = "GUID";
         public string BoolColumnDefinition = "BOOL";
         public string RealColumnDefinition = "DOUBLE";
-        public string DecimalColumnDefinition = "DECIMAL";
+        public string DecimalColumnDefinition;
         public string BlobColumnDefinition = "BLOB";
         public string DateTimeColumnDefinition = "DATETIME";
         public string TimeColumnDefinition = "DATETIME";
@@ -431,6 +441,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                 return string.Format(StringLengthColumnDefinitionFormat, valueOrDefault);
             }
 
+            if (type == typeof(decimal))
+            {
+                var precision = column.Size != default(int) ? column.Size : DefaultDecimalPrecision;
+                var scale = column.Precision != default(int) ? column.Precision : DefaultDecimalScale;
+                return string.Format(DecimalColumnDefinitionFormat, precision, scale);
+            }
+
             string definition = DbTypeMap.ColumnTypeMap.First(x => x.Key == type).Value;
             string dbTypeDefinition = column.Size != default(int)
                                           ? string.Format("{0}({1})", definition, column.Size)
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
index 651c0a54c7..0f3372eecb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
@@ -40,7 +40,7 @@ function valRegex() {
 
             var patternValidator = function (viewValue) {
                 //NOTE: we don't validate on empty values, use required validator for that
-                if (!viewValue || regex.test(viewValue)) {
+                if (!viewValue || regex.test(viewValue.toString())) {
                     // it is valid
                     ctrl.$setValidity('valRegex', true);
                     //assign a message to the validator
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index 64730bbfb2..113148c3c6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -1,7 +1,6 @@
 <div class="umb-editor">
     <input name="decimalField" 
            type="number"
-           pattern="[0-9]+([,\.][0-9]+)?"
            class="umb-editor umb-number"
            ng-model="model.value"
            val-server="value"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index ff82be99b2..6245805bec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -1,7 +1,6 @@
 <div class="umb-editor">
     <input name="integerField"
            type="number"
-           pattern="[0-9]*"
            class="umb-editor umb-number "
            ng-model="model.value"
            val-server="value"