bumps version, checks for feature resolver

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html

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

@@ -28,7 +28,7 @@
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.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.4, 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

@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.8.0")]
-[assembly: AssemblyInformationalVersion("7.8.0-beta005")]
+[assembly: AssemblyInformationalVersion("7.8.0-beta007")]

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -146,7 +146,7 @@ namespace Umbraco.Core.Cache
         #region Insert
         #endregion
 
-        private class NoopLocker : DisposableObject
+        private class NoopLocker : DisposableObjectSlim
         {
             protected override void DisposeResources()
             { }

src/Umbraco.Core/DisposableObject.cs

@@ -2,60 +2,60 @@ using System;
 using System.Threading;
 
 namespace Umbraco.Core
-{
-	/// <summary>
-	/// Abstract implementation of IDisposable.
-	/// </summary>
-	/// <remarks>
-	/// Can also be used as a pattern for when inheriting is not possible.
-	/// 
+{
+    /// <summary>
+    /// Abstract implementation of IDisposable.
+    /// </summary>
+    /// <remarks>
+    /// Can also be used as a pattern for when inheriting is not possible.
+    /// 
     /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
     /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
     /// 
     /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
     /// has allocated disposable objects, it should take care of disposing them.
-	/// </remarks>
-	public abstract class DisposableObject : IDisposable
-	{
-		private bool _disposed;
-	    private readonly object _locko = new object();
-
-		// gets a value indicating whether this instance is disposed.
+    /// </remarks>
+    public abstract class DisposableObject : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
         // for internal tests only (not thread safe)
         //TODO make this internal + rename "Disposed" when we can break compatibility
-		public bool IsDisposed { get { return _disposed; } }
-
-		// implements IDisposable
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-        // finalizer
-		~DisposableObject()
-		{
-			Dispose(false);
-		}
+        public bool IsDisposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        // finalizer
+        ~DisposableObject()
+        {
+            Dispose(false);
+        }
 
         //TODO make this private, non-virtual when we can break compatibility
-        protected virtual void Dispose(bool disposing)
-		{
-		    lock (_locko)
-		    {
-		        if (_disposed) return;
-		        _disposed = true;
-		    }
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
 
             DisposeUnmanagedResources();
 
             if (disposing)
-                DisposeResources();
-		}
-
-		protected abstract void DisposeResources();
-
-		protected virtual void DisposeUnmanagedResources()
-		{ }
-	}
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+
+        protected virtual void DisposeUnmanagedResources()
+        { }
+    }
 }

src/Umbraco.Core/DisposableObjectSlim.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// This should not be use if there are ubmanaged resources to be disposed, use DisposableObject instead
+    /// </summary>
+    public abstract class DisposableObjectSlim : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        internal bool Disposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
+
+            if (disposing)
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+    }
+}

src/Umbraco.Core/DisposableTimer.cs

@@ -11,8 +11,8 @@ namespace Umbraco.Core
 	/// <summary>
 	/// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
 	/// </summary>
-	public class DisposableTimer : DisposableObject
-	{
+	public class DisposableTimer : DisposableObjectSlim
+    {
 	    private readonly ILogger _logger;
 	    private readonly LogType? _logType;
 	    private readonly IProfiler _profiler;
@@ -209,13 +209,13 @@ namespace Umbraco.Core
                 loggerType,
                 startMessage(),
                 completeMessage());
-        } 
+        }
         #endregion
-
-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
-		protected override void DisposeResources()
+
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
 		{
             if (_profiler != null)
             {

src/Umbraco.Core/Events/EventMessages.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Events
     /// <summary>
     /// Event messages collection
     /// </summary>
-    public sealed class EventMessages : DisposableObject
+    public sealed class EventMessages : DisposableObjectSlim
     {
         private readonly List<EventMessage> _msgs = new List<EventMessage>();
 

src/Umbraco.Core/HashGenerator.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core
     /// This will use the crypto libs to generate the hash and will try to ensure that 
     /// strings, etc... are not re-allocated so it's not consuming much memory.
     /// </remarks>
-    internal class HashGenerator : DisposableObject
+    internal class HashGenerator : DisposableObjectSlim
     {
         public HashGenerator()
         {

src/Umbraco.Core/Manifest/ManifestWatcher.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Manifest
 {
-    internal class ManifestWatcher : DisposableObject
+    internal class ManifestWatcher : DisposableObjectSlim
     {
         private readonly ILogger _logger;
         private readonly List<FileSystemWatcher> _fws = new List<FileSystemWatcher>();

src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Persistence
 	/// it will create one per context, otherwise it will be a global singleton object which is NOT thread safe
 	/// since we need (at least) a new instance of the database object per thread.
 	/// </remarks>
-	internal class DefaultDatabaseFactory : DisposableObject, IDatabaseFactory2
+	internal class DefaultDatabaseFactory : DisposableObjectSlim, IDatabaseFactory2
 	{
 	    private readonly string _connectionStringName;
 	    private readonly ILogger _logger;

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

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
     /// <remarks>
     /// This is limited to objects that are based in the umbracoNode-table.
     /// </remarks>
-    internal class EntityRepository : DisposableObject, IEntityRepository
+    internal class EntityRepository : DisposableObjectSlim, IEntityRepository
     {
         private readonly IDatabaseUnitOfWork _work;
 

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

@@ -9,7 +9,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class FileRepository<TId, TEntity> : DisposableObject, IUnitOfWorkRepository, IRepository<TId, TEntity> 
+    internal abstract class FileRepository<TId, TEntity> : DisposableObjectSlim, IUnitOfWorkRepository, IRepository<TId, TEntity> 
         where TEntity : IFile
     {
         private IUnitOfWork _work;

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

@@ -10,7 +10,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class RepositoryBase : DisposableObject
+    internal abstract class RepositoryBase : DisposableObjectSlim
     {
         private readonly IScopeUnitOfWork _work;
         private readonly CacheHelper _globalCache;

src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
 	/// <summary>
 	/// Represents a scoped unit of work.
 	/// </summary>
-	internal class ScopeUnitOfWork : DisposableObject, IScopeUnitOfWork
+	internal class ScopeUnitOfWork : DisposableObjectSlim, IScopeUnitOfWork
     {
         private readonly Queue<Operation> _operations = new Queue<Operation>();
 	    private readonly IsolationLevel _isolationLevel;

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -18,7 +18,7 @@ using Task = System.Threading.Tasks.Task;
 
 namespace Umbraco.Core.Security
 {
-    public class BackOfficeUserStore : DisposableObject, 
+    public class BackOfficeUserStore : DisposableObjectSlim, 
         IUserStore<BackOfficeIdentityUser, int>, 
         IUserPasswordStore<BackOfficeIdentityUser, int>, 
         IUserEmailStore<BackOfficeIdentityUser, int>, 
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
         /// </summary>
         protected override void DisposeResources()
         {

src/Umbraco.Core/Services/IdkMap.cs

@@ -39,8 +39,16 @@ namespace Umbraco.Core.Services
             int? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
-                    new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                //if it's unknown don't include the nodeObjectType in the query
+                if (umbracoObjectType == UmbracoObjectTypes.Unknown)
+                {
+                    val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id", new { id = key});
+                }
+                else
+                {
+                    val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                        new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                }
                 uow.Commit();
             }
 
@@ -92,8 +100,16 @@ namespace Umbraco.Core.Services
             Guid? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
-                    new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                //if it's unknown don't include the nodeObjectType in the query
+                if (umbracoObjectType == UmbracoObjectTypes.Unknown)
+                {
+                    val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id", new { id });
+                }
+                else
+                {
+                    val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                        new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                }
                 uow.Commit();
             }
 

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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\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>
@@ -349,6 +349,7 @@
     <Compile Include="Deploy\Direction.cs" />
     <Compile Include="Deploy\IFileType.cs" />
     <Compile Include="Deploy\IFileTypeCollection.cs" />
+    <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="EmailSender.cs" />
     <Compile Include="Events\EventDefinitionFilter.cs" />
     <Compile Include="Events\IDeletingMediaFilesEventArgs.cs" />

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.4" 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/Plugins/PluginManagerTests.cs

@@ -286,7 +286,7 @@ AnotherContentFinder
         {
             var trees = _manager.ResolveAttributedTrees();
             // commit 6c5e35ec2cbfa31be6790d1228e0c2faf5f55bc8 brings the count down to 14
-            Assert.AreEqual(8, trees.Count());
+            Assert.AreEqual(6, trees.Count());
         }
 
         [Test]

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.Tests/Scheduling/BackgroundTaskRunnerTests.cs

@@ -548,7 +548,7 @@ namespace Umbraco.Tests.Scheduling
                 runner.Shutdown(false, true);
 
                 // check that task has been disposed (timer has been killed, etc)
-                Assert.IsTrue(task.IsDisposed);
+                Assert.IsTrue(task.Disposed);
             }
         }
 

src/Umbraco.Tests/Services/EntityServiceTests.cs

@@ -533,6 +533,16 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
         }
 
+        [Test]
+        public void EntityService_Can_Get_Key_For_Id_With_Unknown_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetKeyForId(1060, UmbracoObjectTypes.Unknown);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+        }
+
         [Test]
         public void EntityService_Can_Get_Key_For_Id()
         {
@@ -554,6 +564,16 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(result2.Success);
         }
 
+        [Test]
+        public void EntityService_Can_Get_Id_For_Key_With_Unknown_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.Unknown);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(1060, result.Result);
+        }
+
         [Test]
         public void EntityService_Can_Get_Id_For_Key()
         {

src/Umbraco.Web.UI.Client/bower.json

@@ -31,8 +31,7 @@
     "moment": "~2.10.3",
     "ace-builds": "^1.2.3",
     "clipboard": "1.7.1",
-    "font-awesome": "~4.2",
-    "angular-moment": "^1.0.1"
+    "font-awesome": "~4.2"
   },
   "install": {
     "path": "lib-bower",
@@ -60,9 +59,6 @@
         "bower_components/angular-local-storage/dist/angular-local-storage.min.js",
         "bower_components/angular-local-storage/dist/angular-local-storage.min.js.map"
       ],
-      "angular-moment": [
-        "bower_components/angular-moment/angular-moment.min.js"
-      ],
       "tinymce": [
         "bower_components/tinymce/tinymce.min.js"
       ],
@@ -73,8 +69,5 @@
       "jquery-migrate": "bower_components/jquery-migrate/jquery-migrate.min.js",
       "clipboard": "bower_components/clipboard/dist/clipboard.min.js"
     }
-  },
-  "resolutions": {
-    "moment": ">=2.19.3 <3.0.0"
   }
 }

src/Umbraco.Web.UI.Client/src/app.js

@@ -11,8 +11,7 @@ var app = angular.module('umbraco', [
     'ngMobile',
     'tmh.dynamicLocale',
     'ngFileUpload',
-    'LocalStorageModule',
-    'angularMoment'
+    'LocalStorageModule'
 ]);
 
 var packages = angular.module("umbraco.packages", []);

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -84,6 +84,7 @@
     }
 
     function createButtons(content) {
+      $scope.page.buttonGroupState = "init";
       var buttons = contentEditingHelper.configureContentEditorButtons({
         create: $scope.page.isNew,
         content: content,

src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function ContentNodeInfoDirective($timeout, $location, logResource, eventsService, userService, localizationService) {
+    function ContentNodeInfoDirective($timeout, $location, logResource, eventsService, userService, localizationService, dateHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
@@ -86,7 +86,7 @@
                         // get current backoffice user and format dates
                         userService.getCurrentUser().then(function (currentUser) {
                             angular.forEach(data.items, function(item) {
-                                item.timestampFormatted = getLocalDate(item.timestamp, currentUser.locale, 'LLL');
+                                item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL');
                             });
                         });
                     
@@ -199,31 +199,24 @@
             
             function ucfirst(string) {
                 return string.charAt(0).toUpperCase() + string.slice(1);
-            } 
-
-            function getLocalDate(date, culture, format) {
-                if (date) {
-                    var dateVal;
-                    var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
-                    var localOffset = new Date().getTimezoneOffset();
-                    var serverTimeNeedsOffsetting = -serverOffset !== localOffset;
-                    if (serverTimeNeedsOffsetting) {
-                        dateVal = dateHelper.convertToLocalMomentTime(date, serverOffset);
-                    } else {
-                        dateVal = moment(date, 'YYYY-MM-DD HH:mm:ss');
-                    }
-                    return dateVal.locale(culture).format(format);
-                }
             }
 
             function formatDatesToLocal() {
                 // get current backoffice user and format dates
                 userService.getCurrentUser().then(function (currentUser) {
-                    scope.node.createDateFormatted = getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
-                    scope.node.releaseDateMonth = scope.node.releaseDate ? ucfirst(getLocalDate(scope.node.releaseDate, currentUser.locale, 'MMMM')) : null;
-                    scope.node.releaseDateDay = scope.node.releaseDate ? ucfirst(getLocalDate(scope.node.releaseDate, currentUser.locale, 'dddd')) : null;
-                    scope.node.removeDateMonth = scope.node.removeDate ? ucfirst(getLocalDate(scope.node.removeDate, currentUser.locale, 'MMMM')) : null;
-                    scope.node.removeDateDay = scope.node.removeDate ? ucfirst(getLocalDate(scope.node.removeDate, currentUser.locale, 'dddd')) : null;
+                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
+                    
+                    scope.node.releaseDateYear = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'YYYY')) : null;
+                    scope.node.releaseDateMonth = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'MMMM')) : null;
+                    scope.node.releaseDateDayNumber = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'DD')) : null;
+                    scope.node.releaseDateDay = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'dddd')) : null;
+                    scope.node.releaseDateTime = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'HH:mm')) : null;
+                    
+                    scope.node.removeDateYear = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'YYYY')) : null;
+                    scope.node.removeDateMonth = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'MMMM')) : null;
+                    scope.node.removeDateDayNumber = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'DD')) : null;
+                    scope.node.removeDateDay = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'dddd')) : null;
+                    scope.node.removeDateTime = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'HH:mm')) : null;
                 });
             }
 

src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js

@@ -1,20 +1,28 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location) {
+    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper) {
 
         function link(scope, element, attrs, ctrl) {
 
+            var evts = [];
+
             function onInit() {
-
                 scope.allowOpenMediaType = true;
-
                 // get document type details
                 scope.mediaType = scope.node.contentType;
-
                 // get node url
                 scope.nodeUrl = scope.node.mediaLink;
+                // make sure dates are formatted to the user's locale
+                formatDatesToLocal();
+            }
 
+            function formatDatesToLocal() {
+                // get current backoffice user and format dates
+                userService.getCurrentUser().then(function (currentUser) {
+                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
+                    scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL');
+                });
             }
 
             scope.openMediaType = function (mediaType) {
@@ -22,6 +30,20 @@
                 var url = "/settings/mediaTypes/edit/" + mediaType.id;
                 $location.path(url);
             };
+            
+            // watch for content updates - reload content when node is saved, published etc.
+            scope.$watch('node.updateDate', function(newValue, oldValue){
+                if(!newValue) { return; }
+                if(newValue === oldValue) { return; }
+                formatDatesToLocal();
+            });
+
+            //ensure to unregister from all events!
+            scope.$on('$destroy', function () {
+                for (var e in evts) {
+                    eventsService.unsubscribe(evts[e]);
+                }
+            });
 
             onInit();
 

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/common/services/tour.service.js

@@ -37,7 +37,7 @@
          *
          * @description
          * Registers a tour in the service
-		 * @param {Object} tour The tour you want to register in the service
+         * @param {Object} tour The tour you want to register in the service
          * @param {String} tour.name The tour name
          * @param {String} tour.alias The tour alias
          * @param {Array} tour.steps Array of tour steps
@@ -46,7 +46,7 @@
          * @param {DomElement} tour.step.element Highlight a DOM-element
          * @param {Boolean} tour.step.elementPreventClick Adds invisible layer on top of highligted element to prevent all clicks and interaction with it
          * @param {Number} tour.step.backdropOpacity Sets the backdrop opacity (default 0.4)
-		 */
+         */
         function registerTour(newTour) {
             validateTour(newTour);
             validateTourRegistration(newTour);
@@ -61,8 +61,8 @@
          *
          * @description
          * Registers an array of tours in the service
-		 * @param {Array} tours The tours to register in the service
-		 */
+         * @param {Array} tours The tours to register in the service
+         */
         function registerTours(newTours) {
             angular.forEach(newTours, function(newTour){
                 validateTour(newTour);
@@ -79,8 +79,8 @@
          *
          * @description
          * Unregisters a tour in the service
-		 * @param {String} tourAlias The tour alias of the tour you want to unregister
-		 */
+         * @param {String} tourAlias The tour alias of the tour you want to unregister
+         */
         function unregisterTour(tourAlias) {
             tours = tours.filter(function( obj ) {
                 return obj.alias !== tourAlias;
@@ -95,8 +95,8 @@
          *
          * @description
          * Unregisters a tour in the service
-		 * @param {String} tourGroupName The name of the tour group you want to unregister
-		 */
+         * @param {String} tourGroupName The name of the tour group you want to unregister
+         */
         function unregisterTourGroup(tourGroup) {
             tours = tours.filter(function( obj ) {
                 return obj.group !== tourGroup;
@@ -118,8 +118,8 @@
          *
          * @description
          * Raises an event to start a tour
-		 * @param {Object} tour The tour which should be started
-		 */
+         * @param {Object} tour The tour which should be started
+         */
         function startTour(tour) {
             validateTour(tour);
             eventsService.emit("appState.tour.start", tour);
@@ -133,7 +133,7 @@
          *
          * @description
          * Raises an event to end the current tour
-		 */
+         */
         function endTour(tour) {
             eventsService.emit("appState.tour.end", tour);
             currentTour = null;
@@ -164,7 +164,7 @@
          * @description
          * Completes a tour for the user, raises an event and returns a promise
          * @param {Object} tour The tour which should be completed
-		 */
+         */
         function completeTour(tour) {
             var deferred = $q.defer();
             tour.completed = true;
@@ -186,26 +186,12 @@
          * @description
          * Returns the current tour
          * @returns {Object} Returns the current tour
-		 */
+         */
         function getCurrentTour() {
             //TODO: This should be reset if a new user logs in
             return currentTour;
         }
 
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#getAllTours
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Returns a promise of all tours with the current user statuses
-         * @returns {Array} All registered tours
-		 */
-        function getAllTours() {
-            var tours = getTours();
-            return setTourStatuses(tours);
-        }
-
         /**
          * @ngdoc method
          * @name umbraco.services.tourService#getGroupedTours
@@ -214,7 +200,7 @@
          * @description
          * Returns a promise of grouped tours with the current user statuses
          * @returns {Array} All registered tours grouped by tour group
-		 */
+         */
         function getGroupedTours() {
             var deferred = $q.defer();
             var tours = getTours();
@@ -265,7 +251,7 @@
          * Returns a promise of the tour found by alias with the current user statuses
          * @param {Object} tourAlias The tour alias of the tour which should be returned
          * @returns {Object} Tour object
-		 */
+         */
         function getTourByAlias(tourAlias) {
             var deferred = $q.defer();
             var tours = getTours();
@@ -276,38 +262,6 @@
             return deferred.promise;
         }
 
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#getCompletedTours
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Returns a promise of completed tours for the user
-         * @returns {Array} Array of completed tour aliases
-		 */
-        function getCompletedTours() {
-            var deferred = $q.defer();
-            currentUserResource.getTours().then(function (storedTours) {
-                var completedTours = _.where(storedTours, { completed: true });
-                var aliases = _.pluck(completedTours, "alias");
-                deferred.resolve(aliases);
-            });
-            return deferred.promise;
-        }
-
-        /**
-         * Returns a promise of disabled tours for the user
-         */
-        function getDisabledTours() {
-            var deferred = $q.defer();
-            currentUserResource.getTours().then(function (storedTours) {
-                var disabledTours = _.where(storedTours, { disabled: true });
-                var aliases = _.pluck(disabledTours, "alias");
-                deferred.resolve(aliases);
-            });
-            return deferred.promise;
-        }
-
         ///////////
 
         /**
@@ -378,40 +332,6 @@
             return deferred.promise;
         }
 
-        function saveInLocalStorage(tour) {
-            var storedTours = [];
-            var tourFound = false;
-
-            // check if something exists in local storage
-            if (localStorageService.get(localStorageKey)) {
-                storedTours = localStorageService.get(localStorageKey);
-            }
-
-            // update existing tour in localstorage if it's already there
-            if (storedTours.length > 0) {
-                angular.forEach(storedTours, function (storedTour) {
-                    if (storedTour.alias === tour.alias) {
-                        storedTour.completed = storedTour.completed ? storedTour.completed : tour.completed;
-                        storedTour.disabled = storedTour.disabled ? storedTour.disabled : tour.disabled;
-                        tourFound = true;
-                    }
-                });
-            }
-
-            // create new entry in local storage
-            if (!tourFound) {
-                var storageObject = {
-                    "alias": tour.alias,
-                    "completed": tour.completed,
-                    "disabled": tour.disabled
-                };
-                storedTours.push(storageObject);
-            }
-
-            localStorageService.set(localStorageKey, storedTours);
-
-        }
-
         var service = {
             registerAllTours: registerAllTours,
             registerTour: registerTour,
@@ -423,14 +343,8 @@
             disableTour: disableTour,
             completeTour: completeTour,
             getCurrentTour: getCurrentTour,
-            //TODO: Not used
-            getAllTours: getAllTours,
             getGroupedTours: getGroupedTours,
-            getTourByAlias: getTourByAlias,
-            //TODO: Not used
-            getCompletedTours: getCompletedTours,
-            //TODO: Not used
-            getDisabledTours: getDisabledTours,
+            getTourByAlias: getTourByAlias
         };
 
         return service;
@@ -439,4 +353,4 @@
 
     angular.module("umbraco.services").factory("tourService", tourService);
 
-})();
+})();

src/Umbraco.Web.UI.Client/src/common/services/util.service.js

@@ -90,6 +90,21 @@ function dateHelper() {
       //create a moment with the iso format which will include the offset with the correct time
       // then convert it to local time
       return moment.parseZone(isoFormat).local();
+    },
+
+    getLocalDate: function (date, culture, format) {
+      if (date) {
+        var dateVal;
+        var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
+        var localOffset = new Date().getTimezoneOffset();
+        var serverTimeNeedsOffsetting = -serverOffset !== localOffset;
+        if (serverTimeNeedsOffsetting) {
+          dateVal = dateHelper.convertToLocalMomentTime(date, serverOffset);
+        } else {
+          dateVal = moment(date, 'YYYY-MM-DD HH:mm:ss');
+        }
+        return dateVal.locale(culture).format(format);
+      }
     }
 
   };
@@ -583,7 +598,7 @@ function queryStrings($window) {
 
   var pl = /\+/g;  // Regex for replacing addition symbol with a space
   var search = /([^&=]+)=?([^&]*)/g;
-  var decode = function (s) { return decodeURIComponent(s.replace(pl, " ")); };
+  var decode = function (s) { return decodeURIComponent(s.replace(pl, " ")); };
 
   return {
    

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,120 +1,103 @@
 <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'"
+    <!-- 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'"
 								data-element="editor-{{systemDataType.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(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'"
 								data-element="editor-{{dataType.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-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"
 		data-element="overlay-editor-settings"
-		ng-if="vm.editorSettingsOverlay.show"
-		model="vm.editorSettingsOverlay"
-		position="right"
-		view="vm.editorSettingsOverlay.view">
-	</umb-overlay>
-
+                 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,115 +1,115 @@
 <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 -->
+                <!-- Search form -->
         <div data-element="global-search" id="search-form">
-          <div class="umb-modalcolumn-header">
+                    <div class="umb-modalcolumn-header">
 
-            <form class="form-search" novalidate>
-              <i class="icon-search"></i>
+                        <form class="form-search" novalidate>
+                            <i class="icon-search"></i>
               <input data-element="global-search-field"
                      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>
+                                   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/components/content/umb-content-node-info.html

@@ -109,9 +109,9 @@
                                 </div>
 
                                 <div class="date-container__date" ng-if="node.releaseDate">
-                                    <div class="date-wrapper__date">{{node.releaseDateMonth}} {{node.releaseDate | amDateFormat:'YYYY'}}</div>
-                                    <div class="date-wrapper__number">{{node.releaseDate | amDateFormat:'DD'}}</div>
-                                    <div class="date-wrapper__date">{{node.releaseDateDay}} {{node.releaseDate | amDateFormat:'HH:mm'}}</div>
+                                    <div class="date-wrapper__date">{{node.releaseDateMonth}} {{node.releaseDateYear}}</div>
+                                    <div class="date-wrapper__number">{{node.releaseDateDayNumber}}</div>
+                                    <div class="date-wrapper__date">{{node.releaseDateDay}} {{node.releaseDateTime}}</div>
                                 </div>
 
                                 <a href="" ng-if="!node.releaseDate" class="bold" style="color: #00aea2; text-decoration: underline;"><localize key="content_setDate">Set date</localize></a>                                                    
@@ -141,9 +141,9 @@
                                 </div>
                                 
                                 <div class="date-container__date" ng-if="node.removeDate">
-                                    <div class="date-wrapper__date">{{node.removeDateMonth}} {{node.removeDate | amDateFormat:'YYYY'}}</div>
-                                    <div class="date-wrapper__number">{{node.removeDate | amDateFormat:'DD'}}</div>
-                                    <div class="date-wrapper__date">{{node.removeDateDay}} {{node.removeDate | amDateFormat:'HH:mm'}}</div>
+                                    <div class="date-wrapper__date">{{node.removeDateMonth}} {{node.removeDateYear}}</div>
+                                    <div class="date-wrapper__number">{{node.removeDateDayNumber}}</div>
+                                    <div class="date-wrapper__date">{{node.removeDateDay}} {{node.removeDateTime}}</div>
                                 </div>
 
                                 <a href="" ng-if="!node.removeDate" class="bold" style="color: #00aea2; text-decoration: underline;"><localize key="content_setDate">Set date</localize></a>

src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html

@@ -30,11 +30,11 @@
             <umb-box-content class="block-form">
                 
                 <umb-control-group data-element="node-info-create-date" label="@content_createDate">
-                    {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }}
+                    {{node.createDateFormatted}} by {{ node.owner.name }}
                 </umb-control-group>
 
                 <umb-control-group data-element="node-info-update-date" label="@content_updateDate">
-                    {{node.updateDate | amDateFormat:'MMMM Do YYYY, HH:mm'}}
+                    {{node.updateDateFormatted}}
                 </umb-control-group>
             
                 <umb-control-group data-element="node-info-media-type" label="@content_mediatype">

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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\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>

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.4" 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

@@ -1446,7 +1446,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>
@@ -1454,7 +1454,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>

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/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/BackOfficeTourStep.cs

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using Newtonsoft.Json.Linq;
 
 namespace Umbraco.Web.Models
 {
@@ -22,5 +23,11 @@ namespace Umbraco.Web.Models
         public float? BackdropOpacity { get; set; }
         [DataMember(Name = "event")]
         public string Event { get; set; }
+        [DataMember(Name = "view")]
+        public string View { get; set; }
+        [DataMember(Name = "eventElement")]
+        public string EventElement { get; set; }
+        [DataMember(Name = "customProperties")]
+        public JObject CustomProperties { get; set; }
     }
 }

src/Umbraco.Web/Properties/AssemblyInfo.cs

@@ -47,6 +47,7 @@ using System.Security;
 [assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")]
 [assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
 
+[assembly: InternalsVisibleTo("Umbraco.Headless")]
 
 //allow custom unit-testing code to access internals through custom adapters
 [assembly: InternalsVisibleTo("Umbraco.VisualStudio")]          // backwards compat.

src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Web.Scheduling
     /// depending on whether the task is implemented as a sync or async method, and then
     /// optionnally overriding RunsOnShutdown, to indicate whether the latched task should run
     /// immediately on shutdown, or just be abandonned (default).</remarks>
-    public abstract class LatchedBackgroundTaskBase : DisposableObject, ILatchedBackgroundTask
+    public abstract class LatchedBackgroundTaskBase : DisposableObjectSlim, ILatchedBackgroundTask
     {
         private TaskCompletionSource<bool> _latch;
 

src/Umbraco.Web/Scheduling/RecurringTaskBase.cs

@@ -72,7 +72,7 @@ namespace Umbraco.Web.Scheduling
             if (_runner.TryAdd(this))
                 _timer.Change(_periodMilliseconds, 0);
             else
-                Dispose(true);
+                Dispose();
         }
 
         /// <summary>

src/Umbraco.Web/Security/WebSecurity.cs

@@ -23,7 +23,7 @@ namespace Umbraco.Web.Security
     /// <summary>
     /// A utility class used for dealing with USER security in Umbraco
     /// </summary>
-    public class WebSecurity : DisposableObject
+    public class WebSecurity : DisposableObjectSlim
     {
         private HttpContextBase _httpContext;
         private ApplicationContext _applicationContext;

src/Umbraco.Web/TourFilterResolver.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Web.Models;
@@ -33,6 +35,39 @@ namespace Umbraco.Web
                 _instances.Add(filter);
         }
 
+        /// <summary>
+        /// Helper method for adding a filter by exact plugin name
+        /// </summary>
+        /// <param name="pluginName">Regex string used for matching</param>
+        public void AddFilterByPlugin(string pluginName)
+        {
+            pluginName = pluginName.EnsureStartsWith("^").EnsureEndsWith("$");
+            using (Resolution.Configuration)
+                _instances.Add(BackOfficeTourFilter.FilterPlugin(new Regex(pluginName, RegexOptions.IgnoreCase)));
+        }
+
+        /// <summary>
+        /// Helper method for adding a filter by exact file name
+        /// </summary>
+        /// <param name="file"></param>
+        public void AddFilterByFile(string file)
+        {
+            file = file.EnsureStartsWith("^").EnsureEndsWith("$");
+            using (Resolution.Configuration)
+                _instances.Add(BackOfficeTourFilter.FilterFile(new Regex(file, RegexOptions.IgnoreCase)));
+        }
+
+        /// <summary>
+        /// Helper method for adding a filter by exact tour alias
+        /// </summary>
+        /// <param name="alias"></param>
+        public void AddFilterByAlias(string alias)
+        {
+            alias = alias.EnsureStartsWith("^").EnsureEndsWith("$");
+            using (Resolution.Configuration)
+                _instances.Add(BackOfficeTourFilter.FilterAlias(new Regex(alias, RegexOptions.IgnoreCase)));
+        }
+
         /// <summary>
         /// Removes a filter instance
         /// </summary>

src/Umbraco.Web/UI/JavaScript/JsInitialize.js

@@ -4,7 +4,6 @@
     'lib/underscore/underscore-min.js',
 
     'lib/moment/moment-with-locales.js',
-    'lib/angular-moment/angular-moment.min.js',
 
     'lib/jquery-ui/jquery-ui.min.js',
     'lib/jquery-ui-touch-punch/jquery.ui.touch-punch.js',

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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\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/UmbracoContext.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Web
     /// <summary>
     /// Class that encapsulates Umbraco information of a specific HTTP request
     /// </summary>
-    public class UmbracoContext : DisposableObject, IDisposeOnRequestEnd
+    public class UmbracoContext : DisposableObjectSlim, IDisposeOnRequestEnd
     {
         internal const string HttpContextItemName = "Umbraco.Web.UmbracoContext";
         private static readonly object Locker = new object();

src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs

@@ -12,6 +12,10 @@ namespace Umbraco.Web.WebApi.Filters
     {
         protected override bool IsAuthorized(HttpActionContext actionContext)
         {
+            //if no features resolver has been set then return true, this will occur in unit tests and we don't want users to have to set a resolver
+            //just so their unit tests work.
+            if (FeaturesResolver.HasCurrent == false) return true;
+
             var controllerType = actionContext.ControllerContext.ControllerDescriptor.ControllerType;
             return FeaturesResolver.Current.Features.IsEnabled(controllerType);
         }

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;
@@ -105,16 +107,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(
@@ -131,14 +124,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;
 
@@ -275,6 +260,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.4" 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/Repositories/Repository.cs

@@ -14,7 +14,7 @@ using Umbraco.Core.IO;
 namespace umbraco.cms.businesslogic.packager.repositories
 {
     [Obsolete("This should not be used and will be removed in future Umbraco versions")]
-    public class Repository : DisposableObject
+    public class Repository : DisposableObjectSlim
     {        
         public string Guid { get; private set; }
 
@@ -289,7 +289,7 @@ namespace umbraco.cms.businesslogic.packager.repositories
         }
 
         /// <summary>
-        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
         /// </summary>
         protected override void DisposeResources()
         {

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.4" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Tidy.Net" version="1.0.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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\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.4" 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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\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.4" 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.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>