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

.gitignore

@@ -139,4 +139,5 @@ src/PrecompiledWeb/*
 
 build.out/
 build.tmp/
-build/Modules/*/temp/
+build/Modules/*/temp/
+/src/.idea/*

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,17 +28,17 @@
       <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)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
+      <dependency id="Examine" version="[0.1.89, 1.0.0)" />
       <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
       <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.8, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
 	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
     </dependencies>
@@ -32,6 +32,7 @@
     <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
     <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
     <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
     <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
     <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
     <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />

build/NuSpecs/tools/trees.config.install.xdt

@@ -79,14 +79,14 @@
   <add sortOrder="1" alias="dataTypes" application="developer"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes(sortOrder)" />
-	   
-  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
+
+  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, umbraco"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" 
+  <add initialize="true" sortOrder="5" alias="xslt" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.XsltTreeController, umbraco"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -49,11 +49,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/SolutionInfo.cs

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

src/Umbraco.Core/ApplicationContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Threading;
 using Semver;
@@ -261,7 +262,7 @@ namespace Umbraco.Core
         /// - http://issues.umbraco.org/issue/U4-5728
         /// - http://issues.umbraco.org/issue/U4-5391
         /// </remarks>
-        internal string UmbracoApplicationUrl
+        public string UmbracoApplicationUrl
         {
             get
             {
@@ -269,9 +270,21 @@ namespace Umbraco.Core
                 return _umbracoApplicationUrl;
             }
         }
+
+        /// <summary>
+        /// Resets the url.
+        /// </summary>
+        public void ResetUmbracoApplicationUrl()
+        {
+            _umbracoApplicationUrl = null;
+        }
 
 	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
+	    internal string _umbracoApplicationUrl;
+
+        internal List<string> _umbracoApplicationDomains = new List<string>();
+
+        internal string _umbracoApplicationDeploymentId;
 
         private Lazy<bool> _configured;
         internal MainDom MainDom { get; private set; }

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/Collections/TypeList.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a list of types.
+    /// </summary>
+    /// <remarks>Types in the list are, or derive from, or implement, the base type.</remarks>
+    /// <typeparam name="TBase">The base type.</typeparam>
+    internal class TypeList<TBase>
+    {
+        private readonly List<Type> _list = new List<Type>();
+
+        /// <summary>
+        /// Adds a type to the list.
+        /// </summary>
+        /// <typeparam name="T">The type to add.</typeparam>
+        public void Add<T>()
+            where T : TBase
+        {
+            _list.Add(typeof(T));
+        }
+
+        /// <summary>
+        /// Determines whether a type is in the list.
+        /// </summary>
+        public bool Contains(Type type)
+        {
+            return _list.Contains(type);
+        }
+    }
+}

src/Umbraco.Core/Constants-Applications.cs

@@ -73,6 +73,11 @@
             /// </summary>
             public const string Media = "media";
 
+            /// <summary>
+            /// alias for the macro tree.
+            /// </summary>
+            public const string Macros = "macros";
+            
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>

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/Events/ScopeEventDispatcherBase.cs

@@ -76,260 +76,257 @@ namespace Umbraco.Core.Events
         {
             if (_events == null)
                 return Enumerable.Empty<IEventDefinition>();
-            
+
+            IReadOnlyList<IEventDefinition> events;
             switch (filter)
             {
                 case EventDefinitionFilter.All:
-                    return FilterSupersededAndUpdateToLatestEntity(_events);
+                    events = _events;
+                    break;
                 case EventDefinitionFilter.FirstIn:
                     var l1 = new OrderedHashSet<IEventDefinition>();
                     foreach (var e in _events)
-                    {
                         l1.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l1);
+                    events = l1;
+                    break;
                 case EventDefinitionFilter.LastIn:
                     var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
                     foreach (var e in _events)
-                    {
                         l2.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l2);
+                    events = l2;
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException("filter", filter, null);
             }
+
+            return FilterSupersededAndUpdateToLatestEntity(events);
         }
-        
-        private class EventDefinitionTypeData
+
+        private class EventDefinitionInfos
         {
             public IEventDefinition EventDefinition { get; set; }
-            public Type EventArgType { get; set; }
-            public SupersedeEventAttribute[] SupersedeAttributes { get; set; }
+            public Type[] SupersedeTypes { get; set; }
         }
-        
-        /// <summary>
-        /// This will iterate over the events (latest first) and filter out any events or entities in event args that are included 
-        /// in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
-        /// to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
-        /// </summary>
-        /// <param name="events"></param>
-        /// <returns></returns>
-        private static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
+
+        // fixme
+        // this is way too convoluted, the superceede attribute is used only on DeleteEventargs to specify
+        // that it superceeds save, publish, move and copy - BUT - publish event args is also used for
+        // unpublishing and should NOT be superceeded - so really it should not be managed at event args
+        // level but at event level
+        //
+        // what we want is:
+        // if an entity is deleted, then all Saved, Moved, Copied, Published events prior to this should
+        // not trigger for the entity - and even though, does it make any sense? making a copy of an entity
+        // should ... trigger?
+        //
+        // not going to refactor it all - we probably want to *always* trigger event but tell people that
+        // due to scopes, they should not expected eg a saved entity to still be around - however, now,
+        // going to write a ugly condition to deal with U4-10764
+
+        // iterates over the events (latest first) and filter out any events or entities in event args that are included
+        // in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
+        // to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
+        internal static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
         {
-            //used to keep the 'latest' entity and associated event definition data
-            var allEntities = new List<Tuple<IEntity, EventDefinitionTypeData>>();
-
-            //tracks all CancellableObjectEventArgs instances in the events which is the only type of args we can work with
-            var cancelableArgs = new List<CancellableObjectEventArgs>();
+            // keeps the 'latest' entity and associated event data
+            var entities = new List<Tuple<IEntity, EventDefinitionInfos>>();
 
+            // collects the event definitions
+            // collects the arguments in result, that require their entities to be updated
             var result = new List<IEventDefinition>();
+            var resultArgs = new List<CancellableObjectEventArgs>();
 
-            //This will eagerly load all of the event arg types and their attributes so we don't have to continuously look this data up
-            var allArgTypesWithAttributes = events.Select(x => x.Args.GetType())
+            // eagerly fetch superceeded arg types for each arg type
+            var argTypeSuperceeding = events.Select(x => x.Args.GetType())
                 .Distinct()
-                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).ToArray());
-               
-            //Iterate all events and collect the actual entities in them and relates them to their corresponding EventDefinitionTypeData
-            //we'll process the list in reverse because events are added in the order they are raised and we want to filter out
-            //any entities from event args that are not longer relevant 
-            //(i.e. if an item is Deleted after it's Saved, we won't include the item in the Saved args)
+                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).Select(y => y.SupersededEventArgsType).ToArray());
+
+            // iterate over all events and filter
+            //
+            // process the list in reverse, because events are added in the order they are raised and we want to keep
+            // the latest (most recent) entities and filter out what is not relevant anymore (too old), eg if an entity
+            // is Deleted after being Saved, we want to filter out the Saved event
             for (var index = events.Count - 1; index >= 0; index--)
             {
-                var eventDefinition = events[index];
+                var def = events[index];
 
-                var argType = eventDefinition.Args.GetType();
-                var attributes = allArgTypesWithAttributes[eventDefinition.Args.GetType()];
-
-                var meta = new EventDefinitionTypeData
+                var infos = new EventDefinitionInfos
                 {
-                    EventDefinition = eventDefinition,
-                    EventArgType = argType,
-                    SupersedeAttributes = attributes
+                    EventDefinition = def,
+                    SupersedeTypes = argTypeSuperceeding[def.Args.GetType()]
                 };
 
-                var args = eventDefinition.Args as CancellableObjectEventArgs;
-                if (args != null)
+                var args = def.Args as CancellableObjectEventArgs;
+                if (args == null)
                 {
-                    var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-
-                    if (list == null)
+                    // not a cancellable event arg, include event definition in result
+                    result.Add(def);
+                }
+                else
+                {
+                    // event object can either be a single object or an enumerable of objects
+                    // try to get as an enumerable, get null if it's not
+                    var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
+                    if (eventObjects == null)
                     {
-                        //extract the event object
-                        var obj = args.EventObject as IEntity;
-                        if (obj != null)
+                        // single object, cast as an IEntity
+                        // if cannot cast, cannot filter, nothing - just include event definition in result
+                        var eventEntity = args.EventObject as IEntity;
+                        if (eventEntity == null)
                         {
-                            //Now check if this entity already exists in other event args that supersede this current event arg type
-                            if (IsFiltered(obj, meta, allEntities) == false)
-                            {
-                                //if it's not filtered we can adde these args to the response
-                                cancelableArgs.Add(args);
-                                result.Add(eventDefinition);
-                                //track the entity
-                                allEntities.Add(Tuple.Create(obj, meta));
-                            }
+                            result.Add(def);
+                            continue;
                         }
-                        else
+
+                        // look for this entity in superceding event args
+                        // found = must be removed (ie not added), else track
+                        if (IsSuperceeded(eventEntity, infos, entities) == false)
                         {
-                            //Can't retrieve the entity so cant' filter or inspect, just add to the output
-                            result.Add(eventDefinition);                            
+                            // track
+                            entities.Add(Tuple.Create(eventEntity, infos));
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                     else
                     {
+                        // enumerable of objects
                         var toRemove = new List<IEntity>();
-                        foreach (var entity in list)
+                        foreach (var eventObject in eventObjects)
                         {
-                            //extract the event object
-                            var obj = entity as IEntity;
-                            if (obj != null)
-                            {
-                                //Now check if this entity already exists in other event args that supersede this current event arg type
-                                if (IsFiltered(obj, meta, allEntities))
-                                {
-                                    //track it to be removed
-                                    toRemove.Add(obj);
-                                }
-                                else
-                                {
-                                    //track the entity, it's not filtered
-                                    allEntities.Add(Tuple.Create(obj, meta));
-                                }
-                            }
+                            // extract the event object, cast as an IEntity
+                            // if cannot cast, cannot filter, nothing to do - just leave it in the list & continue
+                            var eventEntity = eventObject as IEntity;
+                            if (eventEntity == null)
+                                continue;
+
+                            // look for this entity in superceding event args
+                            // found = must be removed, else track
+                            if (IsSuperceeded(eventEntity, infos, entities))
+                                toRemove.Add(eventEntity);
                             else
-                            {
-                                //we don't need to do anything here, we can't cast to IEntity so we cannot filter, so it will just remain in the list
-                            }
+                                entities.Add(Tuple.Create(eventEntity, infos));
                         }
 
-                        //remove anything that has been filtered
+                        // remove superceded entities
                         foreach (var entity in toRemove)
-                        {
-                            list.Remove(entity);
-                        }
+                            eventObjects.Remove(entity);
 
-                        //track the event and include in the response if there's still entities remaining in the list
-                        if (list.Count > 0)
+                        // if there are still entities in the list, keep the event definition
+                        if (eventObjects.Count > 0)
                         {
                             if (toRemove.Count > 0)
                             {
-                                //re-assign if the items have changed
-                                args.EventObject = list;
+                                // re-assign if changed
+                                args.EventObject = eventObjects;
                             }
-                            cancelableArgs.Add(args);
-                            result.Add(eventDefinition);
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                 }
-                else
-                {
-                    //it's not a cancelable event arg so we just include it in the result
-                    result.Add(eventDefinition);
-                }
             }
 
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-            UpdateToLatestEntities(allEntities, cancelableArgs);
+            // go over all args in result, and update them with the latest instanceof each entity
+            UpdateToLatestEntities(entities, resultArgs);
 
-            //we need to reverse the result since we've been adding by latest added events first!
+            // reverse, since we processed the list in reverse
             result.Reverse();
 
             return result;
         }
 
-        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionTypeData>> allEntities, IEnumerable<CancellableObjectEventArgs> cancelableArgs)
+        // edits event args to use the latest instance of each entity
+        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionInfos>> entities, IEnumerable<CancellableObjectEventArgs> args)
         {
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-
+            // get the latest entities
+            // ordered hash set + keepOldest will keep the latest inserted entity (in case of duplicates)
             var latestEntities = new OrderedHashSet<IEntity>(keepOldest: true);
-            foreach (var entity in allEntities.OrderByDescending(entity => entity.Item1.UpdateDate))
-            {
+            foreach (var entity in entities.OrderByDescending(entity => entity.Item1.UpdateDate))
                 latestEntities.Add(entity.Item1);
-            }
 
-            foreach (var args in cancelableArgs)
+            foreach (var arg in args)
             {
-                var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-                if (list == null)
+                // event object can either be a single object or an enumerable of objects
+                // try to get as an enumerable, get null if it's not
+                var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(arg.EventObject);
+                if (eventObjects == null)
                 {
-                    //try to find the args entity in the latest entity - based on the equality operators, this will 
-                    //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                    //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, args.EventObject));
+                    // single object
+                    // look for a more recent entity for that object, and replace if any
+                    // works by "equalling" entities ie the more recent one "equals" this one (though different object)
+                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, arg.EventObject));
                     if (foundEntity != null)
-                    {
-                        args.EventObject = foundEntity;
-                    }
+                        arg.EventObject = foundEntity;
                 }
                 else
                 {
+                    // enumerable of objects
+                    // same as above but for each object
                     var updated = false;
-
-                    for (int i = 0; i < list.Count; i++)
+                    for (var i = 0; i < eventObjects.Count; i++)
                     {
-                        //try to find the args entity in the latest entity - based on the equality operators, this will 
-                        //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                        //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, list[i]));
-                        if (foundEntity != null)
-                        {
-                            list[i] = foundEntity;
-                            updated = true;
-                        }
+                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, eventObjects[i]));
+                        if (foundEntity == null) continue;
+                        eventObjects[i] = foundEntity;
+                        updated = true;
                     }
 
                     if (updated)
-                    {
-                        args.EventObject = list;
-                    }
+                        arg.EventObject = eventObjects;
                 }
             }
         }
 
-        /// <summary>
-        /// This will check against all of the processed entity/events (allEntities) to see if this entity already exists in 
-        /// event args that supersede the event args being passed in and if so returns true.
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="eventDef"></param>
-        /// <param name="allEntities"></param>
-        /// <returns></returns>
-        private static bool IsFiltered(
-            IEntity entity,
-            EventDefinitionTypeData eventDef,
-            List<Tuple<IEntity, EventDefinitionTypeData>> allEntities)
+        // determines if a given entity, appearing in a given event definition, should be filtered out,
+        // considering the entities that have already been visited - an entity is filtered out if it
+        // appears in another even definition, which superceedes this event definition.
+        private static bool IsSuperceeded(IEntity entity, EventDefinitionInfos infos, List<Tuple<IEntity, EventDefinitionInfos>> entities)
         {
-            var argType = eventDef.EventDefinition.Args.GetType();
+            //var argType = meta.EventArgsType;
+            var argType = infos.EventDefinition.Args.GetType();
 
-            //check if the entity is found in any processed event data that could possible supersede this one
-            var foundByEntity = allEntities
-                .Where(x => x.Item2.SupersedeAttributes.Length > 0
-                            //if it's the same arg type than it cannot supersede                
-                            && x.Item2.EventArgType != argType
-                            && Equals(x.Item1, entity))
+            // look for other instances of the same entity, coming from an event args that supercedes other event args,
+            // ie is marked with the attribute, and is not this event args (cannot supersede itself)
+            var superceeding = entities
+                .Where(x => x.Item2.SupersedeTypes.Length > 0 // has the attribute
+                    && x.Item2.EventDefinition.Args.GetType() != argType // is not the same
+                    && Equals(x.Item1, entity)) // same entity
                 .ToArray();
 
-            //no args have been processed with this entity so it should not be filtered
-            if (foundByEntity.Length == 0)
+            // first time we see this entity = not filtered
+            if (superceeding.Length == 0)
                 return false;
 
+            // fixme see notes above
+            // delete event args does NOT superceedes 'unpublished' event
+            if (argType.IsGenericType && argType.GetGenericTypeDefinition() == typeof(PublishEventArgs<>) && infos.EventDefinition.EventName == "UnPublished")
+                return false;
+
+            // found occurences, need to determine if this event args is superceded
             if (argType.IsGenericType)
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //if the attribute type is a generic type def then compare with the generic type def of the event arg
-                                (y.SupersededEventArgsType.IsGenericTypeDefinition && y.SupersededEventArgsType == argType.GetGenericTypeDefinition())
-                                //if the attribute type is not a generic type def then compare with the normal type of the event arg
-                                || (y.SupersededEventArgsType.IsGenericTypeDefinition == false && y.SupersededEventArgsType == argType)));
+                // generic, must compare type arguments
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y =>
+                        // superceeding a generic type which has the same generic type definition
+                        // fixme no matter the generic type parameters? could be different?
+                        y.IsGenericTypeDefinition && y == argType.GetGenericTypeDefinition()
+                        // or superceeding a non-generic type which is ... fixme how is this ever possible? argType *is* generic?
+                        || y.IsGenericTypeDefinition == false && y == argType));
                 return supercededBy != null;
             }
             else
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //since the event arg type is not a generic type, then we just compare type 1:1
-                                y.SupersededEventArgsType == argType));
+                // non-generic, can compare types 1:1
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y => y == argType));
                 return supercededBy != null;
             }
         }

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/IO/PhysicalFileSystem.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
@@ -107,7 +108,7 @@ namespace Umbraco.Core.IO
 
             try
             {
-                Directory.Delete(fullPath, recursive);
+                WithRetry(() => Directory.Delete(fullPath, recursive));
             }
             catch (DirectoryNotFoundException ex)
             {
@@ -225,8 +226,8 @@ namespace Umbraco.Core.IO
                 return;
 
             try
-            {
-                File.Delete(fullPath);
+            {
+                WithRetry(() => File.Delete(fullPath));
             }
             catch (FileNotFoundException ex)
             {
@@ -378,7 +379,7 @@ namespace Umbraco.Core.IO
             {
                 if (overrideIfExists == false)
                     throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-                File.Delete(fullPath);
+                WithRetry(() => File.Delete(fullPath));
             }
 
             var directory = Path.GetDirectoryName(fullPath);
@@ -386,9 +387,9 @@ namespace Umbraco.Core.IO
             Directory.CreateDirectory(directory); // ensure it exists
 
             if (copy)
-                File.Copy(physicalPath, fullPath);
+                WithRetry(() => File.Copy(physicalPath, fullPath));
             else
-                File.Move(physicalPath, fullPath);
+                WithRetry(() => File.Move(physicalPath, fullPath));
         }
 
         #region Helper Methods
@@ -417,6 +418,35 @@ namespace Umbraco.Core.IO
             return path;
         }
 
+        protected void WithRetry(Action action)
+        {
+            // 10 times 100ms is 1s
+            const int count = 10;
+            const int pausems = 100;
+
+            for (var i = 0;; i++)
+            {
+                try
+                {
+                    action();
+                    break; // done
+                }
+                catch (IOException e)
+                {
+                    // if it's not *exactly* IOException then it could be
+                    // some inherited exception such as FileNotFoundException,
+                    // and then we don't want to retry
+                    if (e.GetType() != typeof(IOException)) throw;
+
+                    // if we have tried enough, throw, else swallow
+                    // the exception and retry after a pause
+                    if (i == count) throw;
+                }
+
+                Thread.Sleep(pausems);
+            }
+        }
+
         #endregion
     }
 }

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <encoding value="utf-8" />
+    ///  </appender>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

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/Models/UmbracoObjectTypes.cs

@@ -188,11 +188,11 @@ namespace Umbraco.Core.Models
         Language,
 
         /// <summary>
-        /// Document
+        /// Document Blueprint
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]
-        [UmbracoUdiType(Constants.UdiEntityType.DocumentBluePrint)]
+        [UmbracoUdiType(Constants.UdiEntityType.DocumentBlueprint)]
         DocumentBlueprint,
         
         /// <summary>

src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs

@@ -394,7 +394,7 @@ namespace Umbraco.Core.ObjectResolution
         /// WARNING! Do not use this unless you know what you are doing, clear all types registered and instances
         /// created. Typically only used if a resolver is no longer used in an application and memory is to be GC'd
         /// </summary>
-        internal void ResetCollections()
+        internal virtual void ResetCollections()
         {
             using (new WriteLock(_lock))
             {

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

@@ -183,17 +183,17 @@ namespace Umbraco.Core.Persistence.Repositories
         }
 
         public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
-        {
-            var sql = new Sql()
+        {
+            var sql = new Sql()
                 .Select("un.*")
                 .From("umbracoNode AS un")
                 .InnerJoin("cmsMember2MemberGroup")
-                .On("un.id = cmsMember2MemberGroup.MemberGroup")
-                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
-                .On("member.id = cmsMember2MemberGroup.Member")
-                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
-                .Where("member.LoginName=@loginName", new {loginName = username});
-            
+                .On("cmsMember2MemberGroup.MemberGroup = un.id")
+                .InnerJoin("cmsMember")
+                .On("cmsMember.nodeId = cmsMember2MemberGroup.Member")
+                .Where("un.nodeObjectType=@objectType", new { objectType = NodeObjectTypeId })
+                .Where("cmsMember.LoginName=@loginName", new { loginName = username });
+            
             return Database.Fetch<NodeDto>(sql)
                 .DistinctBy(dto => dto.NodeId)
                 .Select(x => _modelFactory.BuildEntity(x));

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/Repositories/UserRepository.cs

@@ -192,11 +192,11 @@ ORDER BY colName";
 
             return new Dictionary<UserState, int>
             {
-                {UserState.All, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
+                {UserState.All, (int)result[0].num},
+                {UserState.Active, (int)result[1].num},
+                {UserState.Disabled, (int)result[2].num},
+                {UserState.LockedOut, (int)result[3].num},
+                {UserState.Invited, (int)result[4].num}
             };
         }
 

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/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Permissions;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Umbraco.Core")]
@@ -12,8 +10,8 @@ using System.Security.Permissions;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Umbraco CMS")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -50,6 +48,8 @@ using System.Security.Permissions;
 [assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")]
 [assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
 
+[assembly: InternalsVisibleTo("Umbraco.Headless")]
+
 //allow this to be mocked in our unit tests
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 

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

@@ -993,8 +993,7 @@ namespace Umbraco.Core.Services
                     FROM umbracoNode
                     JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
                     WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);
-                Console.WriteLine(sql.SQL);
+                    true, false, ids);                    
                 var x = uow.Database.Fetch<int>(sql);
                 return ids.Length == x.Count;
             }
@@ -2009,6 +2008,96 @@ namespace Umbraco.Core.Services
             return true;
         }
 
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                var items = ids.Select(x => allContent[x]);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
         public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
         {
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
@@ -2748,4 +2837,4 @@ namespace Umbraco.Core.Services
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -377,7 +377,7 @@ namespace Umbraco.Core.Services
                 repo.Delete(container);
                 uow.Commit();
                 deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs);
+                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs, "DeletedMediaTypeContainer");
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?

src/Umbraco.Core/Services/IContentService.cs

@@ -642,7 +642,21 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the parent of the current content as an <see cref="IContent"/> item.

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/Services/MemberService.cs

@@ -986,7 +986,11 @@ namespace Umbraco.Core.Services
         /// <param name="raiseEvents">Optional parameter to raise events.
         /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
         public void Save(IMember entity, bool raiseEvents = true)
-        {
+        {
+            //trimming username and email to make sure we have no trailing space
+            entity.Username = entity.Username.Trim();
+            entity.Email = entity.Email.Trim();
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(entity);

src/Umbraco.Core/Services/UserService.cs

@@ -228,9 +228,9 @@ namespace Umbraco.Core.Services
         }
 
         /// <summary>
-        /// Deletes an <see cref="IUser"/>
+        /// Disables an <see cref="IUser"/>
         /// </summary>
-        /// <param name="membershipUser"><see cref="IUser"/> to Delete</param>
+        /// <param name="membershipUser"><see cref="IUser"/> to disable</param>
         public void Delete(IUser membershipUser)
         {
             //disable
@@ -753,7 +753,7 @@ namespace Umbraco.Core.Services
         /// <param name="id">Id of the User to retrieve</param>
         /// <returns><see cref="IProfile"/></returns>
         public IProfile GetProfileById(int id)
-        {
+        {
             //This is called a TON. Go get the full user from cache which should already be IProfile
             var fullUser = GetUserById(id);
             var asProfile = fullUser as IProfile;

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -3,6 +3,7 @@ using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Core.Sync
@@ -46,8 +47,20 @@ namespace Umbraco.Core.Sync
         // settings: for unit tests only
         internal static void EnsureApplicationUrl(ApplicationContext appContext, HttpRequestBase request = null, IUmbracoSettingsSection settings = null)
         {
+            bool newApplicationUrl = false;
+            if (request != null)
+            {
+                var applicationUrl = GetApplicationUrlFromRequest(request);
+                newApplicationUrl = !appContext._umbracoApplicationDomains.Contains(applicationUrl);
+                if (newApplicationUrl)
+                {
+                    appContext._umbracoApplicationDomains.Add(applicationUrl);
+                    LogHelper.Info(typeof(ApplicationUrlHelper), $"New ApplicationUrl detected: {applicationUrl}");
+                }
+            }
+
             // if initialized, return
-            if (appContext._umbracoApplicationUrl != null) return;
+            if (appContext._umbracoApplicationUrl != null && !newApplicationUrl) return;
 
             var logger = appContext.ProfilingLogger.Logger;
 
@@ -132,6 +145,12 @@ namespace Umbraco.Core.Sync
         {
             var logger = appContext.ProfilingLogger.Logger;
 
+            appContext._umbracoApplicationUrl = GetApplicationUrlFromRequest(request);
+            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+        }
+
+        private static string GetApplicationUrlFromRequest(HttpRequestBase request)
+        {
             // if (HTTP and SSL not required) or (HTTPS and SSL required),
             //  use ports from request
             // otherwise,
@@ -147,8 +166,7 @@ namespace Umbraco.Core.Sync
             var ssl = useSsl ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
-            appContext._umbracoApplicationUrl = url.TrimEnd('/');
-            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+            return url.TrimEnd('/');
         }
     }
 }

src/Umbraco.Core/UdiEntityType.cs

@@ -26,7 +26,7 @@ namespace Umbraco.Core
 
                     { AnyGuid, UdiType.GuidUdi },
                     { Document, UdiType.GuidUdi },
-                    { DocumentBluePrint, UdiType.GuidUdi },
+                    { DocumentBlueprint, UdiType.GuidUdi },
                     { Media, UdiType.GuidUdi },
                     { Member, UdiType.GuidUdi },
                     { DictionaryItem, UdiType.GuidUdi },
@@ -68,7 +68,7 @@ namespace Umbraco.Core
 
             public const string Document = "document";
 
-            public const string DocumentBluePrint = "document-blueprint";
+            public const string DocumentBlueprint = "document-blueprint";
 
             public const string Media = "media";
             public const string Member = "member";
@@ -80,6 +80,7 @@ namespace Umbraco.Core
             public const string DocumentType = "document-type";
             public const string DocumentTypeContainer = "document-type-container";
 
+            //TODO: What is this? This alias is only used for the blue print tree to render the blueprint's document type, it's not a real udi type
             public const string DocumentTypeBluePrints = "document-type-blueprints";
             public const string MediaType = "media-type";
             public const string MediaTypeContainer = "media-type-container";
@@ -117,6 +118,8 @@ namespace Umbraco.Core
                 {
                     case UmbracoObjectTypes.Document:
                         return Document;
+                    case UmbracoObjectTypes.DocumentBlueprint:
+                        return DocumentBlueprint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -161,6 +164,8 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
+                    case DocumentBlueprint:
+                        return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;
                     case Member:

src/Umbraco.Core/UdiGetterExtensions.cs

@@ -132,7 +132,7 @@ namespace Umbraco.Core
         public static GuidUdi GetUdi(this IContent entity)
         {
             if (entity == null) throw new ArgumentNullException("entity");
-            return new GuidUdi(entity.IsBlueprint ? Constants.UdiEntityType.DocumentBluePrint : Constants.UdiEntityType.Document, entity.Key).EnsureClosed();
+            return new GuidUdi(entity.IsBlueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, entity.Key).EnsureClosed();
         }
 
         /// <summary>

src/Umbraco.Core/Umbraco.Core.csproj

@@ -39,18 +39,15 @@
   <ItemGroup>
     <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <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>
-      <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>
+    <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>
-      <Private>True</Private>
     </Reference>
     <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
@@ -63,11 +60,9 @@
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -83,17 +78,16 @@
     </Reference>
     <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
@@ -105,11 +99,9 @@
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
@@ -186,6 +178,7 @@
     <Compile Include="CodeAnnotations\UmbracoProposedPublicAttribute.cs" />
     <Compile Include="Collections\DeepCloneableList.cs" />
     <Compile Include="Collections\ListCloneBehavior.cs" />
+    <Compile Include="Collections\TypeList.cs" />
     <Compile Include="ConcurrentHashSet.cs" />
     <Compile Include="Configuration\BaseRest\IBaseRestSection.cs" />
     <Compile Include="Configuration\BaseRest\IExtension.cs" />
@@ -356,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" />
@@ -368,6 +362,7 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="IEmailSender.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IAuditItem.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.Benchmarks/Umbraco.Tests.Benchmarks.csproj

@@ -40,34 +40,27 @@
   <ItemGroup>
     <Reference Include="BenchmarkDotNet, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.0.9.9\lib\net45\BenchmarkDotNet.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Core, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Core.0.9.9\lib\net45\BenchmarkDotNet.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.9.9\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Moq, Version=4.1.1309.919, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
@@ -75,27 +68,22 @@
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Reflection.Metadata, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.0.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -116,6 +104,7 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
+    <None Include="_TraceEventProgrammersGuide.docx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
@@ -132,8 +121,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Content Include="TraceEvent.ReadMe.txt" />
+    <Content Include="TraceEvent.ReleaseNotes.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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/Scoping/ScopeEventDispatcherTests.cs

@@ -3,10 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using umbraco.cms.businesslogic;
+using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Scoping;
+using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 
@@ -99,7 +102,7 @@ namespace Umbraco.Tests.Scoping
             DoDeleteForContent += OnDoThingFail;
             DoForTestArgs += OnDoThingFail;
             DoForTestArgs2 += OnDoThingFail;
-            
+
             var contentType = MockedContentTypes.CreateBasicContentType();
 
             var content1 = MockedContent.CreateBasicContent(contentType);
@@ -114,10 +117,10 @@ namespace Umbraco.Tests.Scoping
             var scopeProvider = new ScopeProvider(Mock.Of<IDatabaseFactory2>());
             using (var scope = scopeProvider.CreateScope(eventDispatcher: new PassiveEventDispatcher()))
             {
-                
+
                 //content1 will be filtered from the args
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(new[]{ content1 , content3}));
-                scope.Events.Dispatch(DoDeleteForContent, this, new DeleteEventArgs<IContent>(content1));
+                scope.Events.Dispatch(DoDeleteForContent, this, new DeleteEventArgs<IContent>(content1), "DoDeleteForContent");
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content2));
                 //this entire event will be filtered
                 scope.Events.Dispatch(DoForTestArgs, this, new TestEventArgs(content1));
@@ -141,15 +144,36 @@ namespace Umbraco.Tests.Scoping
             }
         }
 
+        [Test]
+        public void SupersededEvents2()
+        {
+            var contentService = Mock.Of<IContentService>();
+            var content = Mock.Of<IContent>();
+            var l1 = new List<IEventDefinition>
+            {
+                new EventDefinition<IContentService, PublishEventArgs<IContent>>(Test_UnPublished, contentService, new PublishEventArgs<IContent>(new [] { content }), "UnPublished"),
+                new EventDefinition<IContentService, DeleteEventArgs<IContent>>(Test_Deleted, contentService, new DeleteEventArgs<IContent>(new [] { content }), "Deleted")
+            };
+
+            var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
+            foreach (var e in l1)
+                l2.Add(e);
+
+            var l3 = ScopeEventDispatcherBase.FilterSupersededAndUpdateToLatestEntity(l2);
+
+            // see U4-10764
+            Assert.AreEqual(2, l3.Count());
+        }
+
         /// <summary>
         /// This will test that when we track events that before we Get the events we normalize all of the
-        /// event entities to be the latest one (most current) found amongst the event so that there is 
+        /// event entities to be the latest one (most current) found amongst the event so that there is
         /// no 'stale' entities in any of the args
         /// </summary>
         [Test]
         public void LatestEntities()
         {
-            DoSaveForContent += OnDoThingFail;            
+            DoSaveForContent += OnDoThingFail;
 
             var now = DateTime.Now;
             var contentType = MockedContentTypes.CreateBasicContentType();
@@ -165,7 +189,7 @@ namespace Umbraco.Tests.Scoping
 
             var scopeProvider = new ScopeProvider(Mock.Of<IDatabaseFactory2>());
             using (var scope = scopeProvider.CreateScope(eventDispatcher: new PassiveEventDispatcher()))
-            {                                
+            {
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content1));
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content2));
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content3));
@@ -173,7 +197,7 @@ namespace Umbraco.Tests.Scoping
                 // events have been queued
                 var events = scope.Events.GetEvents(EventDefinitionFilter.All).ToArray();
                 Assert.AreEqual(3, events.Length);
-                
+
                 foreach (var t in events)
                 {
                     var args = (SaveEventArgs<IContent>)t.Args;
@@ -212,7 +236,7 @@ namespace Umbraco.Tests.Scoping
 
                 // events have been queued
                 var events = scope.Events.GetEvents(EventDefinitionFilter.FirstIn).ToArray();
-                Assert.AreEqual(1, events.Length);                
+                Assert.AreEqual(1, events.Length);
                 Assert.AreEqual(content1, ((SaveEventArgs<IContent>) events[0].Args).SavedEntities.First());
                 Assert.IsTrue(object.ReferenceEquals(content1, ((SaveEventArgs<IContent>)events[0].Args).SavedEntities.First()));
                 Assert.AreEqual(content1.UpdateDate, ((SaveEventArgs<IContent>) events[0].Args).SavedEntities.First().UpdateDate);
@@ -350,6 +374,9 @@ namespace Umbraco.Tests.Scoping
 
         public static event TypedEventHandler<ScopeEventDispatcherTests, SaveEventArgs<decimal>> DoThing3;
 
+        public static event TypedEventHandler<IContentService, PublishEventArgs<IContent>> Test_UnPublished;
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Test_Deleted;
+
         public class TestEventArgs : CancellableObjectEventArgs
         {
             public TestEventArgs(object eventObject) : base(eventObject)

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.Tests/Umbraco.Tests.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.89.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.89\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs

@@ -17,6 +17,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.ControllerTesting;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Web.Editors;
+using Umbraco.Web.Features;
 using Umbraco.Web.Models.ContentEditing;
 using IUser = Umbraco.Core.Models.Membership.IUser;
 
@@ -26,6 +27,11 @@ namespace Umbraco.Tests.Web.Controllers
     [TestFixture]
     public class UsersControllerTests : BaseDatabaseFactoryTest
     {
+        protected override void FreezeResolution()
+        {
+            FeaturesResolver.Current = new FeaturesResolver(new UmbracoFeatures());
+            base.FreezeResolution();
+        }
 
         [Test]
         public async void Save_User()

src/Umbraco.Tests/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.89" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />

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

@@ -31,62 +31,42 @@
     "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",
-
     "ignore": [
       "font-awesome",
       "angular",
       "bootstrap",
       "codemirror"
     ],
-    
     "sources": {
       "moment": "bower_components/moment/min/moment-with-locales.js",
-      
       "underscore": [
         "bower_components/underscore/underscore-min.js",
         "bower_components/underscore/underscore-min.map"
       ],
-
       "jquery": [
         "bower_components/jquery/dist/jquery.min.js",
         "bower_components/jquery/dist/jquery.min.map"
       ],
-      
       "angular-dynamic-locale": [
         "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js",
         "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js.map"
       ],
-
       "angular-local-storage": [
         "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"
       ],
-
       "typeahead.js": "bower_components/typeahead.js/dist/typeahead.bundle.min.js",
-
-      "rgrove-lazyload":"bower_components/rgrove-lazyload/lazyload.js",
-
-      "ng-file-upload":"bower_components/ng-file-upload/ng-file-upload.min.js",
-
-      "jquery-ui":"bower_components/jquery-ui/jquery-ui.min.js",
-
-      "jquery-migrate":"bower_components/jquery-migrate/jquery-migrate.min.js",
-
+      "rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js",
+      "ng-file-upload": "bower_components/ng-file-upload/ng-file-upload.min.js",
+      "jquery-ui": "bower_components/jquery-ui/jquery-ui.min.js",
+      "jquery-migrate": "bower_components/jquery-migrate/jquery-migrate.min.js",
       "clipboard": "bower_components/clipboard/dist/clipboard.min.js"
     }
   }

src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less

@@ -31,15 +31,17 @@
   display: block;
   padding: 4px;
   line-height: @baseLineHeight;
-  border: 1px solid #ddd;
+  border: 1px solid @gray-8;
   .border-radius(@baseBorderRadius);
   .box-shadow(0 1px 3px rgba(0,0,0,.055));
   .transition(all .2s ease-in-out);
 }
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: @linkColor;
+// Add a hover/focus state for linked versions only.
+a.thumbnail:hover, 
+a.thumbnail:focus,
+a div.thumbnail:hover,
+a div.thumbnail:focus {
+  border-color: @turquoise;
   .box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
 

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

@@ -26,7 +26,7 @@
     "cssnano": "^3.7.6",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
-    "gulp-connect": "^5.0.0",
+    "gulp-connect": "5.0.0",
     "gulp-less": "^3.1.0",
     "gulp-ngdocs": "^0.3.0",
     "gulp-open": "^2.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/application/umbtour.directive.js

@@ -135,11 +135,12 @@
                     }
 
                     var scrollParent = element.scrollParent();
+                    var scrollToCenterOfContainer = element[0].offsetTop - (scrollParent[0].clientHeight / 2 ) + (element[0].clientHeight / 2);
 
                     // Detect if scroll is needed
                     if (element[0].offsetTop > scrollParent[0].clientHeight) {
                         scrollParent.animate({
-                            scrollTop: element[0].offsetTop
+                            scrollTop: scrollToCenterOfContainer
                         }, function () {
                             // Animation complete.
                             setPopoverPosition(element);

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

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
 
-  function ContentEditController($rootScope, $scope, $routeParams, $q, $timeout, $window, $location, appState, contentResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, treeService, fileManager, formHelper, umbRequestHelper, keyboardService, umbModelMapper, editorState, $http, eventsService) {
+  function ContentEditController($rootScope, $scope, $routeParams, $q, $timeout, $window, $location, appState, contentResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, treeService, fileManager, formHelper, umbRequestHelper, keyboardService, umbModelMapper, editorState, $http, eventsService, relationResource) {
 
     var evts = [];
 
@@ -16,7 +16,7 @@
     $scope.page.menu.currentSection = appState.getSectionState("currentSection");
     $scope.page.listViewPath = null;
     $scope.page.isNew = $scope.isNew ? true : false;
-    $scope.page.buttonGroupState = "init";
+    $scope.page.buttonGroupState = "init";    
     $scope.allowOpen = true;
 
 
@@ -49,7 +49,42 @@
 
     }
 
+    function getNode() {
+
+      $scope.page.loading = true;
+
+      //we are editing so get the content item from the server
+      $scope.getMethod()($scope.contentId)
+        .then(function (data) {
+
+          $scope.content = data;
+
+          if (data.isChildOfListView && data.trashed === false) {
+            $scope.page.listViewPath = ($routeParams.page) ?
+              "/content/content/edit/" + data.parentId + "?page=" + $routeParams.page :
+              "/content/content/edit/" + data.parentId;
+          }
+
+          init($scope.content);
+
+          //in one particular special case, after we've created a new item we redirect back to the edit
+          // route but there might be server validation errors in the collection which we need to display
+          // after the redirect, so we will bind all subscriptions which will show the server validation errors
+          // if there are any and then clear them so the collection no longer persists them.
+          serverValidationManager.executeAndClearAllSubscriptions();
+
+          syncTreeNode($scope.content, data.path, true);
+
+          resetLastListPageNumber($scope.content);
+
+          $scope.page.loading = false;
+
+        });
+
+    }
+
     function createButtons(content) {
+      $scope.page.buttonGroupState = "init";
       var buttons = contentEditingHelper.configureContentEditorButtons({
         create: $scope.page.isNew,
         content: content,
@@ -152,35 +187,8 @@
     }
     else {
 
-      $scope.page.loading = true;
+      getNode();
 
-      //we are editing so get the content item from the server
-      $scope.getMethod()($scope.contentId)
-        .then(function (data) {
-
-          $scope.content = data;
-
-          if (data.isChildOfListView && data.trashed === false) {
-            $scope.page.listViewPath = ($routeParams.page) ?
-              "/content/content/edit/" + data.parentId + "?page=" + $routeParams.page :
-              "/content/content/edit/" + data.parentId;
-          }
-
-          init($scope.content);
-
-          //in one particular special case, after we've created a new item we redirect back to the edit
-          // route but there might be server validation errors in the collection which we need to display
-          // after the redirect, so we will bind all subscriptions which will show the server validation errors
-          // if there are any and then clear them so the collection no longer persists them.
-          serverValidationManager.executeAndClearAllSubscriptions();
-
-          syncTreeNode($scope.content, data.path, true);
-
-          resetLastListPageNumber($scope.content);
-
-          $scope.page.loading = false;
-
-        });
     }
 
 
@@ -252,6 +260,80 @@
 
     };
 
+    $scope.restore = function (content) {
+
+      $scope.page.buttonRestore = "busy";
+
+      relationResource.getByChildId(content.id, "relateParentDocumentOnDelete").then(function (data) {
+
+        var relation = null;
+        var target = null;
+        var error = { headline: "Cannot automatically restore this item", content: "Use the Move menu item to move it manually"};
+
+        if (data.length == 0) {
+          notificationsService.error(error.headline, "There is no 'restore' relation found for this node. Use the Move menu item to move it manually.");
+          $scope.page.buttonRestore = "error";
+          return;
+        }
+
+        relation = data[0];
+
+        if (relation.parentId == -1) {
+          target = { id: -1, name: "Root" };
+          moveNode(content, target);
+        } else {
+          contentResource.getById(relation.parentId).then(function (data) {
+            target = data;
+
+            // make sure the target item isn't in the recycle bin
+            if(target.path.indexOf("-20") !== -1) {
+              notificationsService.error(error.headline, "The item you want to restore it under (" + target.name + ") is in the recycle bin. Use the Move menu item to move the item manually.");
+              $scope.page.buttonRestore = "error";              
+              return;
+            }
+
+            moveNode(content, target);
+
+          }, function (err) {
+            $scope.page.buttonRestore = "error";
+            notificationsService.error(error.headline, error.content);
+          });
+        }
+
+      }, function (err) {
+        $scope.page.buttonRestore = "error";
+        notificationsService.error(error.headline, error.content);
+      });
+
+
+    };
+
+    function moveNode(node, target) {
+
+      contentResource.move({ "parentId": target.id, "id": node.id })
+        .then(function (path) {
+
+          // remove the node that we're working on
+          if($scope.page.menu.currentNode) {
+            treeService.removeNode($scope.page.menu.currentNode);
+          }
+
+          // sync the destination node
+          navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false });
+
+          $scope.page.buttonRestore = "success";
+          notificationsService.success("Successfully restored " + node.name + " to " + target.name);
+
+          // reload the node
+          getNode();
+
+        }, function (err) {
+          $scope.page.buttonRestore = "error";
+          notificationsService.error("Cannot automatically restore this item", err);
+        });
+
+    }
+
     //ensure to unregister from all events!
     $scope.$on('$destroy', function () {
       for (var e in evts) {

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

@@ -1,9 +1,13 @@
 (function () {
     'use strict';
 
-    function ContentNodeInfoDirective($timeout, $location, logResource, eventsService) {
+    function ContentNodeInfoDirective($timeout, $location, logResource, eventsService, userService, localizationService, dateHelper) {
 
         function link(scope, element, attrs, ctrl) {
+
+            var evts = [];
+            var isInfoTab = false;
+            scope.publishStatus = {};
             
             function onInit() {
 
@@ -32,12 +36,11 @@
                 // get document type details
                 scope.documentType = scope.node.documentType;
 
-                // load audit trail when on the info tab
-                eventsService.on("app.tabChange", function (event, args) {
-                    if (args.id === -1) {
-                        loadAuditTrail();
-                    }
-                });
+                // make sure dates are formatted to the user's locale
+                formatDatesToLocal();
+
+                setNodePublishStatus(scope.node);
+                
             }
 
             scope.auditTrailPageChange = function (pageNumber) {
@@ -79,6 +82,14 @@
 
                 logResource.getPagedEntityLog(scope.auditTrailOptions)
                     .then(function (data) {
+
+                        // get current backoffice user and format dates
+                        userService.getCurrentUser().then(function (currentUser) {
+                            angular.forEach(data.items, function(item) {
+                                item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL');
+                            });
+                        });
+                    
                         scope.auditTrail = data.items;
                         scope.auditTrailOptions.pageNumber = data.pageNumber;
                         scope.auditTrailOptions.pageSize = data.pageSize;
@@ -99,6 +110,7 @@
                             item.logTypeColor = "success";
                             break;
                         case "UnPublish":
+                        case "Delete":
                             item.logTypeColor = "danger";
                             break;
                         default:
@@ -107,11 +119,42 @@
                 });
             }
 
+            function setNodePublishStatus(node) {
+                
+                // deleted node
+                if(node.trashed === true) {
+                    scope.publishStatus.label = localizationService.localize("general_deleted");
+                    scope.publishStatus.color = "danger";
+                }
+
+                // unpublished node
+                if(node.published === false && node.trashed === false) {
+                    scope.publishStatus.label = localizationService.localize("content_unpublished");
+                    scope.publishStatus.color = "gray";
+                }
+
+                // published node
+                if(node.hasPublishedVersion === true && node.publishDate && node.published === true) {
+                    scope.publishStatus.label = localizationService.localize("content_published");
+                    scope.publishStatus.color = "success";
+                }
+
+                // published node with pending changes
+                if(node.hasPublishedVersion === true && node.publishDate && node.published === false) {
+                    scope.publishStatus.label = localizationService.localize("content_publishedPendingChanges");
+                    scope.publishStatus.color = "success"
+                }
+
+            }
+
             function setPublishDate(date) {
 
                 // update publish value
                 scope.node.releaseDate = date;
 
+                // make sure dates are formatted to the user's locale
+                formatDatesToLocal();
+
                 // emit event
                 var args = { node: scope.node, date: date };
                 eventsService.emit("editors.content.changePublishDate", args);
@@ -134,6 +177,9 @@
                 // update publish value
                 scope.node.removeDate = date;
 
+                // make sure dates are formatted to the user's locale
+                formatDatesToLocal();
+
                 // emit event
                 var args = { node: scope.node, date: date };
                 eventsService.emit("editors.content.changeUnpublishDate", args);
@@ -150,6 +196,61 @@
                 eventsService.emit("editors.content.changeUnpublishDate", args);
 
             }
+            
+            function ucfirst(string) {
+                return string.charAt(0).toUpperCase() + string.slice(1);
+            }
+
+            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.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;
+                });
+            }
+
+            // load audit trail when on the info tab
+            evts.push(eventsService.on("app.tabChange", function (event, args) {
+                $timeout(function(){
+                    if (args.id === -1) {
+                        isInfoTab = true;
+                        loadAuditTrail();
+                    } else {
+                        isInfoTab = false;
+                    }
+                });
+            }));
+
+            // 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; }             
+                
+                if(isInfoTab) {
+                    loadAuditTrail();
+                    formatDatesToLocal();
+                    setNodePublishStatus(scope.node);
+                }
+            });
+
+            //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/components/grid/grid.rte.directive.js

@@ -366,6 +366,9 @@ angular.module("umbraco.directives")
                             // element might still be there even after the modal has been hidden.
                             scope.$on('$destroy', function () {
                                 unsubscribe();
+								if (tinyMceEditor !== undefined && tinyMceEditor != null) {
+									tinyMceEditor.destroy()
+								}
                             });
 
                         });

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/components/umbnodepreview.directive.js

@@ -77,7 +77,7 @@
 
 @param {string} icon (<code>binding</code>): The node icon.
 @param {string} name (<code>binding</code>): The node name.
-@param {boolean} published (<code>binding</code>): The node pusblished state.
+@param {boolean} published (<code>binding</code>): The node published state.
 @param {string} description (<code>binding</code>): A short description.
 @param {boolean} sortable (<code>binding</code>): Will add a move cursor on the node preview. Can used in combination with ui-sortable.
 @param {boolean} allowRemove (<code>binding</code>): Show/Hide the remove button.

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

@@ -1,4 +1,15 @@
-(function () {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbPasswordToggle
+@restrict E
+@scope
+
+@description
+<strong>Added in Umbraco v. 7.7.4:</strong> Use this directive to render a password toggle.
+
+**/
+
+(function () {
     'use strict';
 
     // comes from https://codepen.io/jakob-e/pen/eNBQaP

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

@@ -1,3 +1,114 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTable
+@restrict E
+@scope
+
+@description
+<strong>Added in Umbraco v. 7.4:</strong> Use this directive to render a data table.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.TableController as vm">
+        
+        <umb-table
+            ng-if="items"
+            items="vm.items"
+            item-properties="vm.options.includeProperties"
+            allow-select-all="vm.allowSelectAll"
+            on-select="vm.selectItem"
+            on-click="vm.clickItem"
+            on-select-all="vm.selectAll"
+            on-selected-all="vm.isSelectedAll"
+            on-sorting-direction="vm.isSortDirection"
+            on-sort="vm.sort">
+        </umb-table>
+    
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+    
+        function Controller() {
+    
+            var vm = this;
+    
+            vm.items = [
+                {
+                    "icon": "icon-document",
+                    "name": "My node 1",
+                    "published": true,
+                    "description": "A short description of my node",
+                    "author": "Author 1"
+                },
+                {
+                    "icon": "icon-document",
+                    "name": "My node 2",
+                    "published": true,
+                    "description": "A short description of my node",
+                    "author": "Author 2"
+                }
+            ];
+
+            vm.options = {
+                includeProperties: [
+                    { alias: "description", header: "Description" },
+                    { alias: "author", header: "Author" }
+                ]
+            };
+    
+            vm.selectItem = selectItem;
+            vm.clickItem = clickItem;
+            vm.selectAll = selectAll;
+            vm.isSelectedAll = isSelectedAll;
+            vm.isSortDirection = isSortDirection;
+            vm.sort = sort;
+
+            function selectAll($event) {
+                alert("select all");
+            }
+
+            function isSelectedAll() {
+                
+            }
+    
+            function clickItem(item) {
+                alert("click node");
+            }
+
+            function selectItem(selectedItem, $index, $event) {
+                alert("select node");
+            }
+            
+            function isSortDirection(col, direction) {
+                
+            }
+            
+            function sort(field, allow, isSystem) {
+                
+            }
+    
+        }
+    
+        angular.module("umbraco").controller("My.TableController", Controller);
+    
+    })();
+</pre>
+
+@param {string} icon (<code>binding</code>): The node icon.
+@param {string} name (<code>binding</code>): The node name.
+@param {string} published (<code>binding</code>): The node published state.
+@param {function} onSelect (<code>expression</code>): Callback function when the row is selected.
+@param {function} onClick (<code>expression</code>): Callback function when the "Name" column link is clicked.
+@param {function} onSelectAll (<code>expression</code>): Callback function when selecting all items.
+@param {function} onSelectedAll (<code>expression</code>): Callback function when all items are selected.
+@param {function} onSortingDirection (<code>expression</code>): Callback function when sorting direction is changed.
+@param {function} onSort (<code>expression</code>): Callback function when sorting items.
+**/
+
 (function () {
    'use strict';
 

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/events.service.js

@@ -16,52 +16,16 @@ function eventsService($q, $rootScope) {
 	
     return {
         
-        /** raise an event with a given name, returns an array of promises for each listener */
-        emit: function (name, args) {            
+        /** raise an event with a given name */
+        emit: function (name, args) {
 
             //there are no listeners
             if (!$rootScope.$$listeners[name]) {
                 return;
-                //return [];
             }
 
             //send the event
             $rootScope.$emit(name, args);
-
-
-            //PP: I've commented out the below, since we currently dont
-            // expose the eventsService as a documented api
-            // and think we need to figure out our usecases for this
-            // since the below modifies the return value of the then on() method
-            /*
-            //setup a deferred promise for each listener
-            var deferred = [];
-            for (var i = 0; i < $rootScope.$$listeners[name].length; i++) {
-                deferred.push($q.defer());
-            }*/
-
-            //create a new event args object to pass to the 
-            // $emit containing methods that will allow listeners
-            // to return data in an async if required
-            /*
-            var eventArgs = {
-                args: args,
-                reject: function (a) {
-                    deferred.pop().reject(a);
-                },
-                resolve: function (a) {
-                    deferred.pop().resolve(a);
-                }
-            };*/
-            
-            
-            
-            /*
-            //return an array of promises
-            var promises = _.map(deferred, function(p) {
-                return p.promise;
-            });
-            return promises;*/
         },
 
         /** subscribe to a method, or use scope.$on = same thing */

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

@@ -17,9 +17,10 @@
          * Registers all tours from the server and returns a promise
          */
         function registerAllTours() {
+            tours = [];
             return tourResource.getTours().then(function(tourFiles) {
                 angular.forEach(tourFiles, function (tourFile) {
-                    angular.forEach(tourFile, function(newTour) {
+                    angular.forEach(tourFile.tours, function(newTour) {
                         validateTour(newTour);
                         validateTourRegistration(newTour);
                         tours.push(newTour);    
@@ -36,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
@@ -45,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);
@@ -60,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);
@@ -78,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;
@@ -94,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;
@@ -117,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);
@@ -132,7 +133,7 @@
          *
          * @description
          * Raises an event to end the current tour
-		 */
+         */
         function endTour(tour) {
             eventsService.emit("appState.tour.end", tour);
             currentTour = null;
@@ -163,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;
@@ -185,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
@@ -213,12 +200,43 @@
          * @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();
             setTourStatuses(tours).then(function() {
-                var groupedTours = _.groupBy(tours, "group");
+                var groupedTours = [];
+                tours.forEach(function (item) {
+                    
+                    var groupExists = false;
+                    var newGroup = {
+                        "group": "",
+                        "tours": []
+                    };
+
+                    groupedTours.forEach(function(group){
+                        // extend existing group if it is already added
+                        if(group.group === item.group) {
+                            if(item.groupOrder) {
+                                group.groupOrder = item.groupOrder
+                            }
+                            groupExists = true;
+                            group.tours.push(item)
+                        }
+                    });
+
+                    // push new group to array if it doesn't exist
+                    if(!groupExists) {
+                        newGroup.group = item.group;
+                        if(item.groupOrder) {
+                            newGroup.groupOrder = item.groupOrder
+                        }
+                        newGroup.tours.push(item);
+                        groupedTours.push(newGroup);
+                    }
+
+                });
+
                 deferred.resolve(groupedTours);
             });
             return deferred.promise;
@@ -233,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();
@@ -244,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;
-        }
-
         ///////////
 
         /**
@@ -346,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,
@@ -391,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;
@@ -407,4 +353,4 @@
 
     angular.module("umbraco.services").factory("tourService", tourService);
 
-})();
+})();

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

@@ -242,8 +242,8 @@
                 var propGroups = _.find(genericTab.properties, function (item) {
                     return item.alias === "_umb_membergroup";
                 });
-                saveModel.email = propEmail.value;
-                saveModel.username = propLogin.value;
+                saveModel.email = propEmail.value.trim();
+                saveModel.username = propLogin.value.trim();
                 
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 

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/less/components/buttons/umb-button-group.less

@@ -1,7 +1,7 @@
 .umb-button-group__toggle {
    padding-left: 8px;
    padding-right: 8px;
-   float: right;
+   float: none;
 }
 
 .umb-button-group__sub-buttons.-align-right {

src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less

@@ -535,7 +535,7 @@
     color: @gray-3;
 }
 
-.umb-grid .umb-cell-rte textarea {
+.umb-grid .umb-cell-rte textarea.mceNoEditor {
     display: none !important;
 }
 

src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less

@@ -11,7 +11,6 @@
   margin: 50px 0 0 0;
   border: 2px solid @gray-7;
   border-radius: 0 10px 10px 10px;
-  position: relative;
   padding: 10px 10px 5px 10px;
   box-sizing: border-box;
 }
@@ -34,6 +33,7 @@
   border: 1px dashed @gray-8;
   color: @turquoise-d1;
   font-weight: bold;
+  position: relative;
 }
 
 .umb-group-builder__group.-sortable {
@@ -67,16 +67,18 @@
 }
 
 .umb-group-builder__group-title-wrapper {
-  position: absolute;
-  left: -2px;
-  top: -45px;
   display: flex;
   align-items: center;
+  margin-left: -12px;
+  margin-top: -55px;
 }
 
 .umb-group-builder__group-title-wrapper.-placeholder {
+  position: absolute;
   left: -1px;
   top: -44px;
+  margin-left: 0;
+  margin-top: 0;
 }
 
 .umb-group-builder__group-title {

src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less

@@ -36,6 +36,7 @@
 .umb-node-preview__content {
     flex: 1 1 auto;
     margin-right: 25px;
+    overflow: hidden;
 }
 
 .umb-node-preview__name {
@@ -49,6 +50,13 @@
     color: @gray-3;
 }
 
+.umb-node-preview__name,
+.umb-node-preview__description {
+    /*text-overflow: ellipsis;
+    overflow: hidden;*/
+    word-wrap: break-word;
+}
+
 .umb-node-preview__actions {
     flex: 0 0 auto;
     display: flex;

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

@@ -29,12 +29,12 @@
 	padding: 15px 10px;
 	box-sizing: border-box;
 	text-align: center;
-	border: 2px solid transparent;
+	border: 1px solid @gray-8;
 	height: 100%;
 }
 
 .umb-healthcheck-group:hover {
-	border: 2px solid @turquoise;
+	border: 1px solid @turquoise;
 	cursor: pointer;
 }
 

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

@@ -60,21 +60,29 @@
 
 //------------------- HISTORY ------------------
 
+.history {
+    position: relative;
+}
 
 .history-line {
     width: 2px;
-    height: 24px;
+    height: 100%;
     margin: 0 0 0 14px;
     background-color: @gray-8;
+    position: absolute;
+    z-index: 0;
 }
 
-.history-row {
+.history-item {
     display: flex;
     align-items: center;
+    margin-bottom: 24px;
+    position: relative;
+    z-index: 1;
 }
 
-.history-item__avatar{
-    min-width: 30px;
+.history-item__avatar {
+    margin-right: 7px;
 }
 
 .history-item__date {
@@ -82,74 +90,18 @@
     color: @gray-5;
 }
 
-.name-date-container {
-    margin: 0 30px 0 7px;
-    height: 30px;
-    min-width: 170px;
-}
-
-.last-history-item .history-line {
-    display: none;
-}
-
-//--------- META DATA --------
-.meta-data-section {
-    display: flex;
-    flex-direction: column;
-}
-
-.meta-data-title {
-    font-size: 15px;
-    color: @black;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.meta-data-description {
-    font-size: 13px;
-    color: @gray-5;
-}
-
-.meta-data {
-    font-size: 15px;
-    color: @gray-2;
-    line-height: 20px;
-}
-
-/*  RESPONSIVE  */
-
 .history-item__break {
     display: flex;
     align-items: center;
     min-width: 230px;
+    font-size: 14px;
 }
-@media (max-width: 979px) {
+
+/*  RESPONSIVE  */
+@media (min-width: 1101px) and (max-width: 1365px), (max-width: 979px) {
     
-    .history-row {
+    .history-item {
         display: block;
-        padding: 10px 0;
-    }
-
-    .history-item__break {
-        padding: 7px 0;
-    }
-
-    .history-line {
-        display: none;
-    }
-}
-@media (max-width: 1535px) {
-    
-    .history-line {
-        visibility: hidden;
-    }
-}
-
-@media (min-width: 1101px) and (max-width: 1365px) {
-    
-    .history-row {
-        display: block;
-        padding: 10px 0;
     }
 
     .history-item__break {

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -281,6 +281,12 @@ ul.color-picker li a  {
     display: block;
 }
 
+.umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
+    width: 120px;
+    height: 114px;
+    overflow: hidden;
+}
+
 .umb-sortable-thumbnails .umb-sortable-thumbnails__actions {
     position: absolute;
     bottom: 10px;
@@ -308,6 +314,7 @@ ul.color-picker li a  {
     justify-content: center;
     align-items: center;
     margin-left: 5px;
+    text-decoration: none;
 }
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {

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/drawers/help/help.controller.js

@@ -124,7 +124,7 @@
 
         function showTourButton(index, tourGroup) {
             if(index !== 0) {
-                var prevTour = tourGroup[index - 1];
+                var prevTour = tourGroup.tours[index - 1];
                 if(prevTour.completed) {
                     return true;
                 }
@@ -147,12 +147,12 @@
             // Finding out, how many tours are completed for the progress circle
             angular.forEach(vm.tours, function(group){
                 var completedTours = 0;
-                angular.forEach(group, function(tour){
+                angular.forEach(group.tours, function(tour){
                     if(tour.completed) {
                         completedTours++;
                     }
                 });
-                group.completedPercentage = Math.round((completedTours/group.length)*100);
+                group.completedPercentage = Math.round((completedTours/group.tours.length)*100);
             });
         }
 

src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html

@@ -12,23 +12,23 @@
 
             <h5 style="margin-bottom: 10px; margin-top: 0;">Tours</h5>
             
-            <div ng-repeat="(key,value) in vm.tours" style="margin-bottom: 5px;">
+            <div ng-repeat="tourGroup in vm.tours | orderBy:'groupOrder'" style="margin-bottom: 5px;">
 
                 <div class="umb-help-list">
 
-                    <a href="" class="umb-help-list-item umb-help-list-item__content flex items-center justify-between" style="text-decoration: none;" ng-click="value.open = !value.open">
-                        <h5 class="umb-help-list-item__group-title"><i style="margin-right: 2px;text-decoration: none;" ng-class="{'icon-navigation-right': !value.open, 'icon-navigation-down': value.open}"></i>
-                            <span ng-if="key !== 'undefined'">{{key}}</span>
-                            <span ng-if="key === 'undefined'">Other</span>
+                    <a href="" class="umb-help-list-item umb-help-list-item__content flex items-center justify-between" style="text-decoration: none;" ng-click="tourGroup.open = !tourGroup.open">
+                        <h5 class="umb-help-list-item__group-title"><i style="margin-right: 2px;text-decoration: none;" ng-class="{'icon-navigation-right': !tourGroup.open, 'icon-navigation-down': tourGroup.open}"></i>
+                            <span ng-if="tourGroup.group !== 'undefined'">{{tourGroup.group}}</span>
+                            <span ng-if="tourGroup.group === 'undefined'">Other</span>
                         </h5>
                         <umb-progress-circle
-                            percentage="{{value.completedPercentage}}"
+                            percentage="{{tourGroup.completedPercentage}}"
                             size="40">
                         </umb-progress-circle>
                     </a>
 
-                    <div ng-if="value.open">
-                        <div data-element="tour-{{tour.alias}}" class="umb-help-list-item" ng-repeat="tour in value">
+                    <div ng-if="tourGroup.open">
+                        <div data-element="tour-{{tour.alias}}" class="umb-help-list-item" ng-repeat="tour in tourGroup.tours">
                             <div class="umb-help-list-item__content justify-between">
                                 <div class="flex items-center">
                                     <div ng-if="!tour.completed" class="umb-number-badge umb-number-badge--xs umb-help-list-item__icon">{{ $index + 1 }}</div>
@@ -36,7 +36,7 @@
                                     <span ng-class="{'strike': tour.completed}" class="umb-help-list-item__title">{{ tour.name }}</span>
                                 </div>
                                 <div>
-                                    <umb-button ng-if="!tour.completed && vm.showTourButton($index, value)" button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>                                
+                                    <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>       
                                     <umb-button ng-if="tour.completed" size="xxs" type="button" label="Rerun" action="vm.startTour(tour)"></umb-button>
                                 </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/embed/embed.html

@@ -2,7 +2,7 @@
 
    <umb-control-group label="@general_url">
        <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
-       <input type="button" ng-click="vm.showPreview()" class="btn" localize="value" value="@general_retrieve" />
+       <input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
    </umb-control-group>
 
    <umb-control-group>
@@ -12,15 +12,15 @@
 
    <div ng-show="model.embed.supportsDimensions">
        <umb-control-group label="@general_width">
-           <input type="text" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
        </umb-control-group>
 
        <umb-control-group label="@general_height">
-          <input type="text" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
        </umb-control-group>
 
        <umb-control-group label="@general_constrain">
-          <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
+           <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
        </umb-control-group>
    </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/linkpicker/linkpicker.controller.js

@@ -22,6 +22,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	        selectedSearchResults: []
 	    };
 
+            $scope.showTarget = $scope.model.hideTarget !== true;
+
 	    if (dialogOptions.currentTarget) {
 	        $scope.model.target = dialogOptions.currentTarget;
 

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

@@ -18,7 +18,7 @@
             ng-model="model.target.name" />
     </umb-control-group>
 
-    <umb-control-group label="@content_target">
+    <umb-control-group ng-if="showTarget" label="@content_target">
         <label class="checkbox no-indent">
             <input type="checkbox" ng-model="model.target.target" ng-true-value="_blank" ng-false-value="" /> <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
         </label>

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/edit.html

@@ -61,7 +61,7 @@
             <umb-editor-footer-content-right>
                 
                 <umb-button
-                  alias="returnToListView"
+                    alias="returnToListView"
                     ng-if="page.listViewPath"
                     type="link"
                     href="#{{page.listViewPath}}"
@@ -70,7 +70,7 @@
                 </umb-button>
 
                 <umb-button
-                  alias="preview"
+                    alias="preview"
                     ng-if="!page.isNew && content.allowPreview"
                     type="button"
                     button-style="info"
@@ -80,7 +80,7 @@
                 </umb-button>
 
                 <umb-button-group
-                    ng-if="defaultButton"
+                    ng-if="defaultButton && !content.trashed"
                     default-button="defaultButton"
                     sub-buttons="subButtons"
                     state="page.buttonGroupState"
@@ -88,6 +88,16 @@
                     float="right">
                 </umb-button-group>
 
+                <umb-button
+                    alias="restore"
+                    ng-if="content.trashed"
+                    type="button"
+                    button-style="primary"
+                    action="restore(content)"
+                    state="page.buttonRestore"
+                    label="Restore">
+                </umb-button>
+
             </umb-editor-footer-content-right>
 
          </umb-editor-footer>

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

@@ -7,10 +7,14 @@
             <umb-box-content class="block-form">
                 <ul class="nav nav-stacked" style="margin-bottom: 0;">
                     <li ng-repeat="url in node.urls">
-                        <a href="{{url}}" target="_blank">
+                        <a ng-if="node.published" href="{{url}}" target="_blank">
                             <i class="icon icon-window-popin"></i>
                             <span>{{url}}</span>
                         </a>
+                        <div ng-if="!node.published">
+                            <i class="icon icon-window-popin"></i>
+                            <span>{{url}}</span>
+                        </div>
                     </li>
                 </ul>
             </umb-box-content>
@@ -32,10 +36,13 @@
                             <localize key="content_noChanges"></localize>
                         </umb-empty-state>
                     </div>
+
+                    <div class="history">
+
+                        <div ng-if="auditTrail.length > 1" class="history-line"></div>                            
                     
-                    <div class="history-item" ng-repeat="item in auditTrail" ng-class="{'last-history-item': $last}">
-                        <div class="history-row">
-                        
+                        <div class="history-item" ng-repeat="item in auditTrail">
+                            
                             <div class="history-item__break">
                                 <div class="history-item__avatar">
                                     <umb-avatar
@@ -47,22 +54,22 @@
                                     </umb-avatar>
                                 </div>
 
-                                <div class="name-date-container">
+                                <div>
                                     <div>{{ item.userName }}</div>
-                                    <div class="history-item__date">{{ item.timestamp | amDateFormat:'MMMM Do YYYY, HH:mm' }}</div>
+                                    <div class="history-item__date">{{item.timestampFormatted}}</div>
                                 </div>
                             </div>
                             
                             <div class="history-item__break">
                                 <umb-badge
-                                    size="s"
+                                    size="xs"
                                     color="{{item.logTypeColor}}">
                                     {{ item.logType }}
                                 </umb-badge>
                                 <span>{{ item.comment }}</span>
                             </div>
+                            
                         </div>
-                        <div class="history-line"></div>
                     </div>
 
                 </div>
@@ -102,19 +109,19 @@
                                 </div>
 
                                 <div class="date-container__date" ng-if="node.releaseDate">
-                                    <div class="date-wrapper__date">{{node.releaseDate | amDateFormat:'MMMM'}} {{node.releaseDate | amDateFormat:'YYYY'}}</div>
-                                    <div class="date-wrapper__number">{{node.releaseDate | amDateFormat:'DD'}}</div>
-                                    <div class="date-wrapper__date">{{node.releaseDate | amDateFormat:'dddd'}} {{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;">Set date</a>                                                    
+                                <a href="" ng-if="!node.releaseDate" class="bold" style="color: #00aea2; text-decoration: underline;"><localize key="content_setDate">Set date</localize></a>                                                    
                                 
                             </div>
 
                         </umb-date-time-picker>
                         
                         <a ng-if="node.releaseDate" ng-click="clearPublishDate()" href="" style="text-decoration: underline;">
-                            <small>Clear date</small>
+                            <small><localize key="content_removeDate">Clear date</localize></small>
                         </a>
 
                     </div>
@@ -134,19 +141,19 @@
                                 </div>
                                 
                                 <div class="date-container__date" ng-if="node.removeDate">
-                                    <div class="date-wrapper__date">{{node.removeDate | amDateFormat:'MMMM'}} {{node.removeDate | amDateFormat:'YYYY'}}</div>
-                                    <div class="date-wrapper__number">{{node.removeDate | amDateFormat:'DD'}}</div>
-                                    <div class="date-wrapper__date">{{node.removeDate | amDateFormat:'dddd'}} {{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;">Set date</a>
+                                <a href="" ng-if="!node.removeDate" class="bold" style="color: #00aea2; text-decoration: underline;"><localize key="content_setDate">Set date</localize></a>
 
                             </div>
 
                         </umb-date-time-picker>
 
                         <a ng-if="node.removeDate" ng-click="clearUnpublishDate()" href="" style="text-decoration: underline;">
-                            <small>Clear date</small>
+                            <small><localize key="content_removeDate">Clear date</localize></small>
                         </a>
                     </div>
 
@@ -158,9 +165,15 @@
         <umb-box data-element="node-info-general">
             <umb-box-header title-key="general_general"></umb-box-header>
             <umb-box-content class="block-form">
+
+                <umb-control-group data-element="node-info-status" label="@general_status">
+                    <umb-badge size="xs" color="{{publishStatus.color}}">
+                        {{publishStatus.label}}
+                    </umb-badge>
+                </umb-control-group>
                 
                 <umb-control-group data-element="node-info-create-date" label="@template_createdDate">
-                    {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }}
+                    {{node.createDateFormatted}} <localize key="general_by">by</localize> {{ node.owner.name }}
                 </umb-control-group>
 
                 <umb-control-group data-element="node-info-document-type" label="@content_documentType">
@@ -191,4 +204,4 @@
             </umb-box-content>    
         </umb-box>
     </div>
-</div>
+</div>

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html

@@ -1,4 +1,4 @@
- <div data-element="editor-content" class="umb-editor-container umb-panel-body umb-scrollable row-fluid" ng-class="{'-stop-scrolling': numberOfOverlays > 0}">
+ <div data-element="editor-container" class="umb-editor-container umb-panel-body umb-scrollable row-fluid" ng-class="{'-stop-scrolling': numberOfOverlays > 0}">
      <umb-overlay-backdrop></umb-overlay-backdrop>
      <div class="umb-pane">
         <div ng-transclude></div>

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html

@@ -1,4 +1,4 @@
-<div class="umb-tab-buttons umb-editor-drawer">
+<div data-element="editor-footer" class="umb-tab-buttons umb-editor-drawer">
 
     <div class="umb-editor-drawer-content" ng-transclude>
 

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html

@@ -6,7 +6,7 @@
 
             <div class="umb-panel-header-left-side" ng-class="{'-top-position': tabs || !icon && hideDescription}">
               
-              <ng-form data-element=="editor-icon" name="iconForm">
+              <ng-form data-element="editor-icon" name="iconForm">
                  <div class="umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}" title="{{$parent.icon}}">
                      <i class="icon {{$parent.icon}}"  ng-if="$parent.icon!=='' && $parent.icon!==null"></i>
                      <div class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">

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.Client/src/views/components/umb-groups-builder.html

@@ -34,7 +34,7 @@
 
     <ul class="umb-group-builder__groups" ui-sortable="sortableOptionsGroup" ng-model="model.groups">
 
-        <li ng-repeat="tab in model.groups" ng-class="{'umb-group-builder__group-sortable': sortingMode}" data-element="group-{{$index}}">
+        <li ng-repeat="tab in model.groups" ng-class="{'umb-group-builder__group-sortable': sortingMode}" data-element="group-{{tab.name}}">
 
             <!-- TAB INIT STATE -->
             <a href="" class="umb-group-builder__group -placeholder" hotkey="alt+shift+t" ng-click="addGroup(tab)" ng-if="tab.tabState=='init' && !sortingMode" data-element="group-add">
@@ -110,7 +110,7 @@
 
                 <ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="tab.properties">
 
-                    <li ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}" ng-repeat="property in tab.properties">
+                    <li data-element="property-{{property.alias}}" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}" ng-repeat="property in tab.properties">
 
                         <!-- Init property / Property placeholder / add new property -->
                         <a href=""

src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js

@@ -29,6 +29,17 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
 			    contentResource.getById($scope.relation.parentId).then(function (data) {
 					$scope.target = data;
 
+					// make sure the target item isn't in the recycle bin
+					if($scope.target.path.indexOf("-20") !== -1) {
+						$scope.error = {
+							errorMsg: "Cannot automatically restore this item",
+							data: {
+								Message: "The item you want to restore it under (" + $scope.target.name + ") is in the recycle bin. Use the Move menu item to move the item manually."								
+							}
+						};
+						$scope.success = false;
+					}
+
 				}, function (err) {
 					$scope.success = false;
 					$scope.error = err;