bumps to RC1

Moves binding redirects to pre app startup
Merge pull request #1897 from umbraco/temp-u4-9798
2017-04-21 17:45:27 +10:00 · 2017-04-21 12:15:36 +10:00 · 2017-04-21 11:28:37 +10:00 · 2017-04-20 23:42:15 +02:00 · 2017-04-20 15:12:12 +01:00 · 2017-04-20 12:03:29 +02:00
143 changed files with 1082 additions and 1466 deletions
@@ -0,0 +1,10 @@
+root=true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
+indent_size = 4
@@ -14,12 +14,13 @@
    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
    <language>en-US</language>
    <tags>umbraco</tags>
-    <dependencies>
-      <!--Must be this way because 2.0.5 is actually 1.2.15.0 and 2.0.6 is actually 2.0.6 !-->
-      <dependency id="log4net" version="[2.0.5,2.0.6)" />
+    <dependencies>      
+      <dependency id="log4net" version="[2.0.8,3.0.0)" />
+      <dependency id="Log4Net.Async" version="[2.0.4,3.0.0)" />
      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
@@ -27,19 +28,19 @@
      <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="SharpZipLib" version="[0.86.0, 1.0.0)" />
-      <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
+      <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
      <dependency id="ClientDependency" version="[1.9.2, 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="[9.0.1, 10.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
      <dependency id="Examine" version="[0.1.82, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.2, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.2, 5.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
      <dependency id="semver" version="[2.0.4, 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.6.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -16,8 +16,8 @@
    <tags>umbraco</tags>
    <dependencies>
      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[9.0.1, 10.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.6, 4.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
 	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
    </dependencies>
@@ -8,8 +8,16 @@
                                                   
 ----------------------------------------------------

-Don't forget to build!
+*** IMPORTANT NOTICE FOR 7.6 UPGRADES ***

+Be sure to read the version specific upgrade information before proceeding:
+https://our.umbraco.org/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-6-0
+
+You will most likely need to make some changes to your web.config and you will need to be 
+aware of the breaking changes listed there to see if these affect your installation.
+
+
+Don't forget to build!

 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
@@ -330,6 +330,8 @@
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

@@ -349,7 +351,7 @@
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -383,6 +385,10 @@
        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>

@@ -1,3 +1,3 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
 7.6.0
-RC
+RC1
@@ -4,7 +4,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -30,6 +30,10 @@
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-RC")]
+[assembly: AssemblyInformationalVersion("7.6.0-RC1")]
@@ -4,12 +4,14 @@ using System.Text.RegularExpressions;
 using System.Web;
 using Umbraco.Core;

+[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
+
 namespace Umbraco.Core
 {
    /// <summary>
-    /// Manages any assembly binding redirects that cannot be done via config
+    /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies)
    /// </summary>
-    internal class BindingRedirects
+    public sealed class BindingRedirects
    {
        public static void Initialize()
        {
@@ -17,12 +19,9 @@ namespace Umbraco.Core
            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
        }

-        private static readonly Regex Log4NetAssemblyPattern = new Regex("log4net, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=null");
-        private const string Log4NetReplacement = "log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a";
-
-        private static readonly Regex HtmlAgilityAssemblyPattern = new Regex("HtmlAgilityPack, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=bd319b19eaf3b43a");
-        private const string HtmlAgilityReplacement = "HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a";
-
+        private static readonly Regex Log4NetAssemblyPattern = new Regex("log4net, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=\\w+$", RegexOptions.Compiled);
+        private const string Log4NetReplacement = "log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a";
+        
        /// <summary>
        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
        /// </summary>
@@ -36,13 +35,7 @@ namespace Umbraco.Core
            {
                return Assembly.Load(Log4NetAssemblyPattern.Replace(args.Name, Log4NetReplacement));
            }
-
-            //HtmlAgility:            
-            if (HtmlAgilityAssemblyPattern.IsMatch(args.Name) && args.Name != HtmlAgilityReplacement)
-            {
-                return Assembly.Load(HtmlAgilityAssemblyPattern.Replace(args.Name, HtmlAgilityReplacement));
-            }
-
+            
            //AutoMapper:
            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
        /// Gets the version comment (like beta or RC).
        /// </summary>
        /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "RC"; } }
+        public static string CurrentComment { get { return "RC1"; } }

        // Get the version of the umbraco.dll by looking at a class in that dll
        // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
@@ -124,6 +124,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";

+            /// <summary>
+            /// Guid for a Member Group object.
+            /// </summary>
+            public static readonly Guid MemberGroupGuid = new Guid(MemberGroup);
+
            /// <summary>
            /// Guid for a Member Type object.
            /// </summary>
@@ -4,38 +4,144 @@ using System.IO;

 namespace Umbraco.Core.IO
 {
-	public interface IFileSystem
+    /// <summary>
+    /// Provides methods allowing the manipulation of files within an Umbraco application.
+    /// </summary>
+    public interface IFileSystem
    {
+        /// <summary>
+        /// Gets all directories matching the given path.
+        /// </summary>
+        /// <param name="path">The path to the directories.</param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched directories.
+        /// </returns>
        IEnumerable<string> GetDirectories(string path);

+        /// <summary>
+        /// Deletes the specified directory.
+        /// </summary>
+        /// <param name="path">The name of the directory to remove.</param>
        void DeleteDirectory(string path);

+        /// <summary>
+        /// Deletes the specified directory and, if indicated, any subdirectories and files in the directory.
+        /// </summary>
+        /// <remarks>Azure blob storage has no real concept of directories so deletion is always recursive.</remarks>
+        /// <param name="path">The name of the directory to remove.</param>
+        /// <param name="recursive">Whether to remove directories, subdirectories, and files in path.</param>
        void DeleteDirectory(string path, bool recursive);

+        /// <summary>
+        /// Determines whether the specified directory exists.
+        /// </summary>
+        /// <param name="path">The directory to check.</param>
+        /// <returns>
+        /// <c>True</c> if the directory exists and the user has permission to view it; otherwise <c>false</c>.
+        /// </returns>
        bool DirectoryExists(string path);

+        /// <summary>
+        /// Adds a file to the file system.
+        /// </summary>
+        /// <param name="path">The path to the given file.</param>
+        /// <param name="stream">The <see cref="Stream"/> containing the file contents.</param>
        void AddFile(string path, Stream stream);

+        /// <summary>
+        /// Adds a file to the file system.
+        /// </summary>
+        /// <param name="path">The path to the given file.</param>
+        /// <param name="stream">The <see cref="Stream"/> containing the file contents.</param>
+        /// <param name="overrideIfExists">Whether to override the file if it already exists.</param>
        void AddFile(string path, Stream stream, bool overrideIfExists);

+        /// <summary>
+        /// Gets all files matching the given path.
+        /// </summary>
+        /// <param name="path">The path to the files.</param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched files.
+        /// </returns>
        IEnumerable<string> GetFiles(string path);

+        /// <summary>
+        /// Gets all files matching the given path and filter.
+        /// </summary>
+        /// <param name="path">The path to the files.</param>
+        /// <param name="filter">A filter that allows the querying of file extension. <example>*.jpg</example></param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched files.
+        /// </returns>
        IEnumerable<string> GetFiles(string path, string filter);

+        /// <summary>
+        /// Gets a <see cref="Stream"/> representing the file at the gieven path.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="Stream"/>.
+        /// </returns>
        Stream OpenFile(string path);

+        /// <summary>
+        /// Deletes the specified file.
+        /// </summary>
+        /// <param name="path">The name of the file to remove.</param>
        void DeleteFile(string path);

+        /// <summary>
+        /// Determines whether the specified file exists.
+        /// </summary>
+        /// <param name="path">The file to check.</param>
+        /// <returns>
+        /// <c>True</c> if the file exists and the user has permission to view it; otherwise <c>false</c>.
+        /// </returns>
        bool FileExists(string path);

+        /// <summary>
+        /// Returns the application relative path to the file.
+        /// </summary>
+        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <returns>
+        /// The <see cref="string"/> representing the relative path.
+        /// </returns>
        string GetRelativePath(string fullPathOrUrl);

+        /// <summary>
+        /// Gets the full qualified path to the file.
+        /// </summary>
+        /// <param name="path">The file to return the full path for.</param>
+        /// <returns>
+        /// The <see cref="string"/> representing the full path.
+        /// </returns>
        string GetFullPath(string path);

+        /// <summary>
+        /// Returns the application relative url to the file.
+        /// </summary>
+        /// <param name="path">The path to return the url for.</param>
+        /// <returns>
+        /// <see cref="string"/> representing the relative url.
+        /// </returns>
        string GetUrl(string path);

+        /// <summary>
+        /// Gets the last modified date/time of the file, expressed as a UTC value.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="DateTimeOffset"/>.
+        /// </returns>
        DateTimeOffset GetLastModified(string path);

+        /// <summary>
+        /// Gets the created date/time of the file, expressed as a UTC value.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="DateTimeOffset"/>.
+        /// </returns>
        DateTimeOffset GetCreated(string path);
    }

@@ -158,7 +158,7 @@ namespace Umbraco.Core.IO
            // if can seek, be safe and go back to start, else...
            // hope that the stream hasn't been read already
            if (stream.CanSeek)
-                stream.Seek(0, 0);
+                stream.Seek(0, SeekOrigin.Begin);

            using (var destination = (Stream) File.Create(fullPath))
                stream.CopyTo(destination);
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Logging
    /// This is an old/deprecated logger and has been superceded by ParallelForwardingAppender which is included in Umbraco and 
    /// also by AsyncForwardingAppender in the Log4Net.Async library.
 	/// </summary>
-	[Obsolete("This is superceded by the ParallelForwardingAppender, this will be removed in v8")]
+	[Obsolete("This is superceded by the ParallelForwardingAppender, this will be removed in v8, do not use this")]
    [EditorBrowsable(EditorBrowsableState.Never)]
 	public class AsynchronousRollingFileAppender : RollingFileAppender
 	{
@@ -13,301 +13,8 @@ namespace Umbraco.Core.Logging
    /// <remarks>
    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
    /// </remarks>
-    public class ParallelForwardingAppender : AsyncForwardingAppenderBase, IDisposable
+    [Obsolete("Use the Log4Net.Async.ParallelForwardingAppender instead this will be removed in future versions")]
+    public class ParallelForwardingAppender : Log4Net.Async.ParallelForwardingAppender
    {
-        #region Private Members
-
-        private const int DefaultBufferSize = 1000;
-        private BlockingCollection<LoggingEventContext> _loggingEvents;
-        private CancellationTokenSource _loggingCancelationTokenSource;
-        private CancellationToken _loggingCancelationToken;
-        private Task _loggingTask;
-        private Double _shutdownFlushTimeout = 2;
-        private TimeSpan _shutdownFlushTimespan = TimeSpan.FromSeconds(2);
-        private static readonly Type ThisType = typeof(ParallelForwardingAppender);
-        private volatile bool shutDownRequested;
-        private int? bufferSize = DefaultBufferSize;
-
-        #endregion Private Members
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the number of LoggingEvents that will be buffered.  Set to null for unlimited.
-        /// </summary>
-        public override int? BufferSize
-        {
-            get { return bufferSize; }
-            set { bufferSize = value; }
-        }
-
-        public int BufferEntryCount
-        {
-            get
-            {
-                if (_loggingEvents == null) return 0;
-                return _loggingEvents.Count;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time period in which the system will wait for appenders to flush before canceling the background task.
-        /// </summary>
-        public Double ShutdownFlushTimeout
-        {
-            get
-            {
-                return _shutdownFlushTimeout;
-            }
-            set
-            {
-                _shutdownFlushTimeout = value;
-            }
-        }
-
-        protected override string InternalLoggerName
-        {
-            get
-            {
-                {
-                    return "ParallelForwardingAppender";
-                }
-            }
-        }
-
-        #endregion Properties
-
-        #region Startup
-
-        public override void ActivateOptions()
-        {
-            base.ActivateOptions();
-            _shutdownFlushTimespan = TimeSpan.FromSeconds(_shutdownFlushTimeout);
-            StartForwarding();
-        }
-
-        private void StartForwarding()
-        {
-            if (shutDownRequested)
-            {
-                return;
-            }
-            //Create a collection which will block the thread and wait for new entries
-            //if the collection is empty
-            if (BufferSize.HasValue && BufferSize > 0)
-            {
-                _loggingEvents = new BlockingCollection<LoggingEventContext>(BufferSize.Value);
-            }
-            else
-            {
-                //No limit on the number of events.
-                _loggingEvents = new BlockingCollection<LoggingEventContext>();
-            }
-            //The cancellation token is used to cancel a running task gracefully.
-            _loggingCancelationTokenSource = new CancellationTokenSource();
-            _loggingCancelationToken = _loggingCancelationTokenSource.Token;
-            _loggingTask = new Task(SubscriberLoop, _loggingCancelationToken);
-            _loggingTask.Start();
-        }
-
-        #endregion Startup
-
-        #region Shutdown
-
-        private void CompleteSubscriberTask()
-        {
-            shutDownRequested = true;
-            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted)
-            {
-                return;
-            }
-            //Don't allow more entries to be added.
-            _loggingEvents.CompleteAdding();
-            //Allow some time to flush
-            Thread.Sleep(_shutdownFlushTimespan);
-            if (!_loggingTask.IsCompleted && !_loggingCancelationToken.IsCancellationRequested)
-            {
-                _loggingCancelationTokenSource.Cancel();
-                //Wait here so that the error logging messages do not get into a random order.
-                //Don't pass the cancellation token because we are not interested
-                //in catching the OperationCanceledException that results.
-                _loggingTask.Wait();
-            }
-            if (!_loggingEvents.IsCompleted)
-            {
-                ForwardInternalError("The buffer was not able to be flushed before timeout occurred.", null, ThisType);
-            }
-        }
-
-        protected override void OnClose()
-        {
-            CompleteSubscriberTask();
-            base.OnClose();
-        }
-
-        #endregion Shutdown
-
-        #region Appending
-
-        protected override void Append(LoggingEvent loggingEvent)
-        {
-            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted || loggingEvent == null)
-            {
-                return;
-            }
-
-            loggingEvent.Fix = Fix;
-            //In the case where blocking on a full collection, and the task is subsequently completed, the cancellation token
-            //will prevent the entry from attempting to add to the completed collection which would result in an exception.
-            _loggingEvents.Add(new LoggingEventContext(loggingEvent, HttpContext), _loggingCancelationToken);
-        }
-
-        protected override void Append(LoggingEvent[] loggingEvents)
-        {
-            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted || loggingEvents == null)
-            {
-                return;
-            }
-
-            foreach (var loggingEvent in loggingEvents)
-            {
-                Append(loggingEvent);
-            }
-        }
-
-        #endregion Appending
-
-        #region Forwarding
-
-        /// <summary>
-        /// Iterates over a BlockingCollection containing LoggingEvents.
-        /// </summary>
-        private void SubscriberLoop()
-        {
-            Thread.CurrentThread.Name = String.Format("{0} ParallelForwardingAppender Subscriber Task", Name);
-            //The task will continue in a blocking loop until
-            //the queue is marked as adding completed, or the task is canceled.
-            try
-            {
-                //This call blocks until an item is available or until adding is completed
-                foreach (var entry in _loggingEvents.GetConsumingEnumerable(_loggingCancelationToken))
-                {
-                    HttpContext = entry.HttpContext;
-                    ForwardLoggingEvent(entry.LoggingEvent, ThisType);
-                }
-            }
-            catch (OperationCanceledException ex)
-            {
-                //The thread was canceled before all entries could be forwarded and the collection completed.
-                ForwardInternalError("Subscriber task was canceled before completion.", ex, ThisType);
-                //Cancellation is called in the CompleteSubscriberTask so don't call that again.
-            }
-            catch (ThreadAbortException ex)
-            {
-                //Thread abort may occur on domain unload.
-                ForwardInternalError("Subscriber task was aborted.", ex, ThisType);
-                //Cannot recover from a thread abort so complete the task.
-                CompleteSubscriberTask();
-                //The exception is swallowed because we don't want the client application
-                //to halt due to a logging issue.
-            }
-            catch (Exception ex)
-            {
-                //On exception, try to log the exception
-                ForwardInternalError("Subscriber task error in forwarding loop.", ex, ThisType);
-                //Any error in the loop is going to be some sort of extenuating circumstance from which we
-                //probably cannot recover anyway.   Complete subscribing.
-                CompleteSubscriberTask();
-            }
-        }
-
-        #endregion Forwarding
-
-        #region IDisposable Implementation
-
-        private bool _disposed = false;
-
-        //Implement IDisposable.
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                if (disposing)
-                {
-                    if (_loggingTask != null)
-                    {
-                        if (!(_loggingTask.IsCanceled || _loggingTask.IsCompleted || _loggingTask.IsFaulted))
-                        {
-                            try
-                            {
-                                CompleteSubscriberTask();
-                            }
-                            catch (Exception ex)
-                            {
-                                LogLog.Error(ThisType, "Exception Completing Subscriber Task in Dispose Method", ex);
-                            }
-                        }
-                        try
-                        {
-                            _loggingTask.Dispose();
-                        }
-                        catch (Exception ex)
-                        {
-                            LogLog.Error(ThisType, "Exception Disposing Logging Task", ex);
-                        }
-                        finally
-                        {
-                            _loggingTask = null;
-                        }
-                    }
-                    if (_loggingEvents != null)
-                    {
-                        try
-                        {
-                            _loggingEvents.Dispose();
-                        }
-                        catch (Exception ex)
-                        {
-                            LogLog.Error(ThisType, "Exception Disposing BlockingCollection", ex);
-                        }
-                        finally
-                        {
-                            _loggingEvents = null;
-                        }
-                    }
-                    if (_loggingCancelationTokenSource != null)
-                    {
-                        try
-                        {
-                            _loggingCancelationTokenSource.Dispose();
-                        }
-                        catch (Exception ex)
-                        {
-                            LogLog.Error(ThisType, "Exception Disposing CancellationTokenSource", ex);
-                        }
-                        finally
-                        {
-                            _loggingCancelationTokenSource = null;
-                        }
-                    }
-                }
-                _disposed = true;
-            }
-        }
-
-        // Use C# destructor syntax for finalization code.
-        ~ParallelForwardingAppender()
-        {
-            // Simply call Dispose(false).
-            Dispose(false);
-        }
-
-        #endregion IDisposable Implementation
    }
 }
@@ -1,11 +1,10 @@
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.SqlSyntax;

-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveFive
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero
 {
-    [Migration("7.5.5", 101, Constants.System.UmbracoMigrationName)]
+    [Migration("7.6.0", 101, Constants.System.UmbracoMigrationName)]
    public class AddLockObjects : MigrationBase
    {
        public AddLockObjects(ISqlSyntaxProvider sqlSyntax, ILogger logger)
@@ -1,11 +1,10 @@
 using System.Linq;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.SqlSyntax;

-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveFive
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero
 {
-    [Migration("7.5.5", 100, Constants.System.UmbracoMigrationName)]
+    [Migration("7.6.0", 100, Constants.System.UmbracoMigrationName)]
    public class AddLockTable : MigrationBase
    {
        public AddLockTable(ISqlSyntaxProvider sqlSyntax, ILogger logger)
@@ -14,13 +14,13 @@ namespace Umbraco.Core.PropertyEditors
    /// </summary>
    /// <remarks>
    /// This resolver will contain any parameter editors defined in manifests as well as any property editors defined in manifests
-    /// that have the IsParameterEditorFlag = true and any PropertyEditors found in c# that have this flag as well. 
+    /// that have the IsParameterEditorFlag = true and any PropertyEditors found in c# that have this flag as well.
    /// </remarks>
    internal class ParameterEditorResolver : LazyManyObjectsResolverBase<ParameterEditorResolver, IParameterEditor>
    {
        private readonly ManifestBuilder _builder;
        private readonly IContentSection _contentSection;
-        
+
        public ParameterEditorResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> typeListProducerList, ManifestBuilder builder)
            : base(serviceProvider, logger, typeListProducerList, ObjectLifetimeScope.Application)
        {
@@ -33,47 +33,51 @@ namespace Umbraco.Core.PropertyEditors
        /// </summary>
        public IEnumerable<IParameterEditor> ParameterEditors
        {
-            get
+            get { return GetParameterEditors(); }
+        }
+
+        public IEnumerable<IParameterEditor> GetParameterEditors(bool includeDeprecated = false)
+        {
+            // all property editors and parameter editors
+            // except property editors where !IsParameterEditor
+            var values = Values
+                .Where(x => x is PropertyEditor == false || ((PropertyEditor) x).IsParameterEditor);
+
+            // union all manifest parameter editors
+            values = values
+                .Union(_builder.ParameterEditors);
+
+            // union all manifest property editors where IsParameterEditor
+            values = values
+                .Union(_builder.PropertyEditors.Where(x => x.IsParameterEditor));
+
+            if (includeDeprecated == false && _contentSection.ShowDeprecatedPropertyEditors == false)
            {
-                // all property editors and parameter editors
-                // except property editors where !IsParameterEditor
-                var values = Values
-                    .Where(x => x is PropertyEditor == false || ((PropertyEditor) x).IsParameterEditor);
-
-                // union all manifest parameter editors
+                // except deprecated property editors
                values = values
-                    .Union(_builder.ParameterEditors);
-
-                // union all manifest property editors where IsParameterEditor
-                values = values
-                    .Union(_builder.PropertyEditors.Where(x => x.IsParameterEditor));
-
-                if (_contentSection.ShowDeprecatedPropertyEditors == false)
-                {
-                    // except deprecated property editors
-                    values = values
-                        .Where(x => x is PropertyEditor == false || ((PropertyEditor) x).IsDeprecated == false);
-                }
-
-                return values;
+                    .Where(x => x is PropertyEditor == false || ((PropertyEditor) x).IsDeprecated == false);
            }
+
+            return values;
        }

        /// <summary>
        /// Returns a property editor by alias
        /// </summary>
        /// <param name="alias"></param>
+        /// <param name="includeDeprecated"></param>
        /// <returns></returns>
-        public IParameterEditor GetByAlias(string alias)
+        public IParameterEditor GetByAlias(string alias, bool includeDeprecated = false)
        {
-            var found = ParameterEditors.SingleOrDefault(x => x.Alias == alias);
+            var paramEditors = GetParameterEditors(includeDeprecated).ToArray();
+            var found = paramEditors.SingleOrDefault(x => x.Alias == alias);
            if (found != null) return found;
-            
+
            //couldn't find one, so try the map
            var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(alias);
-            return mapped == null 
-                ? null 
-                : ParameterEditors.SingleOrDefault(x => x.Alias == mapped);
+            return mapped == null
+                ? null
+                : paramEditors.SingleOrDefault(x => x.Alias == mapped);
        }
    }
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -26,12 +27,16 @@ namespace Umbraco.Core.Publishing
        public int CheckPendingAndProcess()
        {
            var counter = 0;
-            foreach (var d in _contentService.GetContentForRelease())
+            var contentForRelease = _contentService.GetContentForRelease().ToArray();
+            if (contentForRelease.Length > 0)
+                LogHelper.Debug<ScheduledPublisher>(string.Format("There's {0} item(s) of content to be published", contentForRelease.Length));
+            foreach (var d in contentForRelease)
            {
                try
                {
                    d.ReleaseDate = null;
                    var result = _contentService.SaveAndPublishWithStatus(d, (int)d.GetWriterProfile().Id);
+                    LogHelper.Debug<ContentService>(string.Format("Result of publish attempt: {0}", result.Result.StatusType));
                    if (result.Success == false)
                    {
                        if (result.Exception != null)
@@ -54,7 +59,11 @@ namespace Umbraco.Core.Publishing
                    throw;
                }
            }
-            foreach (var d in _contentService.GetContentForExpiration())
+
+            var contentForExpiration = _contentService.GetContentForExpiration().ToArray();
+            if (contentForExpiration.Length > 0)
+                LogHelper.Debug<ScheduledPublisher>(string.Format("There's {0} item(s) of content to be unpublished", contentForExpiration.Length));
+            foreach (var d in contentForExpiration)
            {
                try
                {
@@ -80,7 +80,41 @@ namespace Umbraco.Core.Security

            return false;
        }
+
+        /// <summary>
+        /// This will return the current back office identity if the IPrincipal is the correct type
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        internal static UmbracoBackOfficeIdentity GetUmbracoIdentity(this IPrincipal user)
+        {
+            //If it's already a UmbracoBackOfficeIdentity
+            var backOfficeIdentity = user.Identity as UmbracoBackOfficeIdentity;
+            if (backOfficeIdentity != null) return backOfficeIdentity;

+            //Check if there's more than one identity assigned and see if it's a UmbracoBackOfficeIdentity and use that
+            var claimsPrincipal = user as ClaimsPrincipal;
+            if (claimsPrincipal != null)
+            {
+                backOfficeIdentity = claimsPrincipal.Identities.OfType<UmbracoBackOfficeIdentity>().FirstOrDefault();
+                if (backOfficeIdentity != null) return backOfficeIdentity;
+            }
+
+            //Otherwise convert to a UmbracoBackOfficeIdentity if it's auth'd and has the back office session            
+            var claimsIdentity = user.Identity as ClaimsIdentity;
+            if (claimsIdentity != null && claimsIdentity.IsAuthenticated && claimsIdentity.HasClaim(x => x.Type == Constants.Security.SessionIdClaimType))
+            {
+                try
+                {
+                    return UmbracoBackOfficeIdentity.FromClaimsIdentity(claimsIdentity);
+                }
+                catch (InvalidOperationException)
+                {                    
+                }
+            }
+
+            return null;
+        }

        /// <summary>
        /// This will return the current back office identity. 
@@ -100,31 +134,8 @@ namespace Umbraco.Core.Security
            if (http.User == null) return null; //there's no user at all so no identity

            //If it's already a UmbracoBackOfficeIdentity
-            var backOfficeIdentity = http.User.Identity as UmbracoBackOfficeIdentity;
-            if (backOfficeIdentity != null) return backOfficeIdentity;
-
-            //Check if there's more than one identity assigned and see if it's a UmbracoBackOfficeIdentity and use that
-            var claimsPrincipal = http.User as ClaimsPrincipal;
-            if (claimsPrincipal != null)
-            {
-                backOfficeIdentity = claimsPrincipal.Identities.OfType<UmbracoBackOfficeIdentity>().FirstOrDefault();
-                if (backOfficeIdentity != null) return backOfficeIdentity;
-            }
-
-            //Otherwise convert to a UmbracoBackOfficeIdentity if it's auth'd and has the back office session            
-            var claimsIdentity = http.User.Identity as ClaimsIdentity;
-            if (claimsIdentity != null && claimsIdentity.IsAuthenticated && claimsIdentity.HasClaim(x => x.Type == Constants.Security.SessionIdClaimType))
-            {                 
-                try
-                {
-                    return UmbracoBackOfficeIdentity.FromClaimsIdentity(claimsIdentity);
-                }
-                catch (InvalidOperationException ex)
-                {
-                    //This will occur if the required claim types are missing which would mean something strange is going on
-                    LogHelper.Error(typeof(AuthenticationExtensions), "The current identity cannot be converted to " + typeof(UmbracoBackOfficeIdentity), ex);
-                }
-            }
+            var backOfficeIdentity = GetUmbracoIdentity(http.User);
+            if (backOfficeIdentity != null) return backOfficeIdentity;            

            if (authenticateRequestIfNotFound == false) return null;

@@ -9,6 +9,7 @@ using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;

 namespace Umbraco.Core.Security
 {
@@ -520,7 +521,11 @@ namespace Umbraco.Core.Security

        public override string ResetPassword(string username, string answer)
        {
-            if (EnablePasswordReset == false)
+            var userService = ApplicationContext.Current == null ? null : ApplicationContext.Current.Services.UserService;
+
+            var canReset = this.CanResetPassword(userService);                
+
+            if (canReset == false)
            {
                throw new NotSupportedException("Password reset is not supported");
            }
@@ -9,12 +9,45 @@ using System.Web;
 using System.Web.Hosting;
 using System.Web.Security;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
 using Umbraco.Core.Security;
+using Umbraco.Core.Services;

 namespace Umbraco.Core.Security
 {
    public static class MembershipProviderExtensions
    {
+        /// <summary>
+        /// Extension method to check if a password can be reset based on a given provider and the current request (logged in user)
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="userService"></param>
+        /// <returns></returns>
+        internal static bool CanResetPassword(this MembershipProvider provider, IUserService userService)
+        {
+            if (provider == null) throw new ArgumentNullException("provider");
+            
+            var canReset = provider.EnablePasswordReset;
+
+            if (userService == null) return canReset;
+
+            //we need to check for the special case in which a user is an admin - in which acse they can reset the password even if EnablePasswordReset == false
+            if (provider.EnablePasswordReset == false)
+            {
+                var identity = Thread.CurrentPrincipal.GetUmbracoIdentity();
+                if (identity != null)
+                {
+                    var user = userService.GetByUsername(identity.Username);
+                    var userIsAdmin = user.IsAdmin();
+                    if (userIsAdmin)
+                    {
+                        canReset = true;
+                    }
+                }
+            }
+            return canReset;
+        }
+
        internal static MembershipUserCollection FindUsersByName(this MembershipProvider provider, string usernameToMatch)
        {
            int totalRecords = 0;
@@ -1124,7 +1124,9 @@ namespace Umbraco.Core.Services
        /// <returns>True if unpublishing succeeded, otherwise False</returns>
        public bool UnPublish(IContent content, int userId = 0)
        {
-            return ((IContentServiceOperations)this).UnPublish(content, userId).Success;
+            var attempt = ((IContentServiceOperations)this).UnPublish(content, userId);
+            LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
+            return attempt.Success;
        }

        /// <summary>
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.CodeAnnotations;
 using Umbraco.Core.Events;
@@ -81,28 +80,16 @@ namespace Umbraco.Core.Services
            {
                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
                {
-                    switch (umbracoObjectType)
-                    {
-                        case UmbracoObjectTypes.Document:
-                        case UmbracoObjectTypes.MemberType:
-                        case UmbracoObjectTypes.Media:
-                        case UmbracoObjectTypes.Template:
-                        case UmbracoObjectTypes.MediaType:
-                        case UmbracoObjectTypes.DocumentType:
-                        case UmbracoObjectTypes.Member:
-                        case UmbracoObjectTypes.DataType:
-                        case UmbracoObjectTypes.DocumentTypeContainer:
-                            return uow.Database.ExecuteScalar<int?>(new Sql().Select("id").From<NodeDto>().Where<NodeDto>(dto => dto.UniqueId == key));
-                        case UmbracoObjectTypes.RecycleBin:
-                        case UmbracoObjectTypes.Stylesheet:
-                        case UmbracoObjectTypes.MemberGroup:
-                        case UmbracoObjectTypes.ContentItem:
-                        case UmbracoObjectTypes.ContentItemType:
-                        case UmbracoObjectTypes.ROOT:
-                        case UmbracoObjectTypes.Unknown:
-                        default:
-                            throw new NotSupportedException();
-                    }
+                    var nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType);
+
+                    var sql = new Sql()
+                        .Select("id")
+                        .From<NodeDto>()
+                        .Where<NodeDto>(
+                            dto =>
+                                dto.UniqueId == key &&
+                                dto.NodeObjectType == nodeObjectType);
+                    return uow.Database.ExecuteScalar<int?>(sql);
                }                
            });
            return result.HasValue ? Attempt.Succeed(result.Value) : Attempt<int>.Fail();
@@ -120,32 +107,54 @@ namespace Umbraco.Core.Services
            {
                using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
                {
-                    switch (umbracoObjectType)
-                    {
-                        case UmbracoObjectTypes.Document:
-                        case UmbracoObjectTypes.MemberType:
-                        case UmbracoObjectTypes.Media:
-                        case UmbracoObjectTypes.Template:
-                        case UmbracoObjectTypes.MediaType:
-                        case UmbracoObjectTypes.DocumentType:
-                        case UmbracoObjectTypes.Member:
-                        case UmbracoObjectTypes.DataType:
-                            return uow.Database.ExecuteScalar<Guid?>(new Sql().Select("uniqueID").From<NodeDto>().Where<NodeDto>(dto => dto.NodeId == id));
-                        case UmbracoObjectTypes.RecycleBin:
-                        case UmbracoObjectTypes.Stylesheet:
-                        case UmbracoObjectTypes.MemberGroup:
-                        case UmbracoObjectTypes.ContentItem:
-                        case UmbracoObjectTypes.ContentItemType:
-                        case UmbracoObjectTypes.ROOT:
-                        case UmbracoObjectTypes.Unknown:
-                        default:
-                            throw new NotSupportedException("Unsupported object type (" + umbracoObjectType + ").");
-                    }
+                    var nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType);
+
+                    var sql = new Sql()
+                        .Select("uniqueID")
+                        .From<NodeDto>()
+                        .Where<NodeDto>(
+                            dto =>
+                                dto.NodeId == id &&
+                                dto.NodeObjectType == nodeObjectType);
+                    return uow.Database.ExecuteScalar<Guid?>(sql);
                }
            });
            return result.HasValue ? Attempt.Succeed(result.Value) : Attempt<Guid>.Fail();
        }

+        private static Guid GetNodeObjectTypeGuid(UmbracoObjectTypes umbracoObjectType)
+        {
+            switch (umbracoObjectType)
+            {
+                case UmbracoObjectTypes.Document:
+                    return Constants.ObjectTypes.DocumentGuid;
+                case UmbracoObjectTypes.MemberType:
+                    return Constants.ObjectTypes.MemberTypeGuid;
+                case UmbracoObjectTypes.Media:
+                    return Constants.ObjectTypes.MediaGuid;
+                case UmbracoObjectTypes.Template:
+                    return Constants.ObjectTypes.TemplateTypeGuid;
+                case UmbracoObjectTypes.MediaType:
+                    return Constants.ObjectTypes.MediaTypeGuid;
+                case UmbracoObjectTypes.DocumentType:
+                    return Constants.ObjectTypes.DocumentTypeGuid;
+                case UmbracoObjectTypes.Member:
+                    return Constants.ObjectTypes.MemberGuid;
+                case UmbracoObjectTypes.DataType:
+                    return Constants.ObjectTypes.DataTypeGuid;
+                case UmbracoObjectTypes.MemberGroup:
+                    return Constants.ObjectTypes.MemberGroupGuid;
+                case UmbracoObjectTypes.RecycleBin:
+                case UmbracoObjectTypes.Stylesheet:
+                case UmbracoObjectTypes.ContentItem:
+                case UmbracoObjectTypes.ContentItemType:
+                case UmbracoObjectTypes.ROOT:
+                case UmbracoObjectTypes.Unknown:
+                default:
+                    throw new NotSupportedException("Unsupported object type (" + umbracoObjectType + ").");
+            }
+        }
+
        public IUmbracoEntity GetByKey(Guid key, bool loadBaseType = true)
        {
            if (loadBaseType)
@@ -53,13 +53,14 @@
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
    </Reference>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Log4Net.Async, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll</HintPath>
    </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>
@@ -89,13 +90,11 @@
      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
-      <Private>True</Private>
+    <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>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <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>
@@ -496,8 +495,8 @@
    <Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
    <Compile Include="Persistence\Migrations\LocalMigrationContext.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionFourOneZero\AddPreviewXmlTable.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveFive\AddLockObjects.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveFive\AddLockTable.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSixZero\AddLockObjects.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSixZero\AddLockTable.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveFive\UpdateAllowedMediaTypesAtRoot.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\EnsureServersLockObject.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable.cs" />
@@ -49,8 +49,6 @@ namespace Umbraco.Core
                LogHelper.Error<UmbracoApplicationBase>(msg, exception);
            };

-            BindingRedirects.Initialize();
-
            //boot up the application
            GetBootManager()
                .Initialize()
@@ -4,7 +4,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -30,11 +30,15 @@
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
    <DbProviderFactories>
      <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
    </DbProviderFactories>
  </system.data></configuration>
@@ -2,8 +2,9 @@
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.2" targetFramework="net45" />
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
+  <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
@@ -11,14 +12,14 @@
  <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net45" />
  <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
  <package id="Semver" version="2.0.4" targetFramework="net45" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net45" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
 </packages>
@@ -45,7 +45,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -71,6 +71,10 @@
        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
@@ -69,8 +69,8 @@
      <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.7.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.7.0\lib\net45\Moq.dll</HintPath>
+    <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>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -10,7 +10,7 @@
  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net45" />
  <package id="Microsoft.SqlServer.Compact" version="4.0.8854.1" targetFramework="net45" />
-  <package id="Moq" version="4.7.0" targetFramework="net45" />
+  <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
  <package id="System.Collections" version="4.0.11" targetFramework="net45" />
  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net45" />
@@ -124,7 +124,7 @@
        
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
        
      </dependentAssembly>
      
@@ -200,6 +200,14 @@

      </dependentAssembly>

+      <dependentAssembly>
+
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+
+      </dependentAssembly>
+
    </assemblyBinding>

  </runtime>
@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using log4net;
-using log4net.Config;
-using log4net.Core;
-using log4net.Layout;
-using log4net.Repository;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Tests.Logging
-{
-    [TestFixture]
-    public class AsyncRollingFileAppenderTest
-    {
-        private const string ErrorMessage = "TEST ERROR MESSAGE";
-        private const string FileFolderPath = @"c:\LogTesting\";
-        private readonly Level ErrorLevel = Level.Error;
-        private AsynchronousRollingFileAppender appender;
-        private ILoggerRepository rep;
-        private Guid fileGuid;
-
-        private string GetFilePath()
-        {
-            return string.Format("{0}{1}.log", FileFolderPath, fileGuid);
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            fileGuid = Guid.NewGuid();
-            if (File.Exists(GetFilePath()))
-            {
-                File.Delete(GetFilePath());
-            }
-
-            appender = new AsynchronousRollingFileAppender();
-            appender.Threshold = ErrorLevel;
-            appender.File = GetFilePath();
-            appender.Layout = new PatternLayout("%d|%-5level|%logger| %message %exception%n");
-            appender.StaticLogFileName = true;
-            appender.AppendToFile = true;
-            appender.ActivateOptions();
-
-            rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
-            BasicConfigurator.Configure(rep, appender);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            rep.Shutdown();
-            if (File.Exists(GetFilePath()))
-            {
-                File.Delete(GetFilePath());
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void FixtureTearDown()
-        {
-            foreach (string file in Directory.GetFiles(FileFolderPath))
-            {
-                try
-                {
-                    File.Delete(file);
-                }
-                catch { }
-            }
-        }
-
-        private void ReleaseFileLocks()
-        {
-            rep.Shutdown();
-            appender.Close();
-        }
-
-        [Test]
-        public void CanWriteToFile()
-        {
-            // Arrange
-            ILog log = LogManager.GetLogger(rep.Name, "CanWriteToDatabase");
-
-            // Act
-            log.Error(ErrorMessage);
-            Thread.Sleep(200); // let background thread finish
-
-            // Assert
-            ReleaseFileLocks();
-            Assert.That(File.Exists(GetFilePath()), Is.True);
-            IEnumerable<string> readLines = File.ReadLines(GetFilePath());
-            Assert.That(readLines.Count(), Is.GreaterThanOrEqualTo(1));
-        }
-
-        [Test]
-        public void ReturnsQuicklyAfterLogging100Messages()
-        {
-            // Arrange
-            ILog log = LogManager.GetLogger(rep.Name, "ReturnsQuicklyAfterLogging100Messages");
-
-            // Act
-            DateTime startTime = DateTime.UtcNow;
-            100.Times(i => log.Error(ErrorMessage));
-            DateTime endTime = DateTime.UtcNow;
-
-            // Give background thread time to finish
-            Thread.Sleep(500);
-
-            // Assert
-            ReleaseFileLocks();
-            Assert.That(endTime - startTime, Is.LessThan(TimeSpan.FromMilliseconds(100)));
-            Assert.That(File.Exists(GetFilePath()), Is.True);
-            IEnumerable<string> readLines = File.ReadLines(GetFilePath());
-            Assert.That(readLines.Count(), Is.GreaterThanOrEqualTo(100));
-        }
-
-        [Test]
-        [Ignore]
-        public void CanLogAtleast1000MessagesASecond()
-        {
-            // Arrange
-            ILog log = LogManager.GetLogger(rep.Name, "CanLogAtLeast1000MessagesASecond");
-
-            int logCount = 0;
-            bool logging = true;
-            bool logsCounted = false;
-
-            var logTimer = new Timer(s =>
-            {
-                logging = false;
-
-                if (File.Exists(GetFilePath()))
-                {
-                    ReleaseFileLocks();
-                    IEnumerable<string> readLines = File.ReadLines(GetFilePath());
-                    logCount = readLines.Count();
-                }
-                logsCounted = true;
-            }, null, TimeSpan.FromSeconds(3), TimeSpan.FromMilliseconds(-1));
-
-            // Act
-            DateTime startTime = DateTime.UtcNow;
-            while (logging)
-            {
-                log.Error(ErrorMessage);
-            }
-            TimeSpan testDuration = DateTime.UtcNow - startTime;
-
-            while (!logsCounted)
-            {
-                Thread.Sleep(1);
-            }
-
-            logTimer.Dispose();
-
-            // Assert
-            var logsPerSecond = logCount / testDuration.TotalSeconds;
-
-            Debug.Print("{0} messages logged in {1}s => {2}/s", logCount, testDuration.TotalSeconds, logsPerSecond);
-            Assert.That(logsPerSecond, Is.GreaterThan(1000), "Must log at least 1000 messages per second");
-        }
-    }
-}
@@ -1,25 +0,0 @@
-using System;
-using System.Threading;
-using log4net.Appender;
-using log4net.Core;
-
-namespace Umbraco.Tests.Logging
-{
-    /// <summary>
-    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
-    /// </summary>
-    public class DebugAppender : MemoryAppender
-    {
-        public TimeSpan AppendDelay { get; set; }
-        public int LoggedEventCount { get { return m_eventsList.Count; } }
-
-        protected override void Append(LoggingEvent loggingEvent)
-        {
-            if (AppendDelay > TimeSpan.Zero)
-            {
-                Thread.Sleep(AppendDelay);
-            }
-            base.Append(loggingEvent);
-        }
-    }
-}
@@ -1,327 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Security.Principal;
-using System.Threading;
-using log4net;
-using log4net.Appender;
-using log4net.Config;
-using log4net.Core;
-using log4net.Filter;
-using log4net.Repository;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Tests.Logging
-{
-    /// <summary>
-    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
-    /// </summary>
-    [TestFixture]
-    public class ParallelForwarderTest : IDisposable
-    {
-        private ParallelForwardingAppender asyncForwardingAppender;
-        private DebugAppender debugAppender;
-        private ILoggerRepository repository;
-        private ILog log;
-
-        [SetUp]
-        public void TestFixtureSetUp()
-        {
-            debugAppender = new DebugAppender();
-            debugAppender.ActivateOptions();
-
-            asyncForwardingAppender = new ParallelForwardingAppender();
-            asyncForwardingAppender.AddAppender(debugAppender);
-            asyncForwardingAppender.ActivateOptions();
-
-            repository = LogManager.CreateRepository(Guid.NewGuid().ToString());
-            BasicConfigurator.Configure(repository, asyncForwardingAppender);
-
-            log = LogManager.GetLogger(repository.Name, "TestLogger");
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            LogManager.Shutdown();
-        }
-
-        [Test]
-        public void CanHandleNullLoggingEvent()
-        {
-            // Arrange
-
-            // Act
-            asyncForwardingAppender.DoAppend((LoggingEvent)null);
-            log.Info("SusequentMessage");
-            asyncForwardingAppender.Close();
-
-            // Assert - should not have had an exception from previous call
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(1), "Expected subsequent message only");
-            Assert.That(debugAppender.GetEvents()[0].MessageObject, Is.EqualTo("SusequentMessage"));
-        }
-
-        [Test]
-        public void CanHandleNullLoggingEvents()
-        {
-            // Arrange
-
-            // Act
-            asyncForwardingAppender.DoAppend((LoggingEvent[])null);
-            log.Info("SusequentMessage");
-            asyncForwardingAppender.Close();
-
-            // Assert - should not have had an exception from previous call
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(1), "Expected subsequent message only");
-            Assert.That(debugAppender.GetEvents()[0].MessageObject, Is.EqualTo("SusequentMessage"));
-        }
-
-        [Test]
-        public void CanHandleAppenderThrowing()
-        {
-            // Arrange
-            var badAppender = new Mock<IAppender>();
-            asyncForwardingAppender.AddAppender(badAppender.Object);
-
-            badAppender
-                .Setup(ba => ba.DoAppend(It.IsAny<LoggingEvent>()))
-                .Throws(new Exception("Bad Appender"));
-                //.Verifiable();
-
-            // Act
-            log.Info("InitialMessage");
-            log.Info("SusequentMessage");
-            asyncForwardingAppender.Close();
-
-            // Assert
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(2));
-            Assert.That(debugAppender.GetEvents()[1].MessageObject, Is.EqualTo("SusequentMessage"));
-            badAppender.Verify(appender => appender.DoAppend(It.IsAny<LoggingEvent>()), Times.Exactly(2));
-        }
-
-        [Test]
-        public void WillLogFastWhenThereIsASlowAppender()
-        {
-            const int testSize = 1000;
-
-            // Arrange
-            debugAppender.AppendDelay = TimeSpan.FromSeconds(30);
-            var watch = new Stopwatch();
-
-            // Act
-            watch.Start();
-            for (int i = 0; i < testSize; i++)
-            {
-                log.Error("Exception");
-            }
-            watch.Stop();
-
-            // Assert
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(0));
-            Assert.That(watch.ElapsedMilliseconds, Is.LessThan(testSize));
-            Debug.Print("Logged {0} errors in {1}ms", testSize, watch.ElapsedMilliseconds);
-        }
-
-        [Test]
-        public void WillNotOverflow()
-        {
-            const int testSize = 1000;
-
-            // Arrange
-            debugAppender.AppendDelay = TimeSpan.FromMilliseconds(1);
-            asyncForwardingAppender.BufferSize = 100;
-
-            // Act
-            for (int i = 0; i < testSize; i++)
-            {
-                log.Error("Exception");
-            }
-
-            while (asyncForwardingAppender.BufferEntryCount > 0) ;
-            asyncForwardingAppender.Close();
-
-            // Assert
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(testSize));
-        }
-
-        [Test]
-        public void WillTryToFlushBufferOnShutdown()
-        {
-            const int testSize = 250;
-
-            // Arrange
-            debugAppender.AppendDelay = TimeSpan.FromMilliseconds(1);
-
-            // Act
-            for (int i = 0; i < testSize; i++)
-            {
-                log.Error("Exception");
-            }
-
-            Thread.Sleep(50);
-
-            var numberLoggedBeforeClose = debugAppender.LoggedEventCount;
-            asyncForwardingAppender.Close();
-            var numberLoggedAfterClose = debugAppender.LoggedEventCount;
-
-            // Assert
-            //We can't use specific numbers here because the timing and counts will be different on different systems.
-            Assert.That(numberLoggedBeforeClose, Is.GreaterThan(0), "Some number of Logging events should be logged prior to appender close.");
-            //On some systems, we may not be able to flush all events prior to close, but it is reasonable to assume in this test case
-            //that some events should be logged after close.
-            Assert.That(numberLoggedAfterClose, Is.GreaterThan(numberLoggedBeforeClose), "Some number of LoggingEvents should be logged after close.");
-            Debug.Print("Flushed {0} events during shutdown", numberLoggedAfterClose - numberLoggedBeforeClose);
-        }
-
-        [Test, Explicit("Long-running")]
-        public void WillShutdownIfBufferCannotBeFlushedFastEnough()
-        {
-            const int testSize = 250;
-
-            // Arrange
-            debugAppender.AppendDelay = TimeSpan.FromSeconds(1);
-            Stopwatch watch = new Stopwatch();
-
-            // Act
-            for (int i = 0; i < testSize; i++)
-            {
-                log.Error("Exception");
-            }
-
-            Thread.Sleep(TimeSpan.FromSeconds(2));
-            var numberLoggedBeforeClose = debugAppender.LoggedEventCount;
-
-            watch.Start();
-            asyncForwardingAppender.Close();
-            watch.Stop();
-
-            var numberLoggedAfterClose = debugAppender.LoggedEventCount;
-
-            // Assert
-            Assert.That(numberLoggedBeforeClose, Is.GreaterThan(0));
-            Assert.That(numberLoggedAfterClose, Is.GreaterThan(numberLoggedBeforeClose));
-            Assert.That(numberLoggedAfterClose, Is.LessThan(testSize));
-            //We can't assume what the shutdown time will be.  It will vary from system to system. Don't test shutdown time.            
-            var events = debugAppender.GetEvents();
-            var evnt = events[events.Length - 1];
-            Assert.That(evnt.MessageObject, Is.EqualTo("The buffer was not able to be flushed before timeout occurred."));
-            Debug.Print("Flushed {0} events during shutdown which lasted {1}ms", numberLoggedAfterClose - numberLoggedBeforeClose, watch.ElapsedMilliseconds);
-        }
-
-        [Test]
-        public void ThreadContextPropertiesArePreserved()
-        {
-            // Arrange
-            ThreadContext.Properties["TestProperty"] = "My Value";
-            Assert.That(asyncForwardingAppender.Fix & FixFlags.Properties, Is.EqualTo(FixFlags.Properties), "Properties must be fixed if they are to be preserved");
-
-            // Act
-            log.Info("Information");
-            asyncForwardingAppender.Close();
-
-            // Assert
-            var lastLoggedEvent = debugAppender.GetEvents()[0];
-            Assert.That(lastLoggedEvent.Properties["TestProperty"], Is.EqualTo("My Value"));
-        }
-
-        [Test]
-        public void MessagesExcludedByFilterShouldNotBeAppended()
-        {
-            // Arrange
-            var levelFilter =
-                new LevelRangeFilter
-                {
-                    LevelMin = Level.Warn,
-                    LevelMax = Level.Error,
-                };
-
-            asyncForwardingAppender.AddFilter(levelFilter);
-
-            // Act
-            log.Info("Info");
-            log.Warn("Warn");
-            log.Error("Error");
-            log.Fatal("Fatal");
-
-            asyncForwardingAppender.Close();
-
-            //Assert
-            Assert.That(debugAppender.LoggedEventCount, Is.EqualTo(2));
-        }
-
-        [Test]
-        public void HelperCanGenerateLoggingEventWithAllProperties()
-        {
-            // Arrange
-            var helper = new LoggingEventHelper("TestLoggerName", FixFlags.All);
-            ThreadContext.Properties["MyProperty"] = "MyValue";
-            var exception = new Exception("SomeError");
-
-            var stackFrame = new StackFrame(0);
-            var currentUser = WindowsIdentity.GetCurrent();
-            var loggingTime = DateTime.Now; // Log4Net does not seem to be using UtcNow
-
-            // Act
-            var loggingEvent = helper.CreateLoggingEvent(Level.Emergency, "Who's on live support?", exception);
-            Thread.Sleep(50); // to make sure the time stamp is actually captured
-
-            // Assert
-            Assert.That(loggingEvent.Domain, Is.EqualTo(AppDomain.CurrentDomain.FriendlyName), "Domain");
-            //The identity assigned to new threads is dependent upon AppDomain principal policy.
-            //Background information here:http://www.neovolve.com/post/2010/10/21/Unit-testing-a-workflow-that-relies-on-ThreadCurrentPrincipalIdentityName.aspx
-            //VS2013 does have a principal assigned to new threads in the unit test.
-            //It's probably best not to test that the identity has been set.
-            //Assert.That(loggingEvent.Identity, Is.Empty, "Identity: always empty for some reason");
-            Assert.That(loggingEvent.UserName, Is.EqualTo(currentUser == null ? String.Empty : currentUser.Name), "UserName");
-            Assert.That(loggingEvent.ThreadName, Is.EqualTo(Thread.CurrentThread.Name), "ThreadName");
-
-            Assert.That(loggingEvent.Repository, Is.Null, "Repository: Helper does not have access to this");
-            Assert.That(loggingEvent.LoggerName, Is.EqualTo("TestLoggerName"), "LoggerName");
-
-            Assert.That(loggingEvent.Level, Is.EqualTo(Level.Emergency), "Level");
-            //Raised time to within 10 ms.   However, this may not be a valid test.  The time is going to vary from system to system.  The
-            //tolerance setting here is arbitrary.
-            Assert.That(loggingEvent.TimeStamp, Is.EqualTo(loggingTime).Within(TimeSpan.FromMilliseconds(10)), "TimeStamp");
-            Assert.That(loggingEvent.ExceptionObject, Is.EqualTo(exception), "ExceptionObject");
-            Assert.That(loggingEvent.MessageObject, Is.EqualTo("Who's on live support?"), "MessageObject");
-
-            Assert.That(loggingEvent.LocationInformation.MethodName, Is.EqualTo(stackFrame.GetMethod().Name), "LocationInformation");
-            Assert.That(loggingEvent.Properties["MyProperty"], Is.EqualTo("MyValue"), "Properties");
-        }
-
-        private bool _disposed = false;
-
-        //Implement IDisposable.
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                if (disposing)
-                {
-                    if (asyncForwardingAppender != null)
-                    {
-                        asyncForwardingAppender.Dispose();
-                        asyncForwardingAppender = null;
-                    }
-                }
-                // Free your own state (unmanaged objects).
-                // Set large fields to null.
-                _disposed = true;
-            }
-        }
-
-        // Use C# destructor syntax for finalization code.
-        ~ParallelForwarderTest()
-        {
-            // Simply call Dispose(false).
-            Dispose(false);
-        }
-    }
-}
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Umbraco.Core.Logging;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Logging
-{
-    /// <summary>
-    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
-    /// </summary>
-    [TestFixture]
-    public class RingBufferTest
-    {
-        [Test]
-        public void PerfTest()
-        {
-            RingBuffer<string> ringBuffer = new RingBuffer<string>(1000);
-            Stopwatch ringWatch = new Stopwatch();
-            ringWatch.Start();
-            for (int i = 0; i < 1000000; i++)
-            {
-                ringBuffer.Enqueue("StringOfFun");
-            }
-            ringWatch.Stop();
-
-            Assert.That(ringWatch.ElapsedMilliseconds, Is.LessThan(150));
-        }
-
-        [Test]
-        public void PerfTestThreads()
-        {
-            RingBuffer<string> ringBuffer = new RingBuffer<string>(1000);
-
-            Stopwatch ringWatch = new Stopwatch();
-            List<Task> ringTasks = new List<Task>();
-            CancellationTokenSource cancelationTokenSource = new CancellationTokenSource();
-            CancellationToken cancelationToken = cancelationTokenSource.Token;
-            for (int t = 0; t < 10; t++)
-            {
-                ringTasks.Add(new Task(() =>
-                {
-                    for (int i = 0; i < 1000000; i++)
-                    {
-                        ringBuffer.Enqueue("StringOfFun");
-                    }
-                }, cancelationToken));
-            }
-            ringWatch.Start();
-            ringTasks.ForEach(t => t.Start());
-            var allTasks = ringTasks.ToArray();
-            Task.WaitAny(allTasks);
-            ringWatch.Stop();
-            //Cancel tasks to avoid System.AppDominUnloadException which is caused when the domain is unloaded
-            //and threads created in the domain are not stopped.
-            //Do this before assertions because they may throw an exception causing the thread cancellation to not happen.
-            cancelationTokenSource.Cancel();
-            try
-            {
-                Task.WaitAll(allTasks);
-            }
-            catch (AggregateException)
-            {
-                //Don't care about cancellation Exceptions.
-            }
-            //Tolerance at 500 was too low
-            ringTasks.ForEach(t => t.Dispose());
-            Assert.That(ringWatch.ElapsedMilliseconds, Is.LessThan(1000));
-        }
-
-        [Test]
-        public void PerfTestThreadsWithDequeues()
-        {
-            RingBuffer<string> ringBuffer = new RingBuffer<string>(1000);
-
-            Stopwatch ringWatch = new Stopwatch();
-            List<Task> ringTasks = new List<Task>();
-            CancellationTokenSource cancelationTokenSource = new CancellationTokenSource();
-            CancellationToken cancelationToken = cancelationTokenSource.Token;
-            for (int t = 0; t < 10; t++)
-            {
-                ringTasks.Add(new Task(() =>
-                {
-                    for (int i = 0; i < 1000000; i++)
-                    {
-                        ringBuffer.Enqueue("StringOfFun");
-                    }
-                }, cancelationToken));
-            }
-            for (int t = 0; t < 10; t++)
-            {
-                ringTasks.Add(new Task(() =>
-                {
-                    for (int i = 0; i < 1000000; i++)
-                    {
-                        string foo;
-                        ringBuffer.TryDequeue(out foo);
-                    }
-                }));
-            }
-            ringWatch.Start();
-            ringTasks.ForEach(t => t.Start());
-            var allTasks = ringTasks.ToArray();
-            Task.WaitAny(allTasks);
-            ringWatch.Stop();
-            //Cancel tasks to avoid System.AppDominUnloadException which is caused when the domain is unloaded
-            //and threads created in the domain are not stopped.
-            //Do this before assertions because they may throw an exception causing the thread cancellation to not happen.
-            cancelationTokenSource.Cancel();
-            try
-            {
-                Task.WaitAll(allTasks);
-            }
-            catch (AggregateException)
-            {
-                //Don't care about cancellation Exceptions.
-            }
-            ringTasks.ForEach(t => t.Dispose());
-            Assert.That(ringWatch.ElapsedMilliseconds, Is.LessThan(800));
-        }
-
-        [Test]
-        public void WhenRingSizeLimitIsHit_ItemsAreDequeued()
-        {
-            // Arrange
-            const int limit = 2;
-            object object1 = "one";
-            object object2 = "two";
-            object object3 = "three";
-            RingBuffer<object> queue = new RingBuffer<object>(limit);
-
-            // Act
-            queue.Enqueue(object1);
-            queue.Enqueue(object2);
-            queue.Enqueue(object3);
-
-            // Assert
-            object value;
-            queue.TryDequeue(out value);
-            Assert.That(value, Is.EqualTo(object2));
-            queue.TryDequeue(out value);
-            Assert.That(value, Is.EqualTo(object3));
-            queue.TryDequeue(out value);
-            Assert.That(value, Is.Null);
-        }
-    }
-}
@@ -376,7 +376,7 @@ namespace Umbraco.Tests.PropertyEditors
        {
            var cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"" + mediaPath + "\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";

-            var urlString = mediaPath.GetCropUrl(400, 400, cropperJson, imageCropMode: ImageCropMode.Pad, backgroundColor: "fff");
+            var urlString = mediaPath.GetCropUrl(400, 400, cropperJson, imageCropMode: ImageCropMode.Pad, furtherOptions: "&bgcolor=fff");
            Assert.AreEqual(mediaPath + "?mode=pad&width=400&height=400&bgcolor=fff", urlString);
        }
    }
@@ -25,14 +25,14 @@ namespace Umbraco.Tests.Routing
        {
            SiteDomainHelper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
            SiteDomainHelper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            
+
            var sites = SiteDomainHelper.Sites;

            Assert.AreEqual(2, sites.Count);

            Assert.Contains("site1", sites.Keys);
            Assert.Contains("site2", sites.Keys);
-            
+
            var domains = sites["site1"];
            Assert.AreEqual(3, domains.Count());
            Assert.Contains("domain1.com", domains);
@@ -84,7 +84,7 @@ namespace Umbraco.Tests.Routing

            Assert.Contains("site2", sites.Keys);
        }
-    
+
        [Test]
        public void AddSiteAgain()
        {
@@ -175,15 +175,15 @@ namespace Umbraco.Tests.Routing

            // map methods are not static because we can override them
            var helper = new SiteDomainHelper();
-            
+
            // current is a site1 uri, domains contain current
            // so we'll get current
            //
            var current = new Uri("http://domain1.com/foo/bar");
            var output = helper.MapDomain(current, new[]
                {
-                    new DomainAndUri(new UmbracoDomain("domain1.com"), Uri.UriSchemeHttp), 
-                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain1.com"), Uri.UriSchemeHttp),
+                    new DomainAndUri(new UmbracoDomain("domain2.com"), Uri.UriSchemeHttp),
                }).Uri.ToString();
            Assert.AreEqual("http://domain1.com/", output);

@@ -193,7 +193,7 @@ namespace Umbraco.Tests.Routing
            current = new Uri("http://domain1.com/foo/bar");
            output = helper.MapDomain(current, new[]
                {
-                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp),
                    new DomainAndUri(new UmbracoDomain("domain2.net"), Uri.UriSchemeHttp)
                }).Uri.ToString();
            Assert.AreEqual("http://domain1.net/", output);
@@ -205,12 +205,73 @@ namespace Umbraco.Tests.Routing
            current = new Uri("http://domain1.com/foo/bar");
            output = helper.MapDomain(current, new[]
                {
-                    new DomainAndUri(new UmbracoDomain("domain2.net"), Uri.UriSchemeHttp), 
+                    new DomainAndUri(new UmbracoDomain("domain2.net"), Uri.UriSchemeHttp),
                    new DomainAndUri(new UmbracoDomain("domain1.net"), Uri.UriSchemeHttp)
                }).Uri.ToString();
            Assert.AreEqual("http://domain1.net/", output);
        }

+        private DomainAndUri[] DomainAndUris(Uri current, IDomain[] domains)
+        {
+            var scheme = current == null ? Uri.UriSchemeHttp : current.Scheme;
+            return domains
+                .Where(d => d.IsWildcard == false)
+                .Select(d => new DomainAndUri(d, scheme))
+                .OrderByDescending(d => d.Uri.ToString())
+                .ToArray();
+        }
+
+        [Test]
+        public void MapDomainWithScheme()
+        {
+            SiteDomainHelper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+            SiteDomainHelper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+            SiteDomainHelper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+            SiteDomainHelper.AddSite("site4", "https://domain4.com", "https://domain4.net", "https://domain4.org");
+
+            // map methods are not static because we can override them
+            var helper = new SiteDomainHelper();
+
+            // this works, but it's purely by chance / arbitrary
+            // don't use the www in tests here!
+            var current = new Uri("https://www.domain1.com/foo/bar");
+            var domainAndUris = DomainAndUris(current, new []
+            {
+                new UmbracoDomain("domain2.com"),
+                new UmbracoDomain("domain1.com"),
+            });
+            var output = helper.MapDomain(current, domainAndUris).Uri.ToString();
+            Assert.AreEqual("https://domain1.com/", output);
+
+            // will pick it all right
+            current = new Uri("https://domain1.com/foo/bar");
+            domainAndUris = DomainAndUris(current, new[]
+            {
+                new UmbracoDomain("https://domain1.com"),
+                new UmbracoDomain("https://domain2.com")
+            });
+            output = helper.MapDomain(current, domainAndUris).Uri.ToString();
+            Assert.AreEqual("https://domain1.com/", output);
+
+            current = new Uri("https://domain1.com/foo/bar");
+            domainAndUris = DomainAndUris(current, new[]
+            {
+                new UmbracoDomain("https://domain1.com"),
+                new UmbracoDomain("https://domain4.com")
+            });
+            output = helper.MapDomain(current, domainAndUris).Uri.ToString();
+            Assert.AreEqual("https://domain1.com/", output);
+
+            current = new Uri("https://domain4.com/foo/bar");
+            domainAndUris = DomainAndUris(current, new[]
+            {
+                new UmbracoDomain("https://domain1.com"),
+                new UmbracoDomain("https://domain4.com")
+            });
+            output = helper.MapDomain(current, domainAndUris).Uri.ToString();
+            Assert.AreEqual("https://domain4.com/", output);
+        }
+
        [Test]
        public void MapDomains()
        {
@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Umbraco.Tests.Logging;
+using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Scheduling;

 namespace Umbraco.Tests.Scheduling
@@ -27,27 +27,27 @@ namespace Umbraco.Tests.Services
 		{
 			//NOTE Maybe not the best way to create/save test data as we are using the services, which are being tested.

-			//Create and Save ContentType "umbTextpage" -> 1045
+			//Create and Save ContentType "umbTextpage" -> 1060
 			ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
 			contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
 			ServiceContext.ContentTypeService.Save(contentType);

-			//Create and Save Content "Homepage" based on "umbTextpage" -> 1046
+			//Create and Save Content "Homepage" based on "umbTextpage" -> 1061
 			Content textpage = MockedContent.CreateSimpleContent(contentType);
 			textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
 			ServiceContext.ContentService.Save(textpage, 0);

-			//Create and Save Content "Text Page 1" based on "umbTextpage" -> 1047
+			//Create and Save Content "Text Page 1" based on "umbTextpage" -> 1062
 			Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
 			subpage.ReleaseDate = DateTime.Now.AddMinutes(-5);
            subpage.ChangePublishedState(PublishedState.Saved);
 			ServiceContext.ContentService.Save(subpage, 0);

-			//Create and Save Content "Text Page 1" based on "umbTextpage" -> 1048
+			//Create and Save Content "Text Page 1" based on "umbTextpage" -> 1063
 			Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id);
 			ServiceContext.ContentService.Save(subpage2, 0);

-			//Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1049
+			//Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1064
 			Content trashed = MockedContent.CreateSimpleContent(contentType, "Text Page Deleted", -20);
 			trashed.Trashed = true;
 			ServiceContext.ContentService.Save(trashed, 0);
@@ -533,6 +533,44 @@ namespace Umbraco.Tests.Services
            Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
        }

+        [Test]
+        public void EntityService_Can_Get_Key_For_Id()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+        }
+
+        [Test]
+        public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
+
+            Assert.IsFalse(result.Success);
+        }
+
+        [Test]
+        public void EntityService_Can_Get_Id_For_Key()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(1060, result.Result);
+        }
+
+        [Test]
+        public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
+        {
+            var service = ServiceContext.EntityService;
+            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
+
+            Assert.IsFalse(result.Success);
+        }
+
        private static bool _isSetup = false;

        private int folderId;
@@ -2,7 +2,7 @@
 using System.Linq;
 using Umbraco.Core.Logging;

-namespace Umbraco.Tests.Logging
+namespace Umbraco.Tests.TestHelpers
 {
    public class ConsoleLogger : ILogger
    {
@@ -58,14 +58,20 @@
    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
    </Reference>
+    <Reference Include="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.82.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Examine.0.1.82\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>
    </Reference>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Log4Net.Async, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Log4Net.Async.2.0.4\lib\net40\Log4Net.Async.dll</HintPath>
    </Reference>
    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
@@ -82,8 +88,8 @@
    <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>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <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="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
@@ -162,7 +168,7 @@
    <Compile Include="Issues\U9560.cs" />
    <Compile Include="Collections\OrderedHashSetTests.cs" />
    <Compile Include="IO\ShadowFileSystemTests.cs" />
-    <Compile Include="Logging\ConsoleLogger.cs" />
+    <Compile Include="TestHelpers\ConsoleLogger.cs" />
    <Compile Include="Migrations\CreateTableMigrationTests.cs" />
    <Compile Include="Migrations\MigrationIssuesTests.cs" />
    <Compile Include="Persistence\LocksTests.cs" />
@@ -204,9 +210,6 @@
    <Compile Include="Collections\DeepCloneableListTests.cs" />
    <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
    <Compile Include="DelegateExtensionsTests.cs" />
-    <Compile Include="Logging\AsyncRollingFileAppenderTest.cs" />
-    <Compile Include="Logging\DebugAppender.cs" />
-    <Compile Include="Logging\ParallelForwarderTest.cs" />
    <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
    <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
    <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
@@ -484,7 +487,6 @@
    <Compile Include="PublishedContent\PublishedContentMoreTests.cs" />
    <Compile Include="Publishing\PublishingStrategyTests.cs" />
    <Compile Include="Resolvers\ActionsResolverTests.cs" />
-    <Compile Include="Logging\RingBufferTest.cs" />
    <Compile Include="TestHelpers\BaseUmbracoConfigurationTest.cs" />
    <Compile Include="TestHelpers\DatabaseTestBehaviorAttribute.cs" />
    <Compile Include="TestHelpers\Entities\MockedMember.cs" />
@@ -2,8 +2,10 @@
 <packages>
  <package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
  <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.82" targetFramework="net45" />
-  <package id="log4net" version="2.0.5" 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" />
  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
@@ -17,15 +19,15 @@
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
  <package id="NUnit" version="2.6.2" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
  <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />
  <package id="Semver" version="2.0.4" targetFramework="net45" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net45" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net45" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
 </packages>
@@ -536,7 +536,23 @@ module.exports = function (grunt) {
                            ]
                        },
                        'ace-builds': {
-                           files: ['src-min-noconflict/**']
+                           files: [
+                                'src-min-noconflict/ace.js',
+                                
+                                'src-min-noconflict/ext-language_tools.js',
+                                'src-min-noconflict/ext-searchbox.js',
+                                'src-min-noconflict/ext-settings_menu.js',
+
+                                'src-min-noconflict/snippets/text.js',
+                                'src-min-noconflict/snippets/javascript.js',
+                                
+                                'src-min-noconflict/theme-chrome.js',
+                                
+                                'src-min-noconflict/mode-razor.js',
+                                'src-min-noconflict/mode-javascript.js',
+                                
+                                'src-min-noconflict/worker-javascript.js',
+                            ]
                       }
                    }
                }
@@ -1,7 +1,8 @@
 body.mce-content-body {
    background-color: #fff;
    font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size: 11px;
+    font-size: 14px;
+    line-height: 1.5em;
    scrollbar-3dlight-color: #f0f0ee;
    scrollbar-arrow-color: #676662;
    scrollbar-base-color: #f0f0ee;
@@ -92,6 +92,16 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
               'Failed to retrieve property type aliases');
        },

+        getAllStandardFields: function () {
+
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "contentTypeApiBaseUrl",
+                       "GetAllStandardFields")),
+               'Failed to retrieve standard fields');
+        },
+
        getPropertyTypeScaffold : function (id) {
              return umbRequestHelper.resourcePromise(
               $http.get(
@@ -11,7 +11,7 @@
  margin-bottom: @baseLineHeight;
  background-color: @warningBackground;
  border: 1px solid @warningBorder;
-  .border-radius(@baseBorderRadius);
+  .border-radius(@alertBorderRadius);
 }
 .alert,
 .alert h4,
@@ -65,7 +65,10 @@
    -webkit-box-shadow:none;
 }

-
+.btn-group .btn.dropdown-toggle {
+    border-left-width: 1px;
+    border-left-style: solid;
+}

 // Button Sizes
 // --------------------------------------------------
@@ -14,6 +14,7 @@ body {
    overflow: hidden;
    height: 100%;
    width: 100%;
+    width: ~"(calc(~'100%' - ~'80px'))"; // 80px is the fixed left menu for toggling the different browser sizes
    position: absolute;
    padding: 0;
    margin: 0;
@@ -1,7 +1,6 @@
 .umb-button-group__toggle {
   padding-left: 8px;
   padding-right: 8px;
-   margin-left: -1px;
 }

 .umb-button-group__sub-buttons.-align-right {
@@ -35,6 +34,9 @@
        padding-right: 10px;
        padding-left: 10px;
        border-radius: 0 3px 3px 0;
+        border-left-style: solid;
+        border-left-width: 1px;
+        border-left-color: rgba(0,0,0,0.1);
    }

    .umb-era-button.umb-button-group__toggle .caret {
@@ -3,7 +3,7 @@
    .umb-panel-header {
        padding: 20px;
        background: @gray-10;
-        border-bottom: 1px solid @gray-8;
+        border-bottom: 1px solid @purple-l3;
        height: 59px;

        .umb-headline {
@@ -25,9 +25,14 @@

    .umb-panel-footer {
        background: @gray-10;
-        border-top: 1px solid @gray-8;
-        height: 51px;
+        border-top: 1px solid @purple-l3;
+        height: 52px;
        padding: 0 20px;
    }

+    // Hacks to fix editors inside the mini editors
+    .umb-editor-sub-header {
+        margin-top: 0;
+    }
+
 }
@@ -73,7 +73,7 @@ body {
  right: 0;
  left: 0;
  bottom: 0;
-  background: @gray-1;
+  background: @purple-d2;
  z-index: 666;
 }

@@ -67,7 +67,8 @@
 }

 .login-overlay .form input[type="text"], 
-.login-overlay .form input[type="password"] {
+.login-overlay .form input[type="password"],
+.login-overlay .form input[type="email"] {
    height: 36px;
    padding-left: 10px;
    padding-right: 10px;
@@ -58,6 +58,7 @@
@red-l3:			    #FFB2B0;
@red-washed:		    #FFECEB;

+@yellow-d2:             #F0AC00;
@yellow-d1:             #FFC011;
@yellow:                #FFCE38;
@yellow-l1:			    #FFD861;
@@ -312,7 +313,7 @@
 // alerts
 // -------------------------
@warningText:             @white;
-@warningBackground:       @orange;
+@warningBackground:       @yellow-d2;
@warningBorder:           transparent;

@errorText:               @white;
@@ -327,6 +328,8 @@
@infoBackground:          @turquoise-d1;
@infoBorder:              transparent;

+@alertBorderRadius:       0;
+
 // SD: Had to duplicate the above but prefix with 'form' inversed colors
 // because we cannot share the above alert colors with forms otherwise we end up with white
 // text and giant red backgrounds.
@@ -76,7 +76,7 @@
                    <form method="POST" name="requestPasswordResetForm" ng-submit="requestPasswordResetSubmit(email)">
                        <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
                            <label><localize key="general_email">Email</localize></label>
-                            <input type="text" ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
+                            <input type="email" ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
                        </div>
                        
                        <div class="control-group" ng-show="requestPasswordResetForm.$invalid">
@@ -158,4 +158,4 @@

    </div>

-</div>
+</form>
@@ -80,6 +80,7 @@
                multiPicker: false,
                title: localizationService.localize("template_insertDictionaryItem"),
                description: localizationService.localize("template_insertDictionaryItemDesc"),
+                emptyStateMessage: localizationService.localize("emptyStates_emptyDictionaryTree"),
                show: true,
                select: function(node){

@@ -12,6 +12,7 @@
        vm.insertAfter;
        vm.recursive = false;
        vm.properties = [];
+        vm.standardFields = [];
        vm.date = false;
        vm.dateTime = false;
        vm.dateTimeSeparator = "";
@@ -41,6 +42,11 @@
            contentTypeResource.getAllPropertyTypeAliases().then(function (array) {
                vm.properties = array;
            });
+
+            // Load all standard fields
+            contentTypeResource.getAllStandardFields().then(function (array) {
+                vm.standardFields = array;
+            });
            
        }

@@ -5,7 +5,14 @@
        <div class="umb-el-wrap">
            <label class="control-label" for="chooseField">Choose field</label>
            <div class="controls">
-                <select name="chooseField" ng-model="vm.field" ng-options="property for property in vm.properties"></select>
+                <select ng-model="vm.field">
+                    <optgroup localize="label" label="@templateEditor_customFields">
+                        <option ng-repeat="(key, value) in vm.properties" value="{{value}}">{{value}}</option>
+                    </optgroup>
+                    <optgroup localize="label" label="@templateEditor_standardFields">
+                        <option ng-repeat="(key, value) in vm.standardFields" value="{{value}}">{{value}}</option>
+                    </optgroup>
+                </select>
            </div>
        </div>
    </div>
@@ -24,7 +31,14 @@
                <div class="umb-el-wrap">
                    <label class="control-label" for="altField">Fallback field</label>
                    <div class="controls">
-                        <select name="altField" ng-model="vm.altField" ng-options="property for property in vm.properties"></select>
+                        <select ng-model="vm.altField" >
+                            <optgroup localize="label" label="@templateEditor_customFields">
+                                <option ng-repeat="(key, value) in vm.properties" value="{{value}}">{{value}}</option>
+                            </optgroup>
+                            <optgroup localize="label" label="@templateEditor_standardFields">
+                                <option ng-repeat="(key, value) in vm.standardFields" value="{{value}}">{{value}}</option>
+                            </optgroup>
+                        </select>
                    </div>
                </div>
            </div>
@@ -61,6 +61,7 @@ angular.module("umbraco")

            $scope.submitFolder = function() {
                if ($scope.newFolderName) {
+                    $scope.creatingFolder = true;
                    mediaResource
                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
                        .then(function(data) {
@@ -69,7 +70,7 @@ angular.module("umbraco")
                                cacheKey: "__media", //this is the main media tree cache key
                                childrenOf: data.parentId //clear the children of the parent
                            });
-
+                            $scope.creatingFolder = false;
                            $scope.gotoFolder(data);
                            $scope.showFolderInput = false;
                            $scope.newFolderName = "";
@@ -37,7 +37,7 @@

      </div>

-      <div class="row umb-control-group" ng-if="!searchOptions.filter">
+      <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>
@@ -64,7 +64,7 @@
                  focus-when="{{showFolderInput}}" />
               </li>
          </ul>
-
+          <div class="umb-loader" ng-if="creatingFolder"></div>
      </div>

      <umb-file-dropzone
@@ -20,7 +20,13 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
            selectedSearchResults: []
        }

-        $scope.model.selection = [];
+        $scope.model.selection = [];
+
+        //Used for toggling an empty-state message
+        //Some trees can have no items (dictionary & forms email templates)
+        $scope.hasItems = true;
+        $scope.emptyStateMessage = dialogOptions.emptyStateMessage;
+

        //TODO: I don't think this is used or called anywhere!!
        $scope.init = function (contentType) {
@@ -149,6 +155,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",

        //gets the tree object when it loads
        function treeLoadedHandler(ev, args) {
+            //args.tree contains children (args.tree.root.children)
+            $scope.hasItems = args.tree.root.children.length > 0;
+
            tree = args.tree;
        }

@@ -19,8 +19,12 @@
            results="searchInfo.results"
            select-result-callback="selectResult">
        </umb-tree-search-results>
+      
+      <umb-empty-state ng-if="!hasItems && emptyStateMessage" position="center">
+        {{ emptyStateMessage }}
+      </umb-empty-state>

-        <div ng-if="treeReady" ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+      <div ng-if="treeReady" ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
            <umb-tree
                section="{{section}}"
                treealias="{{treeAlias}}"
@@ -51,12 +51,13 @@

               </div>

-                <umb-editor-menu
-                    class="umb-editor-header__actions-menu"
-                    ng-if="menu.currentNode"
-                    current-node="menu.currentNode"
-                    current-section="{{menu.currentSection}}">
-                </umb-editor-menu>
+               <div class="umb-editor-header__actions-menu">
+                    <umb-editor-menu
+                        ng-if="menu.currentNode"
+                        current-node="menu.currentNode"
+                        current-section="{{menu.currentSection}}">
+                    </umb-editor-menu>
+                </div>

            </div>

@@ -1,23 +1,26 @@
-<ul class="umb-tree">
+<div>
+  <umb-empty-state ng-if="results.length === 0" position="center">
+    <localize key="general_searchNoResult"></localize>
+  </umb-empty-state>

+  <ul class="umb-tree">
    <li class="root">
-        <ul class="umb-search-group">
-
-            <li ng-repeat="result in results">
-
-                <div style="padding-left: 20px" ng-class="{'umb-tree-node-checked' : result.selected}">
-                    <a class="umb-search-group-item-link" ng-class="{first:$first}" ng-click="selectResultCallback($event, result)">
-                        <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-if="result.subTitle">{{result.subTitle}}</small>
-                    </a>
-                </div>
-
-            </li>
-
-        </ul>
+      <ul class="umb-search-group">
+        <li ng-repeat="result in results">
+          <div style="padding-left: 20px" ng-class="{'umb-tree-node-checked' : result.selected}">
+            <a class="umb-search-group-item-link" ng-class="{first:$first}" ng-click="selectResultCallback($event, result)">
+              <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-if="result.subTitle">{{result.subTitle}}</small>
+            </a>
+          </div>
+        </li>
+      </ul>
    </li>
+  </ul>
+
+</div>
+

-</ul>
@@ -39,7 +39,7 @@
 </div>
 	
 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-	<button class="btn" ng-click="nav.hideDialog(true)">
+	<button class="btn btn-info" ng-click="nav.hideDialog(true)">
 		<localize key="buttons_somethingElse">Do something else</localize>
 	</button>
 </div>
@@ -5,21 +5,16 @@

        <ul class="umb-actions umb-actions-child">           
            <li>
-                <a href="" ng-click="createDataType()">
-
+                <a href="" ng-click="createDataType()" umb-auto-focus>
                    <i class="large icon-autofill"></i>
-
                    <span class="menu-label">
                        <localize key="create_newDataType">New data type</localize>
                    </span>
-
                </a>
            </li>
            <li>
                <a href="" ng-click="showCreateFolder()">
-
                    <i class="large icon-folder"></i>
-
                    <span class="menu-label">
                        <localize key="create_newFolder">New folder</localize>
                    </span>
@@ -44,7 +39,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-    <button class="btn" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -50,7 +50,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-    <button class="btn" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -44,7 +44,7 @@

 	
 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-		<button class="btn" ng-click="nav.hideDialog(true)">
+		<button class="btn btn-info" ng-click="nav.hideDialog(true)">
 			<localize key="buttons_somethingElse">Do something else</localize>
 		</button>
 </div>
@@ -5,15 +5,12 @@

        <ul class="umb-actions umb-actions-child">           
            <li>
-                <a href="" ng-click="createMediaType()">
-
+                <a href="" ng-click="createMediaType()" umb-auto-focus>
                    <i class="large icon-item-arrangement"></i>
-
                    <span class="menu-label">
                        <localize key="general_new">New</localize>&nbsp;
                        <localize key="content_mediatype">Media type</localize>
                    </span>
-
                </a>
            </li>
            <li>
@@ -41,7 +38,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-    <button class="btn" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -20,7 +20,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" >
-    <button type="button" class="btn" ng-click="nav.hideDialog()">
+    <button type="button" class="btn btn-info" ng-click="nav.hideDialog()">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -41,7 +41,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-    <button class="btn" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -77,7 +77,7 @@

    <!-- Dialog footer -->
    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <button class="btn" ng-click="nav.hideDialog(true)">
+        <button class="btn btn-info" ng-click="nav.hideDialog(true)">
            <localize key="buttons_somethingElse">Do something else</localize>
        </button>
    </div>
@@ -204,6 +204,7 @@
                multiPicker: false,
                show: true,
                title: "Insert dictionary item",
+                emptyStateMessage: localizationService.localize("emptyStates_emptyDictionaryTree"),
                select: function(node){

                    var code = templateHelper.getInsertDictionarySnippet(node.name);
@@ -322,9 +323,9 @@
        }

        function insert(str) {
+            vm.editor.focus();
            vm.editor.moveCursorToPosition(vm.currentPosition);
            vm.editor.insert(str);
-            vm.editor.focus();

            // set form state to $dirty
            setFormState("dirty");
@@ -67,7 +67,7 @@

    <!-- Dialog footer -->
    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <button class="btn" ng-click="nav.hideDialog(true)">
+        <button class="btn btn-info" ng-click="nav.hideDialog(true)">
            <localize key="buttons_somethingElse">Do something else</localize>
        </button>
    </div>
@@ -194,6 +194,7 @@
                multiPicker: false,
                show: true,
                title: "Insert dictionary item",
+                emptyStateMessage: localizationService.localize("emptyStates_emptyDictionaryTree"),
                select: function(node){

                    var code = templateHelper.getInsertDictionarySnippet(node.name);
@@ -375,9 +376,9 @@
        }

        function insert(str) {
+            vm.editor.focus();
            vm.editor.moveCursorToPosition(vm.currentPosition);
            vm.editor.insert(str);
-            vm.editor.focus();

            // set form state to $dirty
            setFormState("dirty");
@@ -76,7 +76,7 @@
      </umb-tooltip>

      <umb-empty-state
-          ng-if="vm.itemsWithoutFolders.length === 0 && options.filter.length == 0 && vm.isRecycleBin"
+          ng-if="vm.itemsWithoutFolders.length === 0 && folders.length === 0 && options.filter.length == 0 && vm.isRecycleBin"
          position="center">
          <localize key="general_recycleBinEmpty"></localize>
      </umb-empty-state>
@@ -54,8 +54,6 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
   $scope.actionInProgress = false;
   $scope.selection = [];
   $scope.folders = [];   
-   //tracks if we've already loaded the folders for the current node
-   var foldersLoaded = false;
   $scope.listViewResultSet = {
      totalPages: 0,
      items: []
@@ -217,7 +215,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
            500);

        if (reload === true) {
-            $scope.reloadView($scope.contentId);
+            $scope.reloadView($scope.contentId, true);
        }

        if (err.data && angular.isArray(err.data.notifications)) {
@@ -252,7 +250,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
   /*Pagination is done by an array of objects, due angularJS's funky way of monitoring state
   with simple values */

-   $scope.reloadView = function (id) {
+   $scope.getContent = function() {
+       $scope.reloadView($scope.contentId, true);
+   }
+
+   $scope.reloadView = function (id, reloadFolders) {

      $scope.viewLoaded = false;

@@ -270,13 +272,12 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
            });
         }

-         if (!foldersLoaded && $scope.entityType === 'media') {
+         if (reloadFolders && $scope.entityType === 'media') {
            //The folders aren't loaded - we only need to do this once since we're never changing node ids
            mediaResource.getChildFolders($scope.contentId)
                    .then(function (folders) {
                       $scope.folders = folders;
                       $scope.viewLoaded = true;
-                       foldersLoaded = true;
                    });

         } else {
@@ -319,7 +320,6 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
   function makeSearch() {
      if ($scope.options.filter !== null && $scope.options.filter !== undefined) {
         $scope.options.pageNumber = 1;
-         //$scope.actionInProgress = true;
         $scope.reloadView($scope.contentId);
      }
   }
@@ -621,7 +621,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
             $scope.options.allowBulkMove ||
             $scope.options.allowBulkDelete;

-      $scope.reloadView($scope.contentId);
+      $scope.reloadView($scope.contentId, true);
   }

   function getLocalizedKey(alias) {
@@ -157,7 +157,7 @@
         selection="selection"
         options="options"
         entity-type="{{entityType}}"
-         on-get-content="reloadView">
+         on-get-content="getContent">
      </umb-list-view-layout>

      <umb-load-indicator ng-show="!viewLoaded"></umb-load-indicator>
@@ -41,7 +41,7 @@
 </div>

 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!vm.creatingFolder">
-    <button class="btn" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
        <localize key="buttons_somethingElse">Do something else</localize>
    </button>
 </div>
@@ -393,6 +393,7 @@
                multiPicker: false,
                show: true,
                title: localizationService.localize("template_insertDictionaryItem"),
+                emptyStateMessage: localizationService.localize("emptyStates_emptyDictionaryTree"),
                select: function(node){
                    var code = templateHelper.getInsertDictionarySnippet(node.name);
                	insert(code);
@@ -616,9 +617,9 @@


        function insert(str) {
+            vm.editor.focus();
            vm.editor.moveCursorToPosition(vm.currentPosition);
            vm.editor.insert(str);
-            vm.editor.focus();

            // set form state to $dirty
            setFormState("dirty");
@@ -123,9 +123,8 @@
      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="dotless.Core, Version=1.4.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\dotless.1.4.1.0\lib\dotless.Core.dll</HintPath>
+    <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>
    </Reference>
    <Reference Include="Examine, Version=0.1.82.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Examine.0.1.82\lib\net45\Examine.dll</HintPath>
@@ -134,16 +133,14 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
    </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.8.2\lib\net45\ImageProcessor.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ImageProcessor.Web, Version=4.8.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.8.3\lib\net45\ImageProcessor.Web.dll</HintPath>
    </Reference>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -159,11 +156,9 @@
    </Reference>
    <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -198,12 +193,11 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
    </Reference>
-    <Reference Include="MySql.Data">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
+    <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>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <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">
      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -212,9 +206,8 @@
    <Reference Include="System">
      <Name>System</Name>
    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.configuration" />
@@ -246,9 +239,8 @@
      <SpecificVersion>False</SpecificVersion>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
@@ -348,9 +340,8 @@
      <Name>umbraco.providers</Name>
    </ProjectReference>
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.6.97, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.6\lib\Umbraco.ModelsBuilder.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.7.99, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.7\lib\Umbraco.ModelsBuilder.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -676,7 +676,7 @@
  <area alias="publicAccess">
    <key alias="paAdvanced">Ochrana prostřednictvím rolí</key>
    <key alias="paAdvancedHelp"><![CDATA[Pokud si přejete řídit přístup ke stránce za použití autentizace prostřednictvím rolí,<br /> použijte členské skupiny umbraca.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Musíte vytvořit členskou skupinu před tím, než můžete použít <br />autentizaci prostřednictvím rolí]]></key>
+    <key alias="paAdvancedNoGroups">Musíte vytvořit členskou skupinu před tím, než můžete použít autentizaci prostřednictvím rolí</key>
    <key alias="paErrorPage">Chybová stránka</key>
    <key alias="paErrorPageHelp">Použita, když jsou lidé přihlášení, ale nemají přístup</key>
    <key alias="paHowWould">Vyberte, jak omezit přístup k této stránce</key>
@@ -633,7 +633,7 @@ Vennlig hilsen Umbraco roboten
  <area alias="publicAccess">
    <key alias="paAdvanced">Avansert: Beskytt ved å velge hvilke brukergrupper som har tilgang til siden</key>
    <key alias="paAdvancedHelp"><![CDATA[Om du ønsker å kontrollere tilgang til siden ved å bruke rolle-basert autentisering,<br /> ved å bruke Umbraco's medlems-grupper]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du må opprette en medlemsgruppe før du kan bruke <br /> rollebasert autentikasjon.]]></key>
+    <key alias="paAdvancedNoGroups">Du må opprette en medlemsgruppe før du kan bruke rollebasert autentikasjon.</key>
    <key alias="paErrorPage">Feilside</key>
    <key alias="paErrorPageHelp">Brukt når personer logger på, men ikke har tilgang</key>
    <key alias="paHowWould">Hvordan vil du beskytte siden din?</key>
@@ -18,7 +18,7 @@
    <encoding value="utf-8" />
  </appender>

-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core">
+  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
    <appender-ref ref="rollingFile" />
  </appender>

@@ -18,7 +18,7 @@
    <encoding value="utf-8" />
  </appender>

-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core">
+  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
    <appender-ref ref="rollingFile" />
  </appender>

@@ -105,7 +105,7 @@
    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>

-    <showDeprecatedPropertyEditors>true</showDeprecatedPropertyEditors>
+    <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
    
    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>	
@@ -3,12 +3,12 @@
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
-  <package id="dotless" version="1.4.1.0" targetFramework="net45" />
+  <package id="dotless" version="1.5.2" targetFramework="net45" />
  <package id="Examine" version="0.1.82" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.2" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="4.8.2" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="4.8.3" targetFramework="net45" />
  <package id="ImageProcessor.Web.Config" version="2.3.0" targetFramework="net45" />
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
@@ -30,12 +30,12 @@
  <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
+  <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
-  <package id="Umbraco.ModelsBuilder" version="3.0.6" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net45" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.7" targetFramework="net45" />
 </packages>
@@ -736,7 +736,7 @@ Mange hilsner fra Umbraco robotten
  <area alias="publicAccess">
    <key alias="paAdvanced">Rollebaseret beskyttelse</key>
    <key alias="paAdvancedHelp">Hvis du ønsker at kontrollere adgang til siden ved hjælp af rollebaseret godkendelse via Umbracos medlemsgrupper.</key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du skal oprette en medlemsgruppe før du kan bruge <br />rollebaseret godkendelse]]></key>
+    <key alias="paAdvancedNoGroups">Du skal oprette en medlemsgruppe før du kan bruge rollebaseret godkendelse</key>
    <key alias="paErrorPage">Fejlside</key>
    <key alias="paErrorPageHelp">Brugt når folk er logget ind, men ingen adgang</key>
    <key alias="paHowWould">Vælg hvordan siden skal beskyttes</key>
@@ -850,7 +850,7 @@ To manage your website, simply open the Umbraco back office and start adding con
  <area alias="publicAccess">
    <key alias="paAdvanced">Role based protection</key>
    <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication</key>
    <key alias="paErrorPage">Error Page</key>
    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
    <key alias="paHowWould">Choose how to restrict access to this page</key>
@@ -1549,4 +1549,7 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
+  </area>
 </language>
@@ -199,6 +199,13 @@
    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
    <key alias="newFolder">New folder</key>
    <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New javascript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewMacro">New partial view macro</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newEmptyPartialViewMacro">New empty partial view macro</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
  </area>
  <area alias="dashboard">
    <key alias="browser">Browse your website</key>
@@ -838,7 +845,7 @@ To manage your website, simply open the Umbraco back office and start adding con
  <area alias="publicAccess">
    <key alias="paAdvanced">Role based protection</key>
    <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication</key>
    <key alias="paErrorPage">Error Page</key>
    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
    <key alias="paHowWould">Choose how to restrict access to this page</key>
@@ -596,7 +596,7 @@
  <area alias="publicAccess">
    <key alias="paAdvanced">Proteccion basada en roles</key>
    <key alias="paAdvancedHelp"><![CDATA[Si desea controlar el acceso a la página usando autenticación basada en roles,<br /> usando los grupos de miembros de Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Necesita crear un grupo de miembros antes de poder usar <br /> autenticación basada en roles.]]></key>
+    <key alias="paAdvancedNoGroups">Necesita crear un grupo de miembros antes de poder usar autenticación basada en roles</key>
    <key alias="paErrorPage">Página de error</key>
    <key alias="paErrorPageHelp">Usada cuando alguien hace login, pero no tiene acceso</key>
    <key alias="paHowWould">Elija cómo restringir el acceso a esta página</key>
@@ -817,7 +817,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
  <area alias="publicAccess">
    <key alias="paAdvanced">Protection basée sur les rôles</key>
    <key alias="paAdvancedHelp"><![CDATA[Si vous souhaitez contrôler l'accès à la page en utilisant l'authentification basée sur les rôles utilisateurs,<br /> via les groupes de membres Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Vous devez créer un groupe avant de pouvoir utiliser <br /> l'authentification basée sur les rôles.]]></key>
+    <key alias="paAdvancedNoGroups">Vous devez créer un groupe avant de pouvoir utiliser l'authentification basée sur les rôles</key>
    <key alias="paErrorPage">Page d'erreur</key>
    <key alias="paErrorPageHelp">Utilisé pour les personnes connectées, mais qui n'ont pas accès</key>
    <key alias="paHowWould">Choisissez comment restreindre l'accès à cette page</key>
@@ -572,7 +572,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
  <area alias="publicAccess">
    <key alias="paAdvanced"><![CDATA[Protezione basata su ruoli]]></key>
    <key alias="paAdvancedHelp"><![CDATA[Se vuoi controllare gli accessi alla pagina tramite l'autenticazione basata sui ruoli,<br /> usando i gruppi di membri di Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Devi creare un gruppo di membri prima di utilizzare <br />l'autenticazione basata sui ruoli.]]></key>
+    <key alias="paAdvancedNoGroups">Devi creare un gruppo di membri prima di utilizzare l'autenticazione basata sui ruoli</key>
    <key alias="paErrorPage"><![CDATA[Pagina di Errore]]></key>
    <key alias="paErrorPageHelp"><![CDATA[Usato quando qualcuno è connesso, ma non ha accesso]]></key>
    <key alias="paHowWould"><![CDATA[Vuoi restringere l'accesso a questa pagina?]]></key>
@@ -828,7 +828,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
  <area alias="publicAccess">
    <key alias="paAdvanced">Geavanceerd: Beveilig door de Member Groups te seecteren die toegang hebben op de pagina</key>
    <key alias="paAdvancedHelp"><![CDATA[Als je toegang tot pagina's wilt regelen met behulp van role-based authenticatie,<br /> gebruik makend van Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Je moet eerst een membergroup maken voordat je kunt werken met <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">Je moet eerst een membergroup maken voordat je kunt werken met role-based authentication.</key>
    <key alias="paErrorPage">Error Pagina</key>
    <key alias="paErrorPageHelp">Gebruikt om te tonen als een gebruiker is ingelogd, maar geen rechten heeft om de pagina te bekijken</key>
    <key alias="paHowWould">Hoe wil je de pagina beveiligen?</key>
@@ -576,7 +576,7 @@ Você pode remover com segurança do seu sistema clicando em "desinstalar pacote
  <area alias="publicAccess">
    <key alias="paAdvanced">Proteção baseada em função</key>
    <key alias="paAdvancedHelp"><![CDATA[Se você deseja controlar o acesso à página usando autenticação baseada em funções, <br /> usando grupos de membros do Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Você precisa criar um grupo de membros antes que possa usar <br /> autenticação baseada em função.]]></key>
+    <key alias="paAdvancedNoGroups">Você precisa criar um grupo de membros antes que possa usar autenticação baseada em função.</key>
    <key alias="paErrorPage">Página de Erro</key>
    <key alias="paErrorPageHelp">Usado quando as pessoas estão logadas, mas não para ter acesso</key>
    <key alias="paHowWould">Escolha como restringir o acesso à esta página</key>
@@ -284,6 +284,13 @@
    <key alias="noMediaTypes" version="7.0"><![CDATA[Нет ни одного разрешенного типа медиа-материалов для создания. Необходимо разрешить нужные Вам типы в секции "Установки" в дереве <strong>"Типы медиа-материалов"</strong>.]]></key>
    <key alias="updateData">Выберите тип и заголовок</key>
    <key alias="documentTypeWithoutTemplate">Тип документа без сопоставленного шаблона</key>
+    <key alias="newJavascriptFile">Новый файл javascript</key>
+    <key alias="newEmptyPartialView">Новое пустое частичное представление</key>
+    <key alias="newPartialViewMacro">Новый макрос-представление</key>
+    <key alias="newPartialViewFromSnippet">Новое частичное представление по образцу</key>
+    <key alias="newEmptyPartialViewMacro">Новый пустой макрос-представление</key>
+    <key alias="newPartialViewMacroFromSnippet">Новый макрос-представление по образцу</key>
+    <key alias="newPartialViewMacroNoMacro">Новый макрос-представление (без регистрации макроса)</key>
  </area>
  <area alias="dashboard">
    <key alias="browser">Обзор сайта</key>
@@ -1022,7 +1029,7 @@
  <area alias="publicAccess">
    <key alias="paAdvanced">Расширенный: Защита на основе ролей (групп)</key>
    <key alias="paAdvancedHelp"><![CDATA[Применяйте, если желаете контролировать доступ к документу на основе ролевой модели безопасности,<br /> с использованием групп участников Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Вам необходимо создать хотя бы одну группу участников<br /> для применения ролевой модели безопасности.]]></key>
+    <key alias="paAdvancedNoGroups">Вам необходимо создать хотя бы одну группу участников для применения ролевой модели безопасности.</key>
    <key alias="paErrorPage">Страница сообщения об ошибке</key>
    <key alias="paErrorPageHelp">Используется в случае, когда пользователь авторизован в системе, но не имеет доступа к документу.</key>
    <key alias="paHowWould">Выберите способ ограничения доступа к документу</key>
@@ -598,7 +598,7 @@
  <area alias="publicAccess">
    <key alias="paAdvanced">Rollbaserat lösenordsskydd</key>
    <key alias="paAdvancedHelp"><![CDATA[Välj detta alternativ om du vill skydda sidan med hjälp av rollbaserat lösenordsskydd.<br /> Då används Umbracos medlemsgrupper.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du måste skapa en medlemsgrupp innan du kan använda <br />rollbaserat lösenordsskydd.]]></key>
+    <key alias="paAdvancedNoGroups">Du måste skapa en medlemsgrupp innan du kan använda rollbaserat lösenordsskydd.</key>
    <key alias="paErrorPage">Sida med felmeddelande</key>
    <key alias="paErrorPageHelp">Används när en användare är inloggad, men saknar rättigheter att se sidan</key>
    <key alias="paHowWould">Välj hur du vill lösenordsskydda sidan</key>
@@ -734,7 +734,7 @@ To manage your website, simply open the Umbraco back office and start adding con
  <area alias="publicAccess">
    <key alias="paAdvanced">Role based protection</key>
    <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication.</key>
    <key alias="paErrorPage">Error Page</key>
    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
    <key alias="paHowWould">Choose how to restrict access to this page</key>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shannon	bec4e442fb	bumps to RC1	2017-04-21 17:45:27 +10:00
Shannon	72cc5ce88b	Moves binding redirects to pre app startup	2017-04-21 12:15:36 +10:00
Shannon Deminick	63763d025e	Merge pull request #1897 from umbraco/temp-u4-9798 u4-9798 - Moves LockTable and LockObject Migrations to 7.6	2017-04-21 11:28:37 +10:00
mikkelhm	f76fa6bde6	Moves LockTable and LockObject Migrations to 7.6	2017-04-20 23:42:15 +02:00
Warren Buckley	a231cedd8e	Merge pull request #1895 from umbraco/temp-U4-9795 fixes: U4-9795 Update alert in public access dialog to follow same conventions as other alerts	2017-04-20 15:12:12 +01:00
Mads Rasmussen	20526b40bf	fixes: U4-9789 Email input type is not same height as text input type	2017-04-20 12:03:29 +02:00
Mads Rasmussen	5008a2be7f	update class on notification	2017-04-20 11:29:16 +02:00
Mads Rasmussen	03a395d1f9	remove unnecessary break from language file	2017-04-20 11:02:49 +02:00
Mads Rasmussen	734df8685d	update notification to use alert class instead of custom error class	2017-04-20 10:57:57 +02:00
Claus	92dad1af1c	Merge branch 'AndyButland-u4-9652' into dev-v7.6	2017-04-20 10:25:36 +02:00
Claus	d897e78b27	Merge branch 'u4-9652' of git://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9652 # Conflicts: # src/Umbraco.Core/Services/EntityService.cs	2017-04-20 10:23:54 +02:00
Shannon Deminick	d79115fcdf	Merge pull request #1892 from umbraco/temp-deploy-103 deploy-103 - support member groups in entity service	2017-04-20 11:35:13 +10:00
Shannon Deminick	992073ab4e	Merge pull request #1888 from umbraco/temp-U4-9717 fixes: U4-9717 7.6 "Do something else"-button	2017-04-20 11:00:49 +10:00
Shannon	3c9b144927	updates log4net binding redirect to disregard the signing token so it can be null or can be any token and it will redirect	2017-04-20 10:50:16 +10:00
AndyButland	b7e4f58503	Ensured EntityService GetKeyById and GetIdByKey respect passed object type	2017-04-19 18:38:24 +01:00
Stephan	c11dce7b6e	deploy-103 - support member groups in entity service	2017-04-19 17:20:44 +02:00
Mads Rasmussen	004a3e2808	Merge pull request #1882 from umbraco/temp-U4-9769 U4-9769 - BG Color change for installer to purple hue	2017-04-19 14:42:43 +02:00
Mads Rasmussen	d05bfc8983	use same purple as the login screen	2017-04-19 14:39:38 +02:00
Shannon Deminick	5bb7223a79	Merge pull request #1890 from umbraco/temp-u4-9782 u4-9782 - Adds assemblyRedirect for log4net in the nuget upgrade transform	2017-04-19 20:29:22 +10:00
mikkelhm	c9a816f25e	Adds assemblyRedirect for log4net in the nuget upgrade transform	2017-04-19 12:21:49 +02:00
Mads Rasmussen	334fcf38ec	fixes: U4-9780 Use email input type for password reset	2017-04-19 11:25:14 +02:00
Mads Rasmussen	8873d0f79d	fixes: U4-9717 7.6 "Do something else"-button	2017-04-19 10:04:55 +02:00
Shannon	b499b45a5c	fixes test	2017-04-19 16:09:59 +10:00
Shannon	d5a71ec1da	Adds important note for 7.6 upgrades to the nuget upgrade doc	2017-04-19 16:05:24 +10:00
Shannon	1402494e47	Reverts changes made for U4-8963	2017-04-19 15:41:26 +10:00
Shannon	7c491c1fc1	U4-9768 Examine Management dashboard indexers and searchers not in same order	2017-04-19 14:53:46 +10:00
Shannon	460dd69884	updates the is multiple check to check for default pre-values since those won't be persisted	2017-04-19 14:38:48 +10:00
Shannon	beda99963e	Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7.6	2017-04-19 14:36:28 +10:00
Shannon	b06f16f5f7	Fixes issues with U4-7318	2017-04-19 14:36:23 +10:00
Shannon Deminick	f9d79871b4	Merge pull request #1837 from Jeavon/U4-9684 U4-9684 UDI Media Picker Value Converter should cache prevalues	2017-04-19 14:35:29 +10:00
Shannon	777b02b84c	Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 # Conflicts: # build/NuSpecs/UmbracoCms.nuspec # build/UmbracoVersion.txt # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Core/IO/IFileSystem.cs # src/Umbraco.Core/Media/ImageHelper.cs # src/Umbraco.Core/Models/ContentExtensions.cs # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj # src/Umbraco.Web.UI/packages.config	2017-04-18 20:17:59 +10:00
Shannon Deminick	e322ab6f75	Merge pull request #1879 from umbraco/temp-U4-7009 U4-7009 Changing passwords design oversight	2017-04-18 20:15:33 +10:00
Shannon	d19bebc404	Merge branch 'dev-v7.6' into temp-U4-7009	2017-04-18 20:10:27 +10:00
Shannon	46dd86c745	Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method	2017-04-18 20:09:27 +10:00
Shannon Deminick	62af834176	Merge pull request #1876 from jwoods1/patch-1 The form closing tag	2017-04-18 13:17:12 +10:00
Shannon	2dac1b3cf5	Merge branch 'normalize-stream-seek' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-normalize-stream-seek # Conflicts: # src/Umbraco.Core/Media/ImageHelper.cs	2017-04-18 13:11:44 +10:00
Shannon Deminick	68fb951283	Merge pull request #1885 from JimBobSquarePants/fix-image-memoryleak EncodingParameters implements IDisposable	2017-04-18 13:08:04 +10:00
Shannon Deminick	1ca825de62	Merge pull request #1886 from JimBobSquarePants/filesystem-docs Document the IFileSystem interface	2017-04-18 13:05:35 +10:00
James Jackson-South	54b57f7d51	Document the IFileSystem interface	2017-04-15 17:21:48 +10:00
James Jackson-South	2f6e161120	EncodingParameters implements IDisposable	2017-04-15 16:41:24 +10:00
Warren Buckley	379bbe5bc4	Change background color to purple to the overlay solid color before we login to backoffice at end of installer	2017-04-13 12:06:48 +01:00
Warren Buckley	5c558b0eeb	Merge pull request #1881 from umbraco/temp-U4-9762 U4-9762 ezSearch package complains about pickers in macro parameters	2017-04-13 11:26:20 +01:00
Emil Wangaa	298e56ad05	Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6	2017-04-12 14:24:27 +02:00
Emil Wangaa	d74d2cd945	Fixes U4-9732 Insert Value in new template editor missing standard metadata fields	2017-04-12 14:24:10 +02:00
Sebastiaan Janssen	e2dc4f36ad	U4-9762 ezSearch package complains about pickers in macro parameters	2017-04-12 13:39:38 +02:00
Sebastiaan Janssen	9620c902cc	Merge pull request #1878 from umbraco/temp-U4-9761 Fixes U4-9761: Creating a new partial view saves the file with a wrong path	2017-04-11 22:04:29 +02:00
Sebastiaan Janssen	abda579da6	Merge pull request #1875 from umbraco/temp-U4-9753 fixes: U4-9753 When uploading, moving or deleting folders in the medi…	2017-04-11 22:00:40 +02:00
Sebastiaan Janssen	2e43e97ae2	Merge pull request #1867 from umbraco/temp-U4-9722 fixes: U4-9722 7.6 RC layout issues	2017-04-11 21:51:24 +02:00
Sebastiaan Janssen	c7ac3e7691	Merge pull request #1873 from umbraco/temp-U4-9749 fixes: U4-9749 Clean up ace themes and modes	2017-04-11 21:41:00 +02:00
Sebastiaan Janssen	a209a2067c	Merge pull request #1874 from umbraco/temp-U4-9751 fixes: U4-9751 "Your recycle bin is empty" shows when folders are add…	2017-04-11 21:38:04 +02:00
Sebastiaan Janssen	b1c6276a67	U4-7009 Changing passwords design oversight	2017-04-11 20:53:34 +02:00
Mads Rasmussen	3950b35539	Merge pull request #1877 from umbraco/temp-U4-9756 U4-9756 Tree Picker Overlay - Support for emptystate message	2017-04-11 15:22:27 +02:00
Emil Wangaa	2f63364925	Fixes issue with creating new partial being saved with wrong path	2017-04-11 13:26:54 +02:00
Sebastiaan Janssen	376c78381d	One more.. Reverts CodeAnalysis update to stay compatible with Models builder	2017-04-10 15:02:04 +02:00
Sebastiaan Janssen	0a09810f0f	Reverts CodeAnalysis update to stay compatible with Models builder	2017-04-10 13:45:34 +02:00
Sebastiaan Janssen	43018e2793	Reverts CodeAnalysis update to stay compatible with Models builder	2017-04-10 13:35:20 +02:00
Warren Buckley	ba559f6836	Pass the emptystate message in other places we use the treepicker	2017-04-10 10:54:29 +01:00
Warren Buckley	a320b63fd6	Checks that the tree has items otherwise we display the emptystate message	2017-04-10 10:51:28 +01:00
Warren Buckley	200497b865	Dictionary is the most common treepicker that may not have any items in core	2017-04-10 10:42:26 +01:00
Warren Buckley	8bd38b3cdd	For tree search results - we display a generic no results message for an emtpy state now. Need to check with Mads if I broke the transiston?!	2017-04-10 09:49:56 +01:00
Shannon	f2c7c1e2c6	bumps version	2017-04-10 16:42:31 +10:00
Shannon	9f2c428a7c	updates to latest Models Builder	2017-04-10 16:12:23 +10:00
Shannon	a958f946ef	bumps version (beta) so i can post the patch release	2017-04-08 13:57:43 +10:00
Shannon	ac642619e7	Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6	2017-04-08 13:54:13 +10:00
Shannon	688652fb91	U4-9752 Very slow indexing after 7.5.12 update	2017-04-08 13:53:10 +10:00
Jason Woods	4ef1eeb8bc	The form closing tag The form was closing tag was </div> should be </form>	2017-04-07 11:09:21 -06:00
Mads Rasmussen	0d7661a779	fixes: U4-9753 When uploading, moving or deleting folders in the media section you have to reload to see the changes	2017-04-07 13:59:26 +02:00
Mads Rasmussen	17f36c62cb	fixes: U4-9751 "Your recycle bin is empty" shows when folders are added to media recycle bin	2017-04-07 12:26:29 +02:00
Mads Rasmussen	5a98150f15	fixes: U4-9749 Clean up ace themes and modes	2017-04-07 11:34:30 +02:00
Claus	d6bc0934ff	u4-6233: backporting preview fix.	2017-04-07 11:05:37 +02:00
Claus	29caacf3c3	u4-6233: escaping the calc function	2017-04-07 11:02:18 +02:00
Mads Rasmussen	f091219f48	fixes: U4-6233 umbraco 7.2.1 - desktop preview - offcanvasmenu is cut off - see possible css fix	2017-04-07 10:26:27 +02:00
Sebastiaan Janssen	372a2f5df4	Merge pull request #1870 from umbraco/temp-U4-8432 U4-8432 Update log4net async appender to use the official log4net one	2017-04-07 08:11:42 +02:00
Shannon Deminick	1397bc6dbf	Merge pull request #1869 from umbraco/temp-U4-9748 U4-9748 Add some debug logging for scheduled (un)publishing	2017-04-07 15:08:57 +10:00
Shannon	7c5a4d9d67	Changes Any calls to use native length calls	2017-04-07 15:08:32 +10:00
Shannon	183103dc16	reverts Moq which has regression issues	2017-04-07 14:16:28 +10:00
Shannon	4b2a5f8768	Merge branch 'dev-v7.6' into temp-U4-8432	2017-04-07 12:32:30 +10:00
Shannon Deminick	2c3693ac68	Merge pull request #1855 from abryukhov/patch-6 Missing some new keys in 'create' area	2017-04-07 12:28:33 +10:00
Shannon Deminick	7d90296e15	Merge pull request #1856 from abryukhov/patch-7 New keys added to the 'create' area	2017-04-07 12:28:17 +10:00
Shannon	d4c831864d	updates editor config with more defaults with larger spaces	2017-04-07 12:26:34 +10:00
Shannon Deminick	1a56bb9948	Merge pull request #1860 from Jeavon/EditorConfig Add .editorConfig	2017-04-07 12:21:09 +10:00
Shannon Deminick	4e84260619	Merge pull request #1866 from umbraco/temp-u4--9747 Adds check for GuidUdi in MediaController	2017-04-07 12:13:25 +10:00
Shannon	62ddce60a5	updates nuspec	2017-04-07 12:09:05 +10:00
Shannon	bc8829ce14	U4-8432 Update log4net async appender to use the official log4net one	2017-04-07 12:08:16 +10:00
Shannon	d582d5c827	Fixes log4net nuspec entry	2017-04-07 12:06:17 +10:00
Shannon	604bddabdf	Updateing the app.configs with the correct redirects for log4net since alll package installs are going to change these	2017-04-07 12:04:05 +10:00
Shannon	e5af5bcc22	more binding redirects missing	2017-04-07 11:47:22 +10:00
Shannon Deminick	9f7f920229	Merge pull request #1868 from umbraco/issue-U4-9745 U4-9745 Update outdated NuGet dependencies	2017-04-07 11:38:18 +10:00
Shannon	d1d98372cd	Fixes binding redirects local transforms and nuget transforms	2017-04-07 11:37:23 +10:00
Sebastiaan Janssen	9feee42430	Oops, committed things to the wrong branch	2017-04-06 16:48:55 +02:00
Sebastiaan Janssen	876cb374ad	Logs in DEBUG mode how much we're going to attempt to (un)publish and the result statuscodes of those attempts	2017-04-06 16:45:00 +02:00
Sebastiaan Janssen	16582c8207	U4-9745 Update outdated NuGet dependencies	2017-04-06 16:27:41 +02:00
Mads Rasmussen	2ee1df3dec	update orange warning color to yellow	2017-04-06 16:25:09 +02:00
Mads Rasmussen	fc862f8434	remove border radius from alerts	2017-04-06 16:24:22 +02:00
Mads Rasmussen	8d7891d203	remove negative margin	2017-04-06 16:18:27 +02:00
Niels Hartvig	5af773d1b0	Adds check for GuidUdi in MediaController	2017-04-06 16:14:28 +02:00
Mads Rasmussen	847ef34281	adjust colors on header and footer in content mini editor to match main editor	2017-04-06 16:12:55 +02:00
Mads Rasmussen	a728f475aa	remove margin from editor sub header in content mini editor	2017-04-06 16:11:03 +02:00
Mads Rasmussen	60f91d95e9	add separator to button groups with toggle	2017-04-06 16:09:46 +02:00
Claus	821532cbd4	Merge pull request #1864 from umbraco/temp-U4-9744 fixes: U4-9744 Creating folders from the media picker doesn't work	2017-04-06 14:42:50 +02:00
Claus	e3a639b424	Merge pull request #1862 from umbraco/temp-U4-9729 fixes: U4-9729 New menus for Create dialogs are inconsistent with exi…	2017-04-06 14:36:22 +02:00
Claus	5c49aa9b43	Merge pull request #1863 from umbraco/temp-U4-9723 fixes: U4-9723 7.6.0-RC - dropdown in action menu is too far from button	2017-04-06 14:33:43 +02:00
Claus	f040754547	Merge pull request #1861 from umbraco/temp-U4-9578 fixes: U4-9578 Increase default font-size for RTE	2017-04-06 14:29:36 +02:00
Mads Rasmussen	0da8604639	fixes: U4-9744 Creating folders from the media picker doesn't work	2017-04-06 11:34:50 +02:00
Mads Rasmussen	dd09ba3e12	fixes: U4-9723 7.6.0-RC - dropdown in action menu is too far from button	2017-04-05 14:58:56 +02:00
Mads Rasmussen	896ea389a3	fixes: U4-9729 New menus for Create dialogs are inconsistent with existing Create Document Type panel	2017-04-05 13:23:13 +02:00
Stephan	759c6dfef2	Add a few SiteDomainHelper tests	2017-04-05 12:49:10 +02:00
Mads Rasmussen	809a3f952e	fixes: U4-9578 Increase default font-size for RTE	2017-04-05 12:09:10 +02:00
Shannon	dce9dea8f3	Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6	2017-04-05 19:17:35 +10:00
Shannon	b2a497ddba	missing signalr reference in nuspec	2017-04-05 19:17:12 +10:00
Jeavon	ea030d990f	Add .editorconfig file to enforce whitespace and line breaks	2017-04-04 18:19:50 +01:00
Alexander Bryukhov	ce08749d85	New keys added to the 'create' area	2017-04-04 13:17:23 +07:00
Alexander Bryukhov	1eea1f5f8f	Missing some new keys in 'create' area They are present in en.xml now, but not in en_us.xml	2017-04-04 11:21:07 +07:00
Jeavon	00a32c4479	U4-9684 UDI Media Picker Value Converter should cache prevalues	2017-03-28 12:46:31 +01:00