Nicer variable name, thank to Lee Kelleher!

U4-10495 - Install and customize buttons disabled

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -239,18 +239,18 @@ function Prepare-Tests
   
   # data
   Write-Host "Copy data files"
-  if( -Not (Test-Path -Path "$tmp\tests\Packaging" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
   {
     Write-Host "Create packaging directory"
-    New-Item -ItemType directory -Path "$tmp\tests\Packaging"
+    mkdir "$tmp\tests\Packaging" > $null
   }
   Copy-Files "$src\Umbraco.Tests\Packaging\Packages" "*" "$tmp\tests\Packaging\Packages"
   
   # required for package install tests  
-  if( -Not (Test-Path -Path "$tmp\tests\bin" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
   {
     Write-Host "Create bin directory"
-    New-Item -ItemType directory -Path "$tmp\tests\bin"
+    mkdir "$tmp\tests\bin" > $null
   }
 }
 

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -29,7 +29,7 @@
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
       <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.5, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.8")]
-[assembly: AssemblyInformationalVersion("7.7.8")]
+[assembly: AssemblyFileVersion("7.7.9")]
+[assembly: AssemblyInformationalVersion("7.7.9")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.8");
+        private static readonly Version Version = new Version("7.7.9");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/DateTimeExtensions.cs

@@ -21,9 +21,9 @@ namespace Umbraco.Core
         public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
         {
             if (truncateTo == DateTruncate.Year)
-                return new DateTime(dt.Year, 0, 0);
+                return new DateTime(dt.Year, 1, 1);
             if (truncateTo == DateTruncate.Month)
-                return new DateTime(dt.Year, dt.Month, 0);
+                return new DateTime(dt.Year, dt.Month, 1);
             if (truncateTo == DateTruncate.Day)
                 return new DateTime(dt.Year, dt.Month, dt.Day);
             if (truncateTo == DateTruncate.Hour)
@@ -41,43 +41,43 @@ namespace Umbraco.Core
             Hour,
             Minute,
             Second
-        }
-
+        }
+
         /// <summary>
-        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
+        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
         /// date time is before the time, calculate onto next day)
         /// </summary>
         /// <param name="fromDateTime">Date to start from</param>
         /// <param name="scheduledTime">Time to compare against (in Hmm form, e.g. 330, 2200)</param>
-        /// <returns></returns>
-        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
-        {
-            // Ensure time provided is 4 digits long
-            if (scheduledTime.Length == 3)
-            {
-                scheduledTime = "0" + scheduledTime;
-            }
-
-            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
-            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
-
-            DateTime scheduledDateTime;
-            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
-            {
-                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
-            }
-            else
-            {
-                var nextDay = fromDateTime.AddDays(1);
-                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
-            }
-
-            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
-        }
-
-        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
-        {
-            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
+        /// <returns></returns>
+        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
+        {
+            // Ensure time provided is 4 digits long
+            if (scheduledTime.Length == 3)
+            {
+                scheduledTime = "0" + scheduledTime;
+            }
+
+            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
+            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
+
+            DateTime scheduledDateTime;
+            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
+            {
+                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
+            }
+            else
+            {
+                var nextDay = fromDateTime.AddDays(1);
+                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
+            }
+
+            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
+        }
+
+        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
+        {
+            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
         }
     }
 }

src/Umbraco.Core/Events/ImportPackageEventArgs.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Packaging.Models;
 
 namespace Umbraco.Core.Events
@@ -7,18 +8,27 @@ namespace Umbraco.Core.Events
     public class ImportPackageEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TEntity>, IEquatable<ImportPackageEventArgs<TEntity>>
     {
         private readonly MetaData _packageMetaData;
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying packageMetaData instead")]
         public ImportPackageEventArgs(TEntity eventObject, bool canCancel)
             : base(new[] { eventObject }, canCancel)
         {
         }
 
-        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
-            : base(new[] { eventObject })
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
         {
+            if (packageMetaData == null) throw new ArgumentNullException("packageMetaData");
             _packageMetaData = packageMetaData;
         }
 
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : this(eventObject, packageMetaData, true)
+        {
+            
+        }
+
         public MetaData PackageMetaData
         {
             get { return _packageMetaData; }

src/Umbraco.Core/Models/ContentType.cs

@@ -95,8 +95,10 @@ namespace Umbraco.Core.Models
             get { return _allowedTemplates; }
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector,
-                   Ps.Value.TemplateComparer);
+                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector, Ps.Value.TemplateComparer);
+
+                if (_allowedTemplates.Any(x => x.Id == _defaultTemplate) == false)
+                    DefaultTemplateId = 0;
             }
         }
 

src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs

@@ -20,6 +20,12 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 var name = Name;
 
+				// cater for instances where node has no name.
+				if(string.IsNullOrWhiteSpace(name))
+				{
+					return _numPos;
+ 				}
+
                 if (name[name.Length - 1] != ')')
                     return _numPos = -1;
 
@@ -106,7 +112,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 }
             }
 
-            return uniqueing ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
+            return uniqueing || string.IsNullOrWhiteSpace(nodeName) ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
         }
     }
 }

src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs

@@ -18,6 +18,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             return Constants.PropertyEditors.MultipleTextstringAlias.Equals(propertyType.PropertyEditorAlias);
         }
 
+        private static readonly string[] NewLineDelimiters = { "\r\n", "\r", "\n" };
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
             // data is (both in database and xml):
@@ -53,7 +55,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             // Fall back on normal behaviour
             if (values.Any() == false)
             {
-                return sourceString.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+                return sourceString.Split(NewLineDelimiters, StringSplitOptions.None);
             }
 
             return values.ToArray();

src/Umbraco.Core/Services/MemberService.cs

@@ -695,7 +695,7 @@ namespace Umbraco.Core.Services
                 IQuery<IMember> filterQuery = null;
                 if (filter.IsNullOrWhiteSpace() == false)
                 {
-                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
+                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter) || x.Email.Contains(filter));
                 }
 
                 var repository = RepositoryFactory.CreateMemberRepository(uow);

src/Umbraco.Core/Services/PackagingService.cs

@@ -1748,9 +1748,10 @@ namespace Umbraco.Core.Services
 
         internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0, bool raiseEvents = false)
         {
+            var metaData = GetPackageMetaData(packageFilePath);
+
             if (raiseEvents)
-            {
-                var metaData = GetPackageMetaData(packageFilePath);
+            {                
                 if (ImportingPackage.IsRaisedEventCancelled(new ImportPackageEventArgs<string>(packageFilePath, metaData), this))
                 {
                     var initEmpty = new InstallationSummary().InitEmpty();
@@ -1762,7 +1763,7 @@ namespace Umbraco.Core.Services
 
             if (raiseEvents)
             {
-                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, false), this);
+                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, metaData, false), this);
             }
 
             return installationSummary;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -43,8 +43,8 @@
     <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>

src/Umbraco.Core/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />

src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs

@@ -332,6 +332,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType2("test", "Test", propertyGroupName: "testGroup");
 
                 Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
+                // remove all templates - since they are not saved, they would break the (wtf) mapping code
+                contentType.AllowedTemplates = new ITemplate[0];
 
                 // there is NO mapping from display to contentType, but only from save
                 // to contentType, so if we want to test, let's to it properly!

src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs

@@ -24,7 +24,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         [TestCase("Alpha (10)", "Alpha (2)", +1)] // this is the real stuff
         [TestCase("Kilo", "Golf (2)", +1)]
         [TestCase("Kilo (1)", "Golf (2)", +1)]
-        public void ComparerTest(string name1, string name2, int expected)
+		[TestCase("", "", 0)]
+		[TestCase(null, null, 0)]
+		public void ComparerTest(string name1, string name2, int expected)
         {
             var comparer = new SimilarNodeName.Comparer();
 
@@ -76,7 +78,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         [TestCase(0, "Alpha", "Alpha (3)")]
         [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
         [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
-        public void Test(int nodeId, string nodeName, string expected)
+		[TestCase(0, "", " (1)")]
+		[TestCase(0, null, " (1)")]
+		public void Test(int nodeId, string nodeName, string expected)
         {
             var names = new[]
             {

src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs

@@ -29,7 +29,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropData_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             var index = 0;
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropFocalPoint_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.FocalPoint.Left, d.FocalPoint.Left);
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropDataSet_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.Src, d.Src);
@@ -91,7 +91,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropDataSet_Methods_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.HasCrop("thumb"), d.HasCrop("thumb"));
@@ -108,7 +108,7 @@ namespace Umbraco.Tests.PropertyEditors
         public void CanConvertImageCropperDataSetSrcToString()
         {
             //cropperJson3 - has not crops
-            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var sourceObj = cropperJson3.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<string>();
             Assert.IsTrue(destObj.Success);
             Assert.AreEqual(destObj.Result, "/media/1005/img_0672.jpg");
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.PropertyEditors
         public void CanConvertImageCropperDataSetJObject()
         {
             //cropperJson3 - has not crops
-            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var sourceObj = cropperJson3.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<JObject>();
             Assert.IsTrue(destObj.Success);
             Assert.AreEqual(sourceObj, destObj.Result.ToObject<ImageCropDataSet>());
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void CanConvertImageCropperDataSetJsonToString()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<string>();
             Assert.IsTrue(destObj.Success);
             Assert.IsTrue(destObj.Result.DetectIsJson());
@@ -150,7 +150,7 @@ namespace Umbraco.Tests.PropertyEditors
                 var converter = new Umbraco.Web.PropertyEditors.ValueConverters.ImageCropperValueConverter(dataTypeService.Object);
                 var result = converter.ConvertDataToSource(new PublishedPropertyType("test", 0, "test"), val1, false); // does not use type for conversion
 
-                var resultShouldMatch = val2.SerializeToCropDataSet();
+                var resultShouldMatch = val2.DeserializeToCropDataSet();
                 if (expected)
                 {
                     Assert.AreEqual(resultShouldMatch, result);
@@ -220,7 +220,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetBaseCropUrlFromModelTest()
         {
-            var cropDataSet = cropperJson1.SerializeToCropDataSet();
+            var cropDataSet = cropperJson1.DeserializeToCropDataSet();
             var urlString = cropDataSet.GetCropUrl("thumb");
             Assert.AreEqual("?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString);
         }

src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js

@@ -9,9 +9,14 @@ function noDirtyCheck() {
         restrict: 'A',
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
+
             elm.focus(function () {
-                ctrl.$pristine = false;
+                scope.$watch(function() {
+                    ctrl.$pristine = false;
+                });
             });
+
+
         }
     };
 }

src/Umbraco.Web.UI.Client/src/installer/steps/user.html

@@ -18,7 +18,7 @@
 				<div class="control-group">
 					<label class="control-label" for="email">Email</label>
 					<div class="controls">
-						<input type="email" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" val-email />
+						<input type="email" id="email" name="email" placeholder="you@example.com" val-email required ng-model="installer.current.model.email" />
 						<small class="inline-help">Your email will be used as your login</small>
 					</div>
 				</div>

src/Umbraco.Web.UI.Client/src/less/tree.less

@@ -240,6 +240,7 @@
 .umb-tree .umb-tree-node-checked i:before {
 	/*check box*/
     content: "\e165" !important;
+	font-family: inherit;
 }
 
 a.umb-options {

src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html

@@ -1,7 +1,7 @@
 <div class="umb-panel" ng-controller="Umbraco.Dialogs.IconPickerController">
-	<div class="umb-panel-header">
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="form-search">
+    <div class="umb-panel-header">
+        <div class="umb-el-wrap umb-panel-buttons">
+            <div class="form-search">
                 <i class="icon-search"></i>
                 <input type="text"
                        style="width: 100%"
@@ -9,50 +9,49 @@
                        class="umb-search-field search-query input-block-level"
                        localize="placeholder"
                        placeholder="@placeholders_filter"
-                       no-dirty-check>
+                       no-dirty-check />
             </div>
-    	</div>
-	</div>
+        </div>
+    </div>
 
-	<div class="umb-panel-body with-footer">
+    <div class="umb-panel-body with-footer">
 
         <div class="umb-control-group">
-        	<select ng-model="color" class="input-block-level">
-        		<option value=""><localize key="colors_black">Black</localize></option>
-        		<option value="color-green"><localize key="colors_green">Green</localize></option>
-        		<option value="color-yellow"><localize key="colors_yellow">Yellow</localize></option>
-        		<option value="color-orange"><localize key="colors_orange">Orange</localize></option>
-        		<option value="color-blue"><localize key="colors_blue">Blue</localize></option>
-        		<option value="color-red"><localize key="colors_red">Red</localize></option>
-        	</select>
+            <select ng-model="color" class="input-block-level">
+                <option value=""><localize key="colors_black">Black</localize></option>
+                <option value="color-green"><localize key="colors_green">Green</localize></option>
+                <option value="color-yellow"><localize key="colors_yellow">Yellow</localize></option>
+                <option value="color-orange"><localize key="colors_orange">Orange</localize></option>
+                <option value="color-blue"><localize key="colors_blue">Blue</localize></option>
+                <option value="color-red"><localize key="colors_red">Red</localize></option>
+            </select>
         </div>
 
         <umb-load-indicator ng-if="loading"></umb-load-indicator>
 
         <div class="umb-control-group" ng-show="!loading">
-	        <ul class="umb-iconpicker" ng-class="color" ng-show="icons">
-		        <li class="umb-iconpicker-item" ng-repeat="icon in filtered = (icons | filter: searchTerm) track by $id(icon)">
-				    <a href="#" title="{{icon}}" ng-click="submitClass(icon)" prevent-default>
-						<i class="{{icon}} large"></i>
-		            </a>
-		        </li>
-		    </ul>
-		</div>
+            <ul class="umb-iconpicker" ng-class="color" ng-show="icons">
+                <li class="umb-iconpicker-item" ng-repeat="icon in filtered = (icons | filter: searchTerm) track by $id(icon)">
+                    <a href="#" title="{{icon}}" ng-click="submitClass(icon)" prevent-default>
+                        <i class="{{icon}} large"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
 
-		<umb-empty-state
-			ng-if="filtered.length === 0"
-			position="center">
-			<localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
-		</umb-empty-state>
-	</div>
+        <umb-empty-state ng-if="filtered.length === 0"
+                         position="center">
+            <localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
+        </umb-empty-state>
+    </div>
 
-	<div class="umb-panel-footer" >
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="btn-toolbar umb-btn-toolbar pull-right">
-	        	<a href ng-click="close()" class="btn btn-link">
-	        		<localize key="general_cancel">Cancel</localize>
-				</a>
-	        </div>
-		</div>
-	</div>
+    <div class="umb-panel-footer">
+        <div class="umb-el-wrap umb-panel-buttons">
+            <div class="btn-toolbar umb-btn-toolbar pull-right">
+                <a href ng-click="close()" class="btn btn-link">
+                    <localize key="general_cancel">Cancel</localize>
+                </a>
+            </div>
+        </div>
+    </div>
 </div>

src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html

@@ -61,22 +61,23 @@
 
 
     <div class="umb-panel umb-dialogs-mediapicker browser"
-          on-drag-leave="dragLeave()"
-          on-drag-end="dragLeave()"
-          on-drag-enter="dragEnter()" 
-          ng-hide="target">
+         on-drag-leave="dragLeave()"
+         on-drag-end="dragLeave()"
+         on-drag-enter="dragEnter()"
+         ng-hide="target">
+
 
-          
         <div class="umb-panel-header">
 
             <div class="umb-el-wrap umb-panel-buttons umb-mediapicker-upload">
-	            <div class="form-search">
-	                <i class="icon-search"></i>
-	                <input type="text"
-	                       ng-model="searchTerm"
-	                       class="umb-search-field search-query"
-                          localize="placeholder"
-	                       placeholder="@placeholders_filter">
+                <div class="form-search">
+                    <i class="icon-search"></i>
+                    <input type="text"
+                           ng-model="searchTerm"
+                           class="umb-search-field search-query"
+                           localize="placeholder"
+                           placeholder="@placeholders_filter"
+                           no-dirty-check />
                 </div>
 
                 <div class="upload-button">
@@ -97,7 +98,7 @@
                     <li ng-repeat="item in path">
                         <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a> /
                     </li>
- 
+
                     <li>
                         <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
                             <i class="icon icon-add small"></i>
@@ -114,28 +115,26 @@
                 </ul>
             </div>
         </div>
-  
+
 
         <div class="umb-panel-body with-footer">
-                       
-            <umb-file-dropzone 
-                ng-if="acceptedMediatypes.length > 0"
-                accepted-mediatypes="acceptedMediatypes"
-                hide-dropzone="{{!activeDrag && images.length > 0}}" 
-                parent-id="{{currentFolder.id}}"
-                files-uploaded="onUploadComplete"
-                files-queued="onFilesQueue">
+
+            <umb-file-dropzone ng-if="acceptedMediatypes.length > 0"
+                               accepted-mediatypes="acceptedMediatypes"
+                               hide-dropzone="{{!activeDrag && images.length > 0}}"
+                               parent-id="{{currentFolder.id}}"
+                               files-uploaded="onUploadComplete"
+                               files-queued="onFilesQueue">
             </umb-file-dropzone>
 
-            <umb-photo-folder 
-                min-height="105"
-                min-width="150"
-                max-height="250"
-                ideal-items-per-row="3"
-                on-click="clickHandler"
-                ng-model="images"
-                images-only="{{onlyImages}}"
-                filter-by="searchTerm" />
+            <umb-photo-folder min-height="105"
+                              min-width="150"
+                              max-height="250"
+                              ideal-items-per-row="3"
+                              on-click="clickHandler"
+                              ng-model="images"
+                              images-only="{{onlyImages}}"
+                              filter-by="searchTerm" />
         </div>
 
 

src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html

@@ -1,7 +1,7 @@
 <div class="umb-panel" ng-controller="Umbraco.Dialogs.MemberGroupPickerController">
-	
+
     <div class="umb-panel-body with-footer no-header">
-        
+
         <div>
             <umb-tree section="member"
                       treealias="memberGroups"
@@ -14,21 +14,21 @@
         </div>
     </div>
 
-	<div class="umb-panel-footer" >
-			<div class="umb-el-wrap umb-panel-buttons">
-		        <div class="btn-toolbar umb-btn-toolbar pull-right">
+    <div class="umb-panel-footer">
+        <div class="umb-el-wrap umb-panel-buttons">
+            <div class="btn-toolbar umb-btn-toolbar pull-right">
 
-		        	<a href ng-click="close()" class="btn btn-link">
-		        		<localize key="general_cancel">Cancel</localize>
-					</a>
+                <a href ng-click="close()" class="btn btn-link">
+                    <localize key="general_cancel">Cancel</localize>
+                </a>
 
-                    <button class="btn btn-primary"
-                            ng-click="submit(dialogData.selection)">
-                        <localize key="buttons_select">Select</localize>
-                        ({{dialogData.selection.length}})
-                    </button>
+                <button class="btn btn-primary"
+                        ng-click="submit(dialogData.selection)">
+                    <localize key="buttons_select">Select</localize>
+                    ({{dialogData.selection.length}})
+                </button>
 
-		        </div>
-			</div>
-		</div>
+            </div>
+        </div>
+    </div>
 </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html

@@ -7,9 +7,10 @@
                    style="width: 100%"
                    ng-model="searchTerm"
                    class="umb-search-field search-query input-block-level"
-         localize="placeholder"
-         placeholder="@placeholders_filter"
-                   umb-auto-focus>
+                   localize="placeholder"
+                   placeholder="@placeholders_filter"
+                   umb-auto-focus
+                   no-dirty-check />
         </div>
     </div>
 
@@ -17,20 +18,17 @@
         <localize key="contentTypeEditor_compositionsDescription"></localize>
     </div>
 
-    <umb-empty-state
-        ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
-        position="center">
-    <localize key="contentTypeEditor_noAvailableCompositions"></localize>
+    <umb-empty-state ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
+                     position="center">
+        <localize key="contentTypeEditor_noAvailableCompositions"></localize>
     </umb-empty-state>
-    <umb-empty-state
-        ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1"
-        position="center">
-    <localize key="contentTypeEditor_compositionInUse"></localize>
+    <umb-empty-state ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1"
+                     position="center">
+        <localize key="contentTypeEditor_compositionInUse"></localize>
     </umb-empty-state>
 
     <ul class="umb-checkbox-list">
         <li class="umb-checkbox-list__item"
-
             ng-repeat="compositeContentType in model.availableCompositeContentTypes | filter:searchTerm"
             ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
 
@@ -41,7 +39,7 @@
                        checklist-model="model.compositeContentTypes"
                        checklist-value="compositeContentType.contentType.alias"
                        ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
-                       ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited"/>
+                       ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />
             </div>
 
             <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html

@@ -1,117 +1,100 @@
 <div class="umb-overlay-body" ng-controller="Umbraco.Overlays.EditorPickerOverlay as vm">
-
-	<!-- FILTER -->
-	<div class="umb-control-group -no-border">
-		<div class="form-search">
-			<i class="icon-search"></i>
-			<input type="text"
-				style="width: 100%"
-				ng-change="vm.filterItems()"
-				ng-model="vm.searchTerm"
-				class="umb-search-field search-query search-input input-block-level"
-				localize="placeholder"
-	            placeholder="@placeholders_filter"
-				umb-auto-focus>
-		</div>
-	</div>
-
-	<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-	<!-- TABS -->
-	<div ng-if="vm.showTabs">
-
-		<umb-tabs-nav model="vm.tabs"></umb-tabs-nav>
-
-		<umb-tabs-content>
-
-			<umb-tab id="tab{{tab.id}}" ng-repeat="tab in vm.tabs" rel="{{tab.id}}">
-
-				<div ng-if="tab.alias==='Default'">
-					<div ng-repeat="(key,value) in tab.typesAndEditors">
-						<h5>{{key}}</h5>
-						<ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-							<li	ng-repeat="systemDataType in value | orderBy:'name'"
-								ng-mouseover="vm.showDetailsOverlay(systemDataType)"
-								ng-click="vm.pickEditor(systemDataType)"
-								class="-four-in-row">
-								<a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
-									<i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
-									{{ systemDataType.name }}
-								</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-
-				<div ng-if="tab.alias==='Reuse'">
-					<div ng-repeat="(key,value) in tab.userConfigured">
-						<h5>{{key}}</h5>
-						<ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-							<li ng-repeat="dataType in value | orderBy:'name'"
-								ng-mouseover="vm.showDetailsOverlay(dataType)"
-								ng-click="vm.pickDataType(dataType)"
-								class="-four-in-row">
-								<a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
-									<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
-									{{ dataType.name }}
-								</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-
-			</umb-tab>
-
-		</umb-tabs-content>
-
-	</div>
-
-	<!-- FILTER RESULTS -->
-	<div ng-if="vm.showFilterResult">
-
-		<h5 class="-border-bottom -black"><localize key="contentTypeEditor_reuse"></localize></h5>
-		<div ng-repeat="(key,value) in vm.userConfigured">
-			<div ng-if="(value | filter:vm.searchTerm).length > 0">
-				<h5>{{key}}</h5>
-				<ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-					<li ng-repeat="dataType in value | orderBy:'name' | filter: vm.searchTerm"
-						ng-mouseover="vm.showDetailsOverlay(dataType)"
-						ng-click="vm.pickDataType(dataType)"
-						class="-four-in-row">
-						<a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
-							<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
-							{{ dataType.name }}
-						</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-
-		<h5 class="-border-bottom -black"><localize key="contentTypeEditor_availableEditors"></localize></h5>
-		<div ng-repeat="(key,value) in vm.typesAndEditors">
-			<div ng-if="(value | filter:vm.searchTerm).length > 0">
-				<h5>{{key}}</h5>
-				<ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
-					<li	ng-repeat="systemDataType in value | orderBy:'name' | filter: vm.searchTerm"
-						ng-mouseover="vm.showDetailsOverlay(systemDataType)"
-						ng-click="vm.pickEditor(systemDataType)"
-						class="-four-in-row">
-						<a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
-							<i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
-							{{ systemDataType.name }}
-						</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-
-	</div>
-
-	<umb-overlay
-		ng-if="vm.editorSettingsOverlay.show"
-		model="vm.editorSettingsOverlay"
-		position="right"
-		view="vm.editorSettingsOverlay.view">
-	</umb-overlay>
-
+    <!-- FILTER -->
+    <div class="umb-control-group -no-border">
+        <div class="form-search">
+            <i class="icon-search"></i>
+            <input type="text"
+                   style="width: 100%"
+                   ng-change="vm.filterItems()"
+                   ng-model="vm.searchTerm"
+                   class="umb-search-field search-query search-input input-block-level"
+                   localize="placeholder"
+                   placeholder="@placeholders_filter"
+                   umb-auto-focus
+                   no-dirty-check />
+        </div>
+    </div>
+    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
+    <!-- TABS -->
+    <div ng-if="vm.showTabs">
+        <umb-tabs-nav model="vm.tabs"></umb-tabs-nav>
+        <umb-tabs-content>
+            <umb-tab id="tab{{tab.id}}" ng-repeat="tab in vm.tabs" rel="{{tab.id}}">
+                <div ng-if="tab.alias==='Default'">
+                    <div ng-repeat="(key,value) in tab.typesAndEditors">
+                        <h5>{{key}}</h5>
+                        <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                            <li ng-repeat="systemDataType in value | orderBy:'name'"
+                                ng-mouseover="vm.showDetailsOverlay(systemDataType)"
+                                ng-click="vm.pickEditor(systemDataType)"
+                                class="-four-in-row">
+                                <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
+                                    <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
+                                    {{ systemDataType.name }}
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div ng-if="tab.alias==='Reuse'">
+                    <div ng-repeat="(key,value) in tab.userConfigured">
+                        <h5>{{key}}</h5>
+                        <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                            <li ng-repeat="dataType in value | orderBy:'name'"
+                                ng-mouseover="vm.showDetailsOverlay(dataType)"
+                                ng-click="vm.pickDataType(dataType)"
+                                class="-four-in-row">
+                                <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
+                                    <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
+                                    {{ dataType.name }}
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </umb-tab>
+        </umb-tabs-content>
+    </div>
+    <!-- FILTER RESULTS -->
+    <div ng-if="vm.showFilterResult">
+        <h5 class="-border-bottom -black"><localize key="contentTypeEditor_reuse"></localize></h5>
+        <div ng-repeat="(key,value) in vm.userConfigured">
+            <div ng-if="(value | filter:vm.searchTerm).length > 0">
+                <h5>{{key}}</h5>
+                <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                    <li ng-repeat="dataType in value | orderBy:'name' | filter: vm.searchTerm"
+                        ng-mouseover="vm.showDetailsOverlay(dataType)"
+                        ng-click="vm.pickDataType(dataType)"
+                        class="-four-in-row">
+                        <a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
+                            <i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
+                            {{ dataType.name }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <h5 class="-border-bottom -black"><localize key="contentTypeEditor_availableEditors"></localize></h5>
+        <div ng-repeat="(key,value) in vm.typesAndEditors">
+            <div ng-if="(value | filter:vm.searchTerm).length > 0">
+                <h5>{{key}}</h5>
+                <ul class="umb-card-grid" ng-mouseleave="vm.hideDetailsOverlay()">
+                    <li ng-repeat="systemDataType in value | orderBy:'name' | filter: vm.searchTerm"
+                        ng-mouseover="vm.showDetailsOverlay(systemDataType)"
+                        ng-click="vm.pickEditor(systemDataType)"
+                        class="-four-in-row">
+                        <a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
+                            <i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
+                            {{ systemDataType.name }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <umb-overlay ng-if="vm.editorSettingsOverlay.show"
+                 model="vm.editorSettingsOverlay"
+                 position="right"
+                 view="vm.editorSettingsOverlay.view">
+    </umb-overlay>
 </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html

@@ -10,7 +10,7 @@
                    localize="placeholder"
                    placeholder="@placeholders_filter"
                    umb-auto-focus
-                   no-dirty-check>
+                   no-dirty-check />
         </div>
     </div>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html

@@ -1,25 +1,25 @@
 <div ng-controller="Umbraco.Overlays.ItemPickerOverlay">
 
     <div class="form-search" ng-hide="model.filter === false" style="margin-bottom: 15px;">
-      <i class="icon-search"></i>
-      <input type="text"
-        ng-model="searchTerm"
-        class="umb-search-field search-query input-block-level -full-width-input"
-        localize="placeholder"
-        placeholder="@placeholders_filter"
-        umb-auto-focus />
+        <i class="icon-search"></i>
+        <input type="text"
+               ng-model="searchTerm"
+               class="umb-search-field search-query input-block-level -full-width-input"
+               localize="placeholder"
+               placeholder="@placeholders_filter"
+               umb-auto-focus
+               no-dirty-check />
     </div>
 
     <ul class="umb-card-grid">
-      <li
-        ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
-        ng-click="selectItem(availableItem)"
-        class="-three-in-row">
-        <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
-            <i class="{{ availableItem.icon }}"></i>
-            {{ availableItem.name }}
-        </a>
-      </li>
+        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
+            ng-click="selectItem(availableItem)"
+            class="-three-in-row">
+            <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
+                <i class="{{ availableItem.icon }}"></i>
+                {{ availableItem.name }}
+            </a>
+        </li>
     </ul>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html

@@ -13,7 +13,8 @@
                        class="umb-search-field search-query input-block-level"
                        localize="placeholder"
                        placeholder="@placeholders_filter"
-                       umb-auto-focus />
+                       umb-auto-focus
+                       no-dirty-check />
             </div>
 
             <ul class="umb-card-grid">
@@ -27,9 +28,8 @@
                 </li>
             </ul>
 
-            <umb-empty-state
-                ng-if="nomacros"
-                position="center">
+            <umb-empty-state ng-if="nomacros"
+                             position="center">
                 <localize key="defaultdialogs_noMacros">
                     There are no macros available to insert
                 </localize>
@@ -52,9 +52,8 @@
                 </li>
             </ul>
 
-            <umb-empty-state
-                ng-if="noMacroParams"
-                position="center">
+            <umb-empty-state ng-if="noMacroParams"
+                             position="center">
                 <localize key="defaultdialogs_noMacroParams">There are no parameters for this macro</localize>
             </umb-empty-state>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html

@@ -3,159 +3,147 @@
       enctype="multipart/form-data"
       umb-image-upload="options">
 
-   <div
-      on-drag-leave="dragLeave()"
-      on-drag-end="dragLeave()"
-      on-drag-enter="dragEnter()">
+    <div on-drag-leave="dragLeave()"
+         on-drag-end="dragLeave()"
+         on-drag-enter="dragEnter()">
 
-      <div class="umb-control-group umb-mediapicker-upload">
+        <div class="umb-control-group umb-mediapicker-upload">
 
-         <umb-load-indicator
-            ng-if="loading">
-         </umb-load-indicator>
+            <umb-load-indicator ng-if="loading">
+            </umb-load-indicator>
 
-         <div class="form-search">
-            <i class="icon-search"></i>
-            <input
-                class="umb-search-field search-query -full-width-input"
-                ng-model="searchOptions.filter"
-                localize="placeholder"
-                placeholder="@placeholders_search"
-                ng-change="changeSearch()"
-                type="text">
-         </div>
+            <div class="form-search">
+                <i class="icon-search"></i>
+                <input class="umb-search-field search-query -full-width-input"
+                       ng-model="searchOptions.filter"
+                       localize="placeholder"
+                       placeholder="@placeholders_search"
+                       ng-change="changeSearch()"
+                       type="text"
+                       no-dirty-check />
+            </div>
 
-         <div class="upload-button">
-             <umb-button
-                type="button"
-                label-key="general_upload"
-                action="upload()"
-                disabled="lockedFolder">
-             </umb-button>
-         </div>
+            <div class="upload-button">
+                <umb-button type="button"
+                            label-key="general_upload"
+                            action="upload()"
+                            disabled="lockedFolder">
+                </umb-button>
+            </div>
 
-      </div>
+        </div>
 
-      <div class="row umb-control-group" ng-show="!searchOptions.filter">
-         <ul class="umb-breadcrumbs">
-            <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-               <a href ng-click="gotoFolder()" prevent-default>Media</a>
-               <span class="umb-breadcrumbs__seperator">&#47;</span>
-            </li>
+        <div class="row umb-control-group" ng-show="!searchOptions.filter">
+            <ul class="umb-breadcrumbs">
+                <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
+                    <a href ng-click="gotoFolder()" prevent-default>Media</a>
+                    <span class="umb-breadcrumbs__seperator">&#47;</span>
+                </li>
 
-            <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-               <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a>
-               <span class="umb-breadcrumbs__seperator">&#47;</span>
-            </li>
+                <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
+                    <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a>
+                    <span class="umb-breadcrumbs__seperator">&#47;</span>
+                </li>
 
-            <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-               <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
-                  <i class="icon icon-add small"></i>
-               </a>
+                <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
+                    <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
+                        <i class="icon icon-add small"></i>
+                    </a>
 
-               <input
-                  type="text"
-                  class="umb-breadcrumbs__add-ancestor"
-                  ng-show="showFolderInput"
-                  ng-model="newFolderName"
-                  ng-keydown="enterSubmitFolder($event)"
-                  on-blur="submitFolder()"
-                  focus-when="{{showFolderInput}}" />
-               </li>
-          </ul>
-          <div class="umb-loader" ng-if="creatingFolder"></div>
-      </div>
+                    <input type="text"
+                           class="umb-breadcrumbs__add-ancestor"
+                           ng-show="showFolderInput"
+                           ng-model="newFolderName"
+                           ng-keydown="enterSubmitFolder($event)"
+                           on-blur="submitFolder()"
+                           focus-when="{{showFolderInput}}" />
+                </li>
+            </ul>
+            <div class="umb-loader" ng-if="creatingFolder"></div>
+        </div>
 
-      <umb-file-dropzone
-         ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
-         accepted-mediatypes="acceptedMediatypes"
-         parent-id="{{currentFolder.id}}"
-         files-uploaded="onUploadComplete"
-         files-queued="onFilesQueue"
-         accept="{{acceptedFileTypes}}"
-         max-file-size="{{maxFileSize}}"
-         hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
-         compact="{{ images.length > 0 }}">
-      </umb-file-dropzone>
+        <umb-file-dropzone ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
+                           accepted-mediatypes="acceptedMediatypes"
+                           parent-id="{{currentFolder.id}}"
+                           files-uploaded="onUploadComplete"
+                           files-queued="onFilesQueue"
+                           accept="{{acceptedFileTypes}}"
+                           max-file-size="{{maxFileSize}}"
+                           hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
+                           compact="{{ images.length > 0 }}">
+        </umb-file-dropzone>
 
-      <umb-media-grid
-         ng-if="!loading"
-         items="images"
-         on-click="clickHandler"
-         on-click-name="clickItemName"
-         item-max-width="150"
-         item-max-height="150"
-         item-min-width="100"
-         item-min-height="100"
-         only-images={{onlyImages}}>
-      </umb-media-grid>
+        <umb-media-grid ng-if="!loading"
+                        items="images"
+                        on-click="clickHandler"
+                        on-click-name="clickItemName"
+                        item-max-width="150"
+                        item-max-height="150"
+                        item-min-width="100"
+                        item-min-height="100"
+                        only-images={{onlyImages}}>
+        </umb-media-grid>
 
         <div class="flex justify-center">
-            <umb-pagination
-                ng-if="searchOptions.totalPages > 0 && !loading"
-                page-number="searchOptions.pageNumber"
-                total-pages="searchOptions.totalPages"
-                on-change="changePagination(pageNumber)">
+            <umb-pagination ng-if="searchOptions.totalPages > 0 && !loading"
+                            page-number="searchOptions.pageNumber"
+                            total-pages="searchOptions.totalPages"
+                            on-change="changePagination(pageNumber)">
             </umb-pagination>
         </div>
 
-        <umb-empty-state
-            ng-if="searchOptions.filter && images.length === 0 && !loading"
-            position="center">
+        <umb-empty-state ng-if="searchOptions.filter && images.length === 0 && !loading"
+                         position="center">
             <localize key="general_searchNoResult"></localize>
         </umb-empty-state>
 
-   </div>
+    </div>
 
-   <umb-overlay
-		ng-if="mediaPickerDetailsOverlay.show"
-		model="mediaPickerDetailsOverlay"
-		position="right">
+    <umb-overlay ng-if="mediaPickerDetailsOverlay.show"
+                 model="mediaPickerDetailsOverlay"
+                 position="right">
 
-      <div class="umb-control-group">
+        <div class="umb-control-group">
 
-         <div ng-if="target.url">
-            <umb-image-gravity
-               src="target.url"
-               center="target.focalPoint">
-            </umb-image-gravity>
-         </div>
+            <div ng-if="target.url">
+                <umb-image-gravity src="target.url"
+                                   center="target.focalPoint">
+                </umb-image-gravity>
+            </div>
 
-         <div ng-if="cropSize">
+            <div ng-if="cropSize">
 
-            <h5>
-                <localize key="general_preview">Preview</localize>
-            </h5>
+                <h5>
+                    <localize key="general_preview">Preview</localize>
+                </h5>
 
-            <umb-image-thumbnail
-               center="target.focalPoint"
-               src="target.url"
-               height="{{cropSize.height}}"
-               width="{{cropSize.width}}"
-               max-size="400">
-            </umb-image-thumbnail>
+                <umb-image-thumbnail center="target.focalPoint"
+                                     src="target.url"
+                                     height="{{cropSize.height}}"
+                                     width="{{cropSize.width}}"
+                                     max-size="400">
+                </umb-image-thumbnail>
 
-         </div>
+            </div>
 
-      </div>
+        </div>
 
-      <div class="umb-control-group">
-         <label><localize key="@general_url"></localize></label>
-         <input
-            type="text"
-            localize="placeholder"
-            placeholder="@general_url"
-            class="umb-editor umb-textstring"
-            ng-model="target.url"
-            ng-disabled="target.id" />
-      </div>
+        <div class="umb-control-group">
+            <label><localize key="@general_url"></localize></label>
+            <input type="text"
+                   localize="placeholder"
+                   placeholder="@general_url"
+                   class="umb-editor umb-textstring"
+                   ng-model="target.url"
+                   ng-disabled="target.id" />
+        </div>
 
-      <div class="umb-control-group">
-         <label><localize key="@content_altTextOptional"></localize></label>
-         <input type="text" class="umb-editor umb-textstring" ng-model="target.altText" />
-      </div>
+        <div class="umb-control-group">
+            <label><localize key="@content_altTextOptional"></localize></label>
+            <input type="text" class="umb-editor umb-textstring" ng-model="target.altText" />
+        </div>
 
 
-	</umb-overlay>
+    </umb-overlay>
 
 </form>

src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html

@@ -1,7 +1,6 @@
 <div ng-controller="Umbraco.Overlays.UserGroupPickerController as vm">
 
-    <umb-load-indicator
-        ng-if="vm.loading">
+    <umb-load-indicator ng-if="vm.loading">
     </umb-load-indicator>
 
     <div ng-if="!vm.loading">
@@ -9,17 +8,18 @@
         <div class="form-search" style="margin-bottom: 15px;">
             <i class="icon-search"></i>
             <input type="text"
-                ng-model="searchTerm"
-                class="umb-search-field search-query input-block-level -full-width-input"
-                localize="placeholder"
-                placeholder="@placeholders_filter"
-                umb-auto-focus />
+                   ng-model="searchTerm"
+                   class="umb-search-field search-query input-block-level -full-width-input"
+                   localize="placeholder"
+                   placeholder="@placeholders_filter"
+                   umb-auto-focus
+                   no-dirty-check />
         </div>
-        
+
         <div class="umb-user-group-picker-list">
 
             <a href="" class="umb-user-group-picker-list-item" ng-repeat="userGroup in vm.userGroups | filter:searchTerm" ng-click="vm.selectUserGroup(userGroup)">
-                
+
                 <div class="umb-user-group-picker-list-item__icon">
                     <i ng-if="!userGroup.selected" class="{{userGroup.icon}}"></i>
                     <umb-checkmark ng-if="userGroup.selected" checked="userGroup.selected" size="xs"></umb-checkmark>
@@ -42,7 +42,7 @@
                             <span ng-if="userGroup.contentStartNode">{{ userGroup.contentStartNode.name }}</span>
                         </span>
                     </div>
-                    
+
                     <div class="umb-user-group-picker-list-item__permission">
                         <span>
                             <span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
@@ -55,9 +55,8 @@
 
         </div>
 
-        <umb-empty-state
-            ng-if="vm.userGroups.length === 0"
-            position="center">
+        <umb-empty-state ng-if="vm.userGroups.length === 0"
+                         position="center">
             No user groups have been added
         </umb-empty-state>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html

@@ -51,7 +51,7 @@
                 total-pages="vm.usersOptions.totalPages"
                 on-change="vm.changePageNumber(pageNumber)">
             </umb-pagination>
-        <div>
+        </div>
 
     </div>
 

src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html

@@ -1,114 +1,114 @@
 <div id="leftcolumn" ng-controller="Umbraco.NavigationController"
      ng-mouseleave="leaveTree($event)" ng-mouseenter="enterTree($event)">
 
-  <umb-sections sections="sections" ng-if="authenticated">
-  </umb-sections>
+    <umb-sections sections="sections" ng-if="authenticated">
+    </umb-sections>
 
-  <!-- navigation container -->
-  <div id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize>
+    <!-- navigation container -->
+    <div id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize>
 
-    <div ng-swipe-left="nav.hideNavigation()" class="navigation-inner-container span6">
+        <div ng-swipe-left="nav.hideNavigation()" class="navigation-inner-container span6">
 
-      <!-- the search -->
-      <div ng-controller="Umbraco.SearchController" ng-if="authenticated">
+            <!-- the search -->
+            <div ng-controller="Umbraco.SearchController" ng-if="authenticated">
 
-        <!-- Search form -->
-        <div id="search-form">
-          <div class="umb-modalcolumn-header">
+                <!-- Search form -->
+                <div id="search-form">
+                    <div class="umb-modalcolumn-header">
 
-            <form class="form-search" novalidate>
-              <i class="icon-search"></i>
-              <input type="text"
-                     hotkey="ctrl+space"
-                     id="search-field"
-                     ng-model="searchTerm"
-                     class="umb-search-field search-query search-input"
-                     localize="placeholder"
-                     placeholder="@placeholders_search"
-                     ng-keydown="navigateResults($event)" />
-            </form>
-          </div>
-        </div>
-
-        <!-- Search results -->
-        <div id="search-results" class="umb-modalcolumn-body" ng-show="showSearchResults">
-
-          <umb-load-indicator ng-if="isSearching"></umb-load-indicator>
-
-          <umb-empty-state
-            ng-if="!hasResults && !isSearching"
-            position="center">
-            <localize key="general_searchNoResult"></localize>
-          </umb-empty-state>
-
-          <ul class="umb-tree" ng-if="!isSearching && hasResults">
-            <li class="root">
-              <div>
-                <h5 class="umb-tree-header"><localize key="general_searchResults">Search results</localize></h5>
-              </div>
-
-              <div class="umb-search-group" ng-repeat="(key, group) in groups">
-                <h6 class="umb-tree-header">{{key}}</h6>
-                <ul>
-                  <li ng-repeat="result in group.results" ng-class="{'current':selectedItem == result}">
-                    <div class="umb-search-group-item">
-                      <a class="umb-search-group-item-link" ng-class="{'first':$first}" ng-click="searchHide()" ng-href="#/{{result.editorPath}}">
-
-                        <div class="umb-search-group-item-name">
-                          <i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
-                          {{result.name}}
-                        </div>
-
-                        <small class="search-subtitle" ng-show="result.subTitle">
-                          {{result.subTitle}}
-                        </small>
-                      </a>
-
-                      <a href  ng-hide="!result.menuUrl" ng-click="searchShowMenu($event, {node: result})" class="umb-options"><i></i><i></i><i></i></a>
+                        <form class="form-search" novalidate>
+                            <i class="icon-search"></i>
+                            <input type="text"
+                                   hotkey="ctrl+space"
+                                   id="search-field"
+                                   ng-model="searchTerm"
+                                   class="umb-search-field search-query search-input"
+                                   localize="placeholder"
+                                   placeholder="@placeholders_search"
+                                   ng-keydown="navigateResults($event)"
+                                   no-dirty-check />
+                        </form>
                     </div>
-                  </li>
-                </ul>
+                </div>
 
-              </div>
+                <!-- Search results -->
+                <div id="search-results" class="umb-modalcolumn-body" ng-show="showSearchResults">
 
-            </li>
-          </ul>
+                    <umb-load-indicator ng-if="isSearching"></umb-load-indicator>
+
+                    <umb-empty-state ng-if="!hasResults && !isSearching"
+                                     position="center">
+                        <localize key="general_searchNoResult"></localize>
+                    </umb-empty-state>
+
+                    <ul class="umb-tree" ng-if="!isSearching && hasResults">
+                        <li class="root">
+                            <div>
+                                <h5 class="umb-tree-header"><localize key="general_searchResults">Search results</localize></h5>
+                            </div>
+
+                            <div class="umb-search-group" ng-repeat="(key, group) in groups">
+                                <h6 class="umb-tree-header">{{key}}</h6>
+                                <ul>
+                                    <li ng-repeat="result in group.results" ng-class="{'current':selectedItem == result}">
+                                        <div class="umb-search-group-item">
+                                            <a class="umb-search-group-item-link" ng-class="{'first':$first}" ng-click="searchHide()" ng-href="#/{{result.editorPath}}">
+
+                                                <div class="umb-search-group-item-name">
+                                                    <i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
+                                                    {{result.name}}
+                                                </div>
+
+                                                <small class="search-subtitle" ng-show="result.subTitle">
+                                                    {{result.subTitle}}
+                                                </small>
+                                            </a>
+
+                                            <a href ng-hide="!result.menuUrl" ng-click="searchShowMenu($event, {node: result})" class="umb-options"><i></i><i></i><i></i></a>
+                                        </div>
+                                    </li>
+                                </ul>
+
+                            </div>
+
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+
+            <!-- the tree -->
+            <div id="tree" class="umb-modalcolumn-body" ng-if="authenticated">
+                <umb-tree cachekey="_"
+                          eventhandler="treeEventHandler"
+                          section="{{currentSection}}">
+                </umb-tree>
+            </div>
         </div>
 
-      </div>
+        <div class="offset6" id="navOffset" style="z-index: 10">
 
-      <!-- the tree -->
-      <div id="tree" class="umb-modalcolumn-body" ng-if="authenticated">
-        <umb-tree cachekey="_"
-                  eventhandler="treeEventHandler"
-                  section="{{currentSection}}">
-        </umb-tree>
-      </div>
+            <!-- The context menu -->
+            <div id='contextMenu' class="umb-modalcolumn fill shadow" ng-swipe-left="nav.hideMenu()" ng-show="showContextMenu" ng-animate="'slide'">
+                <umb-context-menu menu-dialog-title="{{menuDialogTitle}}"
+                                  current-section="{{currentSection}}"
+                                  current-node="menuNode"
+                                  menu-actions="menuActions">
+                </umb-context-menu>
+            </div>
+
+
+            <!-- Tree dialogs -->
+            <div id="dialog" class='umb-modalcolumn fill shadow'
+                 ng-swipe-left="nav.hideDialog()"
+                 ng-show="showContextMenuDialog" ng-animate="'slide'">
+                <div class='umb-modalcolumn-header'>
+                    <h1>{{menuDialogTitle}}</h1>
+                </div>
+                <div class='umb-modalcolumn-body'>
+                </div>
+            </div>
+        </div>
     </div>
 
-    <div class="offset6" id="navOffset" style="z-index: 10">
-
-      <!-- The context menu -->
-      <div id='contextMenu' class="umb-modalcolumn fill shadow" ng-swipe-left="nav.hideMenu()" ng-show="showContextMenu" ng-animate="'slide'">
-        <umb-context-menu menu-dialog-title="{{menuDialogTitle}}"
-                          current-section="{{currentSection}}"
-                          current-node="menuNode"
-                          menu-actions="menuActions">
-        </umb-context-menu>
-      </div>
-
-
-      <!-- Tree dialogs -->
-      <div id="dialog" class='umb-modalcolumn fill shadow'
-           ng-swipe-left="nav.hideDialog()"
-           ng-show="showContextMenuDialog" ng-animate="'slide'">
-        <div class='umb-modalcolumn-header'>
-          <h1>{{menuDialogTitle}}</h1>
-        </div>
-        <div class='umb-modalcolumn-body'>
-        </div>
-      </div>
-    </div>
-  </div>
-
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -261,7 +261,7 @@ angular.module("umbraco")
        $scope.openEditorOverlay = function(event, area, index, key) {
           $scope.editorOverlay = {
               view: "itempicker",
-              filter: false,
+              filter: area.$allowedEditors.length > 15,
               title: localizationService.localize("grid_insertControl"),
               availableItems: area.$allowedEditors,
               event: event,

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -116,9 +116,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
@@ -1024,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7780</DevelopmentServerPort>
+          <DevelopmentServerPort>7790</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7780</IISUrl>
+          <IISUrl>http://localhost:7790</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/config/tinyMceConfig.Release.config

@@ -248,7 +248,7 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al
 thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],
 -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],
 -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],
--h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],
+-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
   </validElements>

src/Umbraco.Web.UI/config/tinyMceConfig.config

@@ -248,7 +248,7 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al
 thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],
 -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],
 -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],
--h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],
+-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
   </validElements>
@@ -271,4 +271,4 @@ param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|cla
       }
     </config>
   </customConfig>
-</tinymceConfig>
+</tinymceConfig>

src/Umbraco.Web.UI/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.89" targetFramework="net45" />

src/Umbraco.Web.UI/umbraco/config/lang/da.xml

@@ -1442,7 +1442,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="documentType">Dokumenttype</key>
     <key alias="editors">Redaktør</key>
     <key alias="excerptField">Uddragsfelt</key>
-    <key alias="failedPasswordAttempts">Fejlet loginforsøg</key>
+    <key alias="failedPasswordAttempts">Fejlede loginforsøg</key>
     <key alias="goToProfile">Gå til brugerprofil</key>
     <key alias="groupsHelp">Tilføj grupper for at tildele adgang og tilladelser</key>
     <key alias="inviteAnotherUser">Invitér anden bruger</key>
@@ -1450,7 +1450,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="language">Sprog</key>
     <key alias="languageHelp">Indstil det sprog, du vil se i menuer og dialoger</key>
     <key alias="lastLockoutDate">Seneste låst ude dato</key>
-    <key alias="lastLogin">Senest login</key>
+    <key alias="lastLogin">Seneste login</key>
     <key alias="lastPasswordChangeDate">Kodeord sidst ændret</key>
     <key alias="loginname">Brugernavn</key>
     <key alias="mediastartnode">Startnode i mediearkivet</key>
@@ -1481,7 +1481,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="permissionsGranularHelp">Sæt rettigheder for specifikke noder</key>
     <key alias="profile">Profil</key>
     <key alias="searchAllChildren">Søg alle 'børn'</key>
-    <key alias="startnode">Start node</key>
+    <key alias="startnode">Startnode</key>
     <key alias="stateActive">Aktiv</key>
     <key alias="stateAll">Alle</key>
     <key alias="stateDisabled">Deaktiveret</key>

src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx

@@ -7,6 +7,7 @@
 <style type="text/css">
 .gridHeader{border-bottom:2px solid #D9D7D7;}
 .gridItem{border-color: #D9D7D7;}
+html, body {overflow: initial;}
 </style>
 
 <umb:CssInclude ID="CssInclude2" runat="server" FilePath="Tree/treeIcons.css" PathNameAlias="UmbracoClient" />

src/Umbraco.Web/Controllers/UmbRegisterController.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Linq;
 using System.Web.Mvc;
 using System.Web.Security;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.member;
 using Umbraco.Core;
-using Umbraco.Core.Security;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 
@@ -21,6 +17,13 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
+            // U4-10762 Server error with "Register Member" snippet (Cannot save member with empty name)
+            // If name field is empty, add the email address instead
+            if (string.IsNullOrEmpty(model.Name) && string.IsNullOrEmpty(model.Email) == false)
+            {
+                model.Name = model.Email;
+            }
+
             MembershipCreateStatus status;
             var member = Members.RegisterMember(model, out status, model.LoginOnSuccess);
             
@@ -36,7 +39,6 @@ namespace Umbraco.Web.Controllers
                         return Redirect(model.RedirectUrl);
                     }
                     //redirect to current page by default
-                    
                     return RedirectToCurrentUmbracoPage();
                 case MembershipCreateStatus.InvalidUserName:
                     ModelState.AddModelError((model.UsernameIsEmail || model.Username == null)

src/Umbraco.Web/ImageCropperBaseExtensions.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Web
 {
     internal static class ImageCropperBaseExtensions
     {
-        internal static ImageCropDataSet SerializeToCropDataSet(this string json)
+        internal static ImageCropDataSet DeserializeToCropDataSet(this string json)
         {
             var imageCrops = new ImageCropDataSet();
             if (json.DetectIsJson())

src/Umbraco.Web/ImageCropperTemplateExtensions.cs

@@ -232,7 +232,7 @@ namespace Umbraco.Web
             ImageCropDataSet cropDataSet = null;
             if (string.IsNullOrEmpty(imageCropperValue) == false && imageCropperValue.DetectIsJson() && (imageCropMode == ImageCropMode.Crop || imageCropMode == null))
             {
-                cropDataSet = imageCropperValue.SerializeToCropDataSet();                    
+                cropDataSet = imageCropperValue.DeserializeToCropDataSet();                    
             }
             return GetCropUrl(
                 imageUrl, cropDataSet, width, height, cropAlias, quality, imageCropMode,

src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs

@@ -65,6 +65,8 @@ namespace Umbraco.Web.Models.Mapping
 
                     if (source.DefaultTemplate != null)
                         dest.SetDefaultTemplate(applicationContext.Services.FileService.GetTemplate(source.DefaultTemplate));
+                    else
+                        dest.SetDefaultTemplate(null);
 
                     ContentTypeModelMapperExtensions.AfterMapContentTypeSaveToEntity(source, dest, applicationContext);
                 });

src/Umbraco.Web/Models/Mapping/UserModelMapper.cs

@@ -201,10 +201,24 @@ namespace Umbraco.Web.Models.Mapping
 
                     var allContentPermissions = applicationContext.Services.UserService.GetPermissions(@group, true)
                         .ToDictionary(x => x.EntityId, x => x);
-                    
-                    var contentEntities = allContentPermissions.Keys.Count == 0
-                        ? new IUmbracoEntity[0]
-                        : applicationContext.Services.EntityService.GetAll(UmbracoObjectTypes.Document, allContentPermissions.Keys.ToArray());
+
+                    IEnumerable<IUmbracoEntity> contentEntities;
+                    if (allContentPermissions.Keys.Count == 0)
+                    {
+                        contentEntities = new IUmbracoEntity[0];
+                    }
+                    else
+                    {
+                        // a group can end up with way more than 2000 assigned permissions,
+                        // so we need to break them into groups in order to avoid breaking
+                        // the entity service due to too many Sql parameters.
+
+                        var list = new List<IUmbracoEntity>();
+                        contentEntities = list;
+                        var entityService = applicationContext.Services.EntityService;
+                        foreach (var idGroup in allContentPermissions.Keys.InGroupsOf(2000))
+                            list.AddRange(entityService.GetAll(UmbracoObjectTypes.Document, idGroup.ToArray()));
+                    }
 
                     var allAssignedPermissions = new List<AssignedContentPermissions>();
                     foreach (var entity in contentEntities)
@@ -229,7 +243,7 @@ namespace Umbraco.Web.Models.Mapping
                 });
 
             //Important! Currently we are never mapping to multiple UserDisplay objects but if we start doing that
-            // this will cause an N+1 and we'll need to change how this works.
+            // this will cause an N+1 and we'll need to change how this works.
             config.CreateMap<IUser, UserDisplay>()
                 .ForMember(detail => detail.Avatars, opt => opt.MapFrom(user => user.GetCurrentUserAvatarUrls(applicationContext.Services.UserService, applicationContext.ApplicationCache.RuntimeCache)))
                 .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.Username))
@@ -253,7 +267,7 @@ namespace Umbraco.Web.Models.Mapping
                         "media/mediaRoot")))
                 .ForMember(
                     detail => detail.StartContentIds,
-                    opt => opt.MapFrom(user => GetStartNodeValues(
+                    opt => opt.MapFrom(user => GetStartNodeValues(
                         user.StartContentIds.ToArray(),
                         applicationContext.Services.TextService,
                         applicationContext.Services.EntityService,
@@ -261,7 +275,7 @@ namespace Umbraco.Web.Models.Mapping
                         "content/contentRoot")))
                 .ForMember(
                     detail => detail.StartMediaIds,
-                    opt => opt.MapFrom(user => GetStartNodeValues(
+                    opt => opt.MapFrom(user => GetStartNodeValues(
                         user.StartMediaIds.ToArray(),
                         applicationContext.Services.TextService,
                         applicationContext.Services.EntityService,
@@ -328,7 +342,7 @@ namespace Umbraco.Web.Models.Mapping
                     //the best we can do here is to return the user's first user group as a IUserType object
                     //but we should attempt to return any group that is the built in ones first
                     var groups = user.Groups.ToArray();
-                    detail.UserGroups = user.Groups.Select(x => x.Alias).ToArray();
+                    detail.UserGroups = user.Groups.Select(x => x.Alias).ToArray();
 
                     if (groups.Length == 0)
                     {
@@ -369,8 +383,8 @@ namespace Umbraco.Web.Models.Mapping
             
         }
 
-        private IEnumerable<EntityBasic> GetStartNodeValues(int[] startNodeIds,
-            ILocalizedTextService textService, IEntityService entityService, UmbracoObjectTypes objectType,
+        private IEnumerable<EntityBasic> GetStartNodeValues(int[] startNodeIds,
+            ILocalizedTextService textService, IEntityService entityService, UmbracoObjectTypes objectType,
             string localizedKey)
         {
             if (startNodeIds.Length > 0)
@@ -385,7 +399,7 @@ namespace Umbraco.Web.Models.Mapping
                 return startNodes;
             }
             return Enumerable.Empty<EntityBasic>();
-        }
+        }
 
         private void MapUserGroupBasic(ServiceContext services, dynamic group, UserGroupBasic display)
         {

src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs

@@ -85,6 +85,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         /// </returns>
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
+            if (source == null)
+                return null;
+
             if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
             {
                 var nodeIds =

src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs

@@ -251,7 +251,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
                 // move to parent node
                 e = (XmlElement) e.ParentNode;
-                id = int.Parse(e.GetAttribute("id"));
+                id = int.Parse(e.GetAttribute("id"), CultureInfo.InvariantCulture);
                 hasDomains = id != -1 && domainHelper.NodeHasDomains(id);
             }
 

src/Umbraco.Web/Umbraco.Web.csproj

@@ -105,9 +105,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
       <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>

src/Umbraco.Web/WebBootManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Configuration;
@@ -9,6 +10,7 @@ using System.Web.Http;
 using System.Web.Http.Dispatcher;
 using System.Web.Mvc;
 using System.Web.Routing;
+using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
 using Examine.Providers;
 using Umbraco.Core;
@@ -104,16 +106,7 @@ namespace Umbraco.Web
             _examineStartup = new ExamineStartup(ApplicationContext);
             _examineStartup.Initialize();
 
-            // Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
-            ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper.FileMapVirtualFolder = "~/App_Data/TEMP/ClientDependency";
-            ClientDependency.Core.CompositeFiles.Providers.BaseCompositeFileProcessingProvider.UrlTypeDefault = ClientDependency.Core.CompositeFiles.Providers.CompositeUrlType.Base64QueryStrings;
-
-            var section = ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection;
-            if (section != null)
-            {
-                //set the max url length for CDF to be the smallest of the max query length, max request length
-                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(section.MaxQueryStringLength, section.MaxRequestLength);
-            }
+            ConfigureClientDependency();
 
             //set master controller factory
             ControllerBuilder.Current.SetControllerFactory(
@@ -130,14 +123,6 @@ namespace Umbraco.Web
             ////add the profiling action filter
             //GlobalFilters.Filters.Add(new ProfilingActionFilter());
 
-            //Register a custom renderer - used to process property editor dependencies
-            var renderer = new DependencyPathRenderer();
-            renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection
-            {
-                { "compositeFileHandlerPath", ClientDependencySettings.Instance.CompositeFileHandlerPath }
-            });
-            ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
-
             // Disable the X-AspNetMvc-Version HTTP Header
             MvcHandler.DisableMvcResponseHeader = true;
 
@@ -274,6 +259,45 @@ namespace Umbraco.Web
             RoutePluginControllers();
         }
 
+        private void ConfigureClientDependency()
+        {
+            // Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
+            XmlFileMapper.FileMapDefaultFolder = "~/App_Data/TEMP/ClientDependency";
+            BaseCompositeFileProcessingProvider.UrlTypeDefault = CompositeUrlType.Base64QueryStrings;
+
+            // Now we need to detect if we are running umbracoLocalTempStorage as EnvironmentTemp and in that case we want to change the CDF file
+            // location to be there
+            if (GlobalSettings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp)
+            {
+                var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                    //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                    // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                    // utilizing an old path
+                    appDomainHash);
+                
+                //set the file map and composite file default location to the %temp% location
+                BaseCompositeFileProcessingProvider.CompositeFilePathDefaultFolder
+                    = XmlFileMapper.FileMapDefaultFolder
+                    = Path.Combine(cachePath, "ClientDependency");
+            }
+
+            var section = ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection;
+            if (section != null)
+            {
+                //set the max url length for CDF to be the smallest of the max query length, max request length
+                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(section.MaxQueryStringLength, section.MaxRequestLength);
+            }
+
+            //Register a custom renderer - used to process property editor dependencies
+            var renderer = new DependencyPathRenderer();
+            renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection
+            {
+                { "compositeFileHandlerPath", ClientDependencySettings.Instance.CompositeFileHandlerPath }
+            });
+            ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
+        }
+
         private void RoutePluginControllers()
         {
             var umbracoPath = GlobalSettings.UmbracoMvcArea;

src/Umbraco.Web/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.89" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx

@@ -7,6 +7,7 @@
 <style type="text/css">
 .gridHeader{border-bottom:2px solid #D9D7D7;}
 .gridItem{border-color: #D9D7D7;}
+html, body {overflow: initial;}
 </style>
 
 <umb:CssInclude ID="CssInclude2" runat="server" FilePath="Tree/treeIcons.css" PathNameAlias="UmbracoClient" />

src/umbraco.cms/businesslogic/Packager/Installer.cs

@@ -831,7 +831,9 @@ namespace umbraco.cms.businesslogic.packager
             var installationSummary = insPack.GetInstallationSummary(contentTypeService, dataTypeService, fileService, localizationService, macroService);
             installationSummary.PackageInstalled = true;
 
-            var args = new ImportPackageEventArgs<InstallationSummary>(installationSummary, false);
+            var metadata = insPack.GetMetaData();
+
+            var args = new ImportPackageEventArgs<InstallationSummary>(installationSummary, metadata, false);
             PackagingService.OnImportedPackage(args);
         }
     }

src/umbraco.cms/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />

src/umbraco.cms/umbraco.cms.csproj

@@ -106,8 +106,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>

src/umbraco.controls/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
 </packages>

src/umbraco.controls/umbraco.controls.csproj

@@ -68,8 +68,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

src/umbraco.editorControls/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
 </packages>

src/umbraco.editorControls/umbraco.editorControls.csproj

@@ -114,8 +114,8 @@
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>