Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config

BUILD.md

@@ -14,6 +14,43 @@ By default, this builds the current version. It is possible to specify a differe
 
 Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
 
+## PowerShell Quirks
+
+There is a good chance that running `build.ps1` ends up in error, with messages such as
+
+>The file ...\build\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
+
+PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
+
+    PS> Get-ExecutionPolicy -List
+    
+            Scope ExecutionPolicy
+            ----- ---------------
+    MachinePolicy       Undefined
+       UserPolicy       Undefined
+          Process       Undefined
+      CurrentUser       Undefined
+     LocalMachine    RemoteSigned
+
+Policies can be `Restricted`, `AllSigned`, `RemoteSigned`, `Unrestricted` and `Bypass`. Scopes can be `MachinePolicy`, `UserPolicy`, `Process`, `CurrentUser`, `LocalMachine`. You need the current policy to be `RemoteSigned`—as long as it is `Undefined`, the script cannot run. You can change the current user policy with:
+
+    PS> Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy RemoteSigned
+
+Alternatively, you can do it at machine level, from within an elevated PowerShell session:
+
+    PS> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned
+
+And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
+
+>Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build\build.ps1?
+[D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
+
+This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
+
+The best solution is to unblock the Zip file before un-zipping: right-click the files, open *Properties*, and there should be a *Unblock* checkbox at the bottom of the dialog. If, however, the Zip file has already been un-zipped, it is possible to recursively unblock all files from PowerShell with:
+
+    PS> Get-ChildItem -Recurse *.* | Unblock-File
+
 ## Notes
 
 Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).

README.md

@@ -2,7 +2,7 @@
 
 Umbraco CMS
 ===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
 
 [![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
 
@@ -12,7 +12,7 @@ Umbraco is a free open source Content Management System built on the ASP.NET pla
 
 ## Building Umbraco from source ##
 
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.
+The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.  See [this page](BUILD.md) for more details.
 
 Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
@@ -26,7 +26,7 @@ For the first time on the Microsoft platform, there is a free user and developer
 
 Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
 
-Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
+Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
 
 To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
 

build.bat

@@ -10,6 +10,5 @@ IF ERRORLEVEL 1 (
 :error
 ECHO.
 ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then make sure to run the following command from an administrator command prompt:
+ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
 ECHO.
-ECHO powershell Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -33,13 +33,13 @@
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
+      <dependency id="Examine" version="[0.1.88, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -19,7 +19,7 @@
       <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)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
     </dependencies>
   </metadata>
   <files>

src/SolutionInfo.cs

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

src/Umbraco.Core/Configuration/UmbracoVersion.cs

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

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

@@ -134,7 +134,9 @@ namespace Umbraco.Core.Persistence.Repositories
                 .InnerJoin<ContentDto>(SqlSyntax)
                 .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
             //TODO: IF we want to enable querying on content type information this will need to be joined
             //.InnerJoin<ContentTypeDto>(SqlSyntax)
             //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
@@ -833,11 +835,21 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
 
         }
 
-        public int CountPublished()
-        {
-            var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true);
-            return Database.ExecuteScalar<int>(sql);
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true);
+                return Database.ExecuteScalar<int>(sql);
+            }
+            else
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true)
+                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                return Database.ExecuteScalar<int>(sql);
+            }
         }
 
         public void ReplaceContentPermissions(EntityPermissionSet permissionSet)

src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs

@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <remarks>
         /// We require this on the repo because the IQuery{IContent} cannot supply the 'newest' parameter
         /// </remarks>
-        int CountPublished();
+        int CountPublished(string contentTypeAlias = null);
 
         /// <summary>
         /// Used to bulk update the permissions set for a content item. This will replace all permissions

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

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

src/Umbraco.Core/PluginManager.cs

@@ -207,7 +207,7 @@ namespace Umbraco.Core
                     return _currentAssembliesHash;
 
                 _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
-					{
+                    {
 						// the bin folder and everything in it
 						new Tuple<FileSystemInfo, bool>(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)), false),
 						// the app code folder and everything in it
@@ -216,7 +216,7 @@ namespace Umbraco.Core
 						new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath("~/global.asax")), false),
                         // trees.config - use the contents to create the hash since this gets resaved on every app startup!
                         new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath(SystemDirectories.Config + "/trees.config")), true)
-					}, _logger);
+                    }, _logger);
 
                 return _currentAssembliesHash;
             }
@@ -601,7 +601,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), null,
+                    typeof(T), null,
                     () => TypeFinder.FindClassesOfType<T>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -610,14 +610,14 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), null,
+                typeof(T), null,
                 () => discovered
-                    .Where(x => typeof (T).IsAssignableFrom(x)),
+                    .Where(x => typeof(T).IsAssignableFrom(x)),
                 true);
         }
 
@@ -640,7 +640,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), typeof (TAttribute),
+                    typeof(T), typeof(TAttribute),
                     () => TypeFinder.FindClassesOfTypeWithAttribute<T, TAttribute>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -649,12 +649,12 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), typeof (TAttribute),
+                typeof(T), typeof(TAttribute),
                 () => discovered
                     .Where(x => typeof(T).IsAssignableFrom(x))
                     .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
@@ -676,7 +676,7 @@ namespace Umbraco.Core
             cache &= specificAssemblies == null;
 
             return ResolveTypesInternal(
-                typeof (object), typeof (TAttribute),
+                typeof(object), typeof(TAttribute),
                 () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
                 cache);
         }
@@ -694,13 +694,13 @@ namespace Umbraco.Core
             var name = ResolvedName(baseType, attributeType);
 
             lock (_typesLock)
-            using (_logger.TraceDuration<PluginManager>(
-                "Resolving " + name,
-                "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
-            {
-                // resolve within a lock & timer
-                return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
-            }
+                using (_logger.TraceDuration<PluginManager>(
+                    "Resolving " + name,
+                    "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
+                {
+                    // resolve within a lock & timer
+                    return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
+                }
         }
 
         private static string ResolvedName(Type baseType, Type attributeType)
@@ -836,7 +836,7 @@ namespace Umbraco.Core
 
             public TypeListKey(Type baseType, Type attributeType)
             {
-                BaseType = baseType ?? typeof (object);
+                BaseType = baseType ?? typeof(object);
                 AttributeType = attributeType;
             }
 
@@ -854,7 +854,7 @@ namespace Umbraco.Core
 
                 var hash = 5381;
                 hash = ((hash << 5) + hash) ^ BaseType.GetHashCode();
-                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof (TypeListKey)).GetHashCode();
+                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof(TypeListKey)).GetHashCode();
                 return hash;
             }
         }
@@ -917,7 +917,7 @@ namespace Umbraco.Core
         {
             // look for IParameterEditor (fast, IDiscoverable) then filter
 
-            var propertyEditor = typeof (PropertyEditor);
+            var propertyEditor = typeof(PropertyEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => propertyEditor.IsAssignableFrom(x) && x != propertyEditor);
@@ -932,8 +932,8 @@ namespace Umbraco.Core
         /// </remarks>
         public static IEnumerable<Type> ResolveParameterEditors(this PluginManager mgr)
         {
-            var propertyEditor = typeof (PropertyEditor);
-            var parameterEditor = typeof (ParameterEditor);
+            var propertyEditor = typeof(PropertyEditor);
+            var parameterEditor = typeof(ParameterEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => x != propertyEditor && x != parameterEditor);

src/Umbraco.Core/Security/BackOfficeSignInManager.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Security
 {
+    //TODO: In v8 we need to change this to use an int? nullable TKey instead, see notes against overridden TwoFactorSignInAsync
     public class BackOfficeSignInManager : SignInManager<BackOfficeIdentityUser, int>
     {
         private readonly ILogger _logger;
@@ -259,5 +260,67 @@ namespace Umbraco.Core.Security
             }
             return null;
         }
+
+        /// <summary>
+        /// Two factor verification step
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="code"></param>
+        /// <param name="isPersistent"></param>
+        /// <param name="rememberBrowser"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<SignInStatus> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberBrowser)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+            {
+                return SignInStatus.Failure;
+            }
+            var user = await UserManager.FindByIdAsync(userId);
+            if (user == null)
+            {
+                return SignInStatus.Failure;
+            }
+            if (await UserManager.IsLockedOutAsync(user.Id))
+            {
+                return SignInStatus.LockedOut;
+            }
+            if (await UserManager.VerifyTwoFactorTokenAsync(user.Id, provider, code))
+            {
+                // When token is verified correctly, clear the access failed count used for lockout
+                await UserManager.ResetAccessFailedCountAsync(user.Id);
+                await SignInAsync(user, isPersistent, rememberBrowser);
+                return SignInStatus.Success;
+            }
+            // If the token is incorrect, record the failure which also may cause the user to be locked out
+            await UserManager.AccessFailedAsync(user.Id);
+            return SignInStatus.Failure;
+        }
+
+        /// <summary>Send a two factor code to a user</summary>
+        /// <param name="provider"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<bool> SendTwoFactorCodeAsync(string provider)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+                return false;
+
+            var token = await UserManager.GenerateTwoFactorTokenAsync(userId, provider);
+            var identityResult = await UserManager.NotifyTwoFactorTokenAsync(userId, provider, token);
+            return identityResult.Succeeded;
+        }
     }
 }

src/Umbraco.Core/Services/ContentService.cs

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

src/Umbraco.Core/Services/EntityXmlSerializer.cs

@@ -42,6 +42,7 @@ namespace Umbraco.Core.Services
             xml.Add(new XAttribute("writerID", content.WriterId));
             xml.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString(CultureInfo.InvariantCulture)));
             xml.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
+            xml.Add(new XAttribute("isPublished", content.Published));
 
             if (deep)
             {

src/Umbraco.Core/Services/IContentService.cs

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

src/Umbraco.Core/Services/IdkMap.cs

@@ -106,8 +106,8 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType); ;
-                _key2Id[val.Value] = new TypedId<int>();
+                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType);
+                _key2Id[val.Value] = new TypedId<int>(id, umbracoObjectType);
             }
             finally
             {

src/Umbraco.Core/Services/MemberService.cs

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

src/Umbraco.Core/Umbraco.Core.csproj

@@ -56,8 +56,8 @@
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
     </Reference>
     <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>

src/Umbraco.Core/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.6" 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" />

src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs

@@ -124,7 +124,7 @@ namespace Umbraco.Tests.TestHelpers
         protected virtual void ResetPluginManager()
         {
             PluginManager.Current = null;
-        }        
+        }
 
         protected virtual CacheHelper CreateCacheHelper()
         {

src/Umbraco.Tests/UdiTests.cs

@@ -14,6 +14,12 @@ namespace Umbraco.Tests
     [TestFixture]
     public class UdiTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [Test]
         public void StringUdiCtorTest()
         {

src/Umbraco.Tests/Umbraco.Tests.csproj

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

src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs

@@ -20,8 +20,14 @@ using Umbraco.Web.Templates;
 namespace Umbraco.Tests.Web
 {
     [TestFixture]
-    public class TemplateUtilitiesTests
+    public class TemplateUtilitiesTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [TestCase("", "")]
         [TestCase("hello href=\"{localLink:1234}\" world ", "hello href=\"/my-test-url\" world ")]
         [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]

src/Umbraco.Tests/packages.config

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

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

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

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

@@ -3,7 +3,7 @@
 * @name umbraco.directives.directive:umbSections
 * @restrict E
 **/
-function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location) {
+function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location, historyService) {
     return {
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
@@ -161,7 +161,9 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                     $location.path(section.routePath);
                 }
                 else {
-                    $location.path(section.alias).search('');
+                    var lastAccessed = historyService.getLastAccessedItemForSection(section.alias);
+                    var path = lastAccessed != null ? lastAccessed.link : section.alias;                  
+                    $location.path(path).search('');
                 }
 			    
 			};

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

@@ -36,7 +36,7 @@ angular.module("umbraco.directives")
         // this will greatly improve performance since there's potentially a lot of nodes being rendered = a LOT of watches!
 
         template: '<li ng-class="{\'current\': (node == currentNode), \'has-children\': node.hasChildren}" on-right-click="altSelect(node, $event)">' +
-            '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" >' +
+            '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >' +
             //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog
             //'<ins ng-if="tree.enablelistviewsearch && node.metaData.isContainer" class="umb-tree-node-search icon-search" ng-click="searchNode(node, $event)" alt="searchAltText"></ins>' + 
             '<ins ng-class="{\'icon-navigation-right\': !node.expanded || node.metaData.isContainer, \'icon-navigation-down\': node.expanded && !node.metaData.isContainer}" ng-click="load(node)">&nbsp;</ins>' +

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

@@ -110,7 +110,7 @@ Use this directive to generate a thumbnail grid of media items.
                     itemMinWidth = scope.itemMinWidth;
                 }
 
-                if (scope.itemMinWidth) {
+                if (scope.itemMinHeight) {
                     itemMinHeight = scope.itemMinHeight;
                 }
 

src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js

@@ -41,7 +41,7 @@ function entityResource($q, $http, umbRequestHelper) {
             if (!value) {
                 return "";
             }
-
+            value = value.replace("#", "");
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(

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

@@ -115,6 +115,27 @@ angular.module('umbraco.services')
 		 */
 		getCurrent: function(){
 			return nArray;
-		}
+        },
+
+        /**
+		 * @ngdoc method
+		 * @name umbraco.services.historyService#getLastAccessedItemForSection
+		 * @methodOf umbraco.services.historyService
+		 *
+		 * @description
+		 * Method to return the item that was last accessed in the given section
+		 *
+         * @param {string} sectionAlias Alias of the section to return the last accessed item for.
+		 */
+        getLastAccessedItemForSection: function (sectionAlias) {
+            for (var i = 0, len = nArray.length; i < len; i++) {
+                var item = nArray[i];
+                if (item.link.indexOf(sectionAlias + "/") === 0) {
+                    return item;
+                }
+            }
+
+            return null;
+        }
 	};
 });

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

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

src/Umbraco.Web.UI.Client/src/installer/installer.service.js

@@ -17,7 +17,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 
 	//add to umbraco installer facts here
 	var facts = ['Umbraco helped millions of people watch a man jump from the edge of space',
-					'Over 420 000 websites are currently powered by Umbraco',
+					'Over 440 000 websites are currently powered by Umbraco',
 					"At least 2 people have named their cat 'Umbraco'",
 					'On an average day, more than 1000 people download Umbraco',
 					'<a target="_blank" href="https://umbraco.tv">umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started',
@@ -31,10 +31,10 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the danish name for an allen key",
 					"Umbraco has been around since 2005, that's a looong time in IT",
-					"More than 550 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
+					"More than 600 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
 					"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
 					"You can extend Umbraco without modifying the source code using either JavaScript or C#",
-					"Umbraco was installed in more than 165 countries in 2015"
+					"Umbraco has been installed in more than 198 countries"
 					 ];
 
     /**

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

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

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

@@ -151,7 +151,8 @@
               <label><localize key="general_password">Password</localize></label>
               <div class="password-toggle">
                 <input type="password" ng-model="password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" /><a ng-click="togglePassword()">Toggle</a>
-             </div>
+              </div>
+            </div>
 
             <div class="flex justify-between items-center">
               <button type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>

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

@@ -31,7 +31,7 @@
                 <div class="umb-el-wrap">
                     <label class="control-label" for="altField"><localize key="templateEditor_fallbackField">Fallback field</localize></label>
                     <div class="controls">
-                        <select ng-model="vm.altField" >
+                        <select ng-model="vm.altField" id="altField">
                             <optgroup localize="label" label="@templateEditor_customFields">
                                 <option ng-repeat="(key, value) in vm.properties" value="{{value}}">{{value}}</option>
                             </optgroup>
@@ -43,6 +43,7 @@
                 </div>
             </div>
         </div>
+        </div>
 
         <!-- Default value -->
         <div>
@@ -55,7 +56,7 @@
                 <div class="umb-el-wrap">
                     <label class="control-label" for="altText"><localize key="templateEditor_defaultValue">Default value</localize></label>
                     <div class="controls">
-                        <input type="text" name="altText" ng-model="vm.altText" umb-auto-focus>
+                        <input type="text" id="altText" name="altText" ng-model="vm.altText" umb-auto-focus>
                     </div>
                 </div>
             </div>
@@ -65,11 +66,13 @@
         <div class="control-group umb-control-group">
             <div class="umb-el-wrap">
                 <div class="controls">
-                    <label class="control-label" for="recursive">
+                    <label class="control-label" >
                         <localize key="templateEditor_recursive">Recursive</localize>
                     </label>
-                    <input type="checkbox" name="recursive" ng-model="vm.recursive">
-                    <localize key="templateEditor_recursiveDescr">Yes, make it recursive</localize>
+                    <label for="recursive"> 
+                        <input id="recursive" type="checkbox" name="recursive" ng-model="vm.recursive">
+                        <localize key="templateEditor_recursiveDescr">Yes, make it recursive</localize>
+                    </label>
                 </div>
             </div>
         </div>
@@ -134,7 +137,7 @@
                     <small><localize key="templateEditor_insertedBefore">Will be inserted before the field value</localize></small>
                 </label>
                 <div class="controls">
-                    <input type="text" name="insertBefore" class="-full-width-input" ng-model="vm.insertBefore">
+                    <input type="text" id="insertBefore" name="insertBefore" class="-full-width-input" ng-model="vm.insertBefore">
                 </div>
             </div>
         </div>
@@ -147,7 +150,7 @@
                     <small><localize key="templateEditor_insertedAfter">Will be inserted after the field value</localize></small>
                 </label>
                 <div class="controls">
-                    <input type="text" name="insertAfter" class="-full-width-input" ng-model="vm.insertAfter">
+                    <input type="text" id="insertAfter" name="insertAfter" class="-full-width-input" ng-model="vm.insertAfter">
                 </div>
             </div>
         </div>
@@ -162,8 +165,10 @@
                             <small><localize key="templateEditor_convertLineBreaksHelp">Replaces line breaks with break html tag</localize></small>
                         </label>
                     </div>
-                    <input type="checkbox" name="linebreaks" ng-model="vm.convertLinebreaks">
-                    <localize key="templateEditor_convertLineBreaksDescription">Yes, convert line breaks</localize>
+                    <label for="linebreaks">
+                      <input type="checkbox" id="linebreaks" name="linebreaks" ng-model="vm.convertLinebreaks">
+                      <localize key="templateEditor_convertLineBreaksDescription">Yes, convert line breaks</localize>
+                    </label>
                 </div>
             </div>
         </div>

src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html

@@ -98,7 +98,7 @@
                         <localize key="contentTypeEditor_inheritedFrom"></localize> {{ tab.inheritedFromName }}
 
                         <span ng-repeat="contentTypeName in tab.parentTabContentTypeNames">
-                            {{ contentTypeName }}
+                            <a href="#/settings/documentTypes/edit/{{tab.contentTypeId}}">{{ contentTypeName }}</a>
                             <span ng-if="!$last">, </span>
                         </span>
                     </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html

@@ -1,5 +1,5 @@
 <h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos.</p>
 
 <div class="row-fluid"
 	ng-init="init('http://umbraco.tv/videos/developer/chapterrss?sort=no')"
@@ -7,14 +7,12 @@
 
 	<ul class="thumbnails" >
 		<li class="span2" ng-repeat="video in videos">
-	    	<div class="thumbnail" style="margin-right: 20px; padding: 20px;">
-		    	<a class="btn-link -underline"  target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-		    	</a>
-		    	<a target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
-		    	</a>
-	    	</div>
+            <a class="btn-link" target="_blank" href="{{video.link}}" title="{{video.title}}">
+                <div class="thumbnail" style="margin-right: 20px; padding: 20px;">
+                    <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
+                    <div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
+                </div>
+            </a>
 	    </li>
 	</ul>
 </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html

@@ -19,7 +19,7 @@
                 <button
                     ng-if="vm.dashboard.urlTrackerDisabled === true"
                     type="button"
-                    class="umb-era-button umb-button--s -blue"
+                    class="umb-era-button umb-button--s -green"
                     ng-click="vm.enableUrlTracker()">
                     <span><localize key="redirectUrls_enableUrlTracker">Enable URL Tracker</localize></span>
                 </button>

src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js

@@ -172,9 +172,7 @@
                                     notificationsService.error(value);
                                 });
                             });
-
                         });
-
                     }
                 }];
             }
@@ -185,34 +183,24 @@
 
             //we are creating so get an empty data type item
             contentTypeResource.getScaffold($routeParams.id)
-				.then(function (dt) {
-
-				    init(dt);
-
-				    vm.page.loading = false;
-
-				});
+                .then(function(dt) {
+                    init(dt);
+                    vm.page.loading = false;
+                });
         }
         else {
             loadDocumentType();
         }
 
         function loadDocumentType() {
-
             vm.page.loading = true;
-
             contentTypeResource.getById($routeParams.id).then(function (dt) {
                 init(dt);
-
                 syncTreeNode(vm.contentType, dt.path, true);
-
                 vm.page.loading = false;
-
             });
-
         }
 
-
         /* ---------- SAVE ---------- */
 
         function save() {
@@ -241,7 +229,6 @@
                         vm.contentType.id = savedContentType.id;
                         vm.contentType.groups.forEach(function(group) {
                             if (!group.name) return;
-
                             var k = 0;
                             while (k < savedContentType.groups.length && savedContentType.groups[k].name != group.name)
                                 k++;
@@ -249,13 +236,11 @@
                                 group.id = 0;
                                 return;
                             }
-
                             var savedGroup = savedContentType.groups[k];
                             if (!group.id) group.id = savedGroup.id;
 
                             group.properties.forEach(function (property) {
                                 if (property.id || !property.alias) return;
-
                                 k = 0;
                                 while (k < savedGroup.properties.length && savedGroup.properties[k].alias != property.alias)
                                     k++;
@@ -263,7 +248,6 @@
                                     property.id = 0;
                                     return;
                                 }
-
                                 var savedProperty = savedGroup.properties[k];
                                 property.id = savedProperty.id;
                             });
@@ -289,13 +273,10 @@
                         });
                     }
                     vm.page.saveButtonState = "error";
-
                     deferred.reject(err);
                 });
                 return deferred.promise;
-
             }
-
         }
 
         function init(contentType) {
@@ -343,12 +324,11 @@
 
         function getDataTypeDetails(property) {
             if (property.propertyState !== "init") {
-
                 dataTypeResource.getById(property.dataTypeId)
-					.then(function (dataType) {
-					    property.dataTypeIcon = dataType.icon;
-					    property.dataTypeName = dataType.name;
-					});
+                    .then(function(dataType) {
+                        property.dataTypeIcon = dataType.icon;
+                        property.dataTypeName = dataType.name;
+                    });
             }
         }
 
@@ -369,7 +349,6 @@
                 eventsService.unsubscribe(evts[e]);
             }
         });
-
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.DocumentTypes.EditController", DocumentTypesEditController);

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html

@@ -36,7 +36,7 @@
             <umb-overlay
                ng-if="vm.childNodeSelectorOverlay.show"
                model="vm.childNodeSelectorOverlay"
-               position="target"
+               position="center"
                view="vm.childNodeSelectorOverlay.view">
             </umb-overlay>
 

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstringlimited.html

@@ -0,0 +1,12 @@
+<div>
+    <input name="numberField" class="umb-editor umb-number"
+           type="number"
+           ng-model="model.value"
+           val-server="value"
+           min="0"
+           max="500"
+           fix-number />
+
+    <span class="help-inline" val-msg-for="numberField" val-toggle-msg="number">Not a number</span>
+    <span class="help-inline" val-msg-for="numberField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

@@ -299,7 +299,7 @@
       ng-if="editorOverlay.show"
       model="editorOverlay"
       view="editorOverlay.view"
-      position="target">
+      position="center">
     </umb-overlay>
 
     <umb-overlay

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

@@ -86,6 +86,10 @@
             };
 
             $scope.add = function ($event) {
+				if (!angular.isArray($scope.model.value)) {
+                  $scope.model.value = [];
+				}
+				
                 if ($scope.newCaption == "") {
                     $scope.hasError = true;
                 } else {

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

@@ -1,37 +1,42 @@
 function textboxController($scope) {
-
     // macro parameter editor doesn't contains a config object,
-    // so we create a new one to hold any properties 
+    // so we create a new one to hold any properties
     if (!$scope.model.config) {
         $scope.model.config = {};
     }
 
-    if (!$scope.model.config.maxChars) {
-        $scope.model.config.maxChars = false;
-    }
-
     $scope.model.maxlength = false;
     if ($scope.model.config && $scope.model.config.maxChars) {
         $scope.model.maxlength = true;
-        if($scope.model.value == undefined) {
+    }
+
+    if (!$scope.model.config.maxChars) {
+        // 500 is the maximum number that can be stored
+        // in the database, so set it to the max, even
+        // if no max is specified in the config
+        $scope.model.config.maxChars = 500;
+    }
+
+    if ($scope.model.maxlength) {
+        if ($scope.model.value === undefined) {
             $scope.model.count = ($scope.model.config.maxChars * 1);
         } else {
             $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
         }
     }
 
-    $scope.model.change = function() {
+    $scope.model.change = function () {
         if ($scope.model.config && $scope.model.config.maxChars) {
-            if($scope.model.value == undefined) {
+            if ($scope.model.value === undefined) {
                 $scope.model.count = ($scope.model.config.maxChars * 1);
             } else {
                 $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
             }
-            if($scope.model.count < 0) {
+            if ($scope.model.count < 0) {
                 $scope.model.value = $scope.model.value.substring(0, ($scope.model.config.maxChars * 1));
                 $scope.model.count = 0;
             }
         }
     }
 }
-angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);
+angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html

@@ -4,11 +4,11 @@
            val-server="value"
            ng-required="model.validation.mandatory"
            ng-trim="false"
-		   ng-keyup="model.change()" />
+           ng-keyup="model.change()" />
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
-	<div class="help" ng-if="model.maxlength">
-		<strong>{{model.count}}</strong> 
-		<localize key="textbox_characters_left">characters left</localize>
-	</div>
-</div>
+    <div class="help" ng-if="model.maxlength">
+        <strong>{{model.count}}</strong>
+        <localize key="textbox_characters_left">characters left</localize>
+    </div>
+</div>

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

@@ -127,18 +127,18 @@
     <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.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
     </Reference>
-    <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 Include="ImageProcessor.Web, Version=4.8.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll</HintPath>
     </Reference>
     <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>
@@ -162,9 +162,8 @@
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.2\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -1027,9 +1026,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7740</DevelopmentServerPort>
+          <DevelopmentServerPort>7750</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7740</IISUrl>
+          <IISUrl>http://localhost:7750</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml

@@ -771,7 +771,7 @@
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Třídění bylo ukončeno.</key>
     <key alias="sortHelp">Abyste nastavili, jak mají být položky seřazeny, přetáhněte jednotlivé z nich nahoru či dolů. Anebo klikněte na hlavičku sloupce pro setřídění celé kolekce</key>
-    <key alias="sortPleaseWait"><![CDATA[ Čekejte, prosím. Položky jsou tříděny a může to chvíli trvat.<br/> <br/> Během třídění nezavírejte toto okno]]></key>
+    <key alias="sortPleaseWait"><![CDATA[ Čekejte, prosím. Položky jsou tříděny a může to chvíli trvat.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">Publikování bylo zrušeno doplňkem třetí strany</key>

src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml

@@ -733,7 +733,7 @@ Vennlig hilsen Umbraco roboten
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Sortering ferdig.</key>
     <key alias="sortHelp">Dra elementene opp eller ned for å arrangere dem. Du kan også klikke kolonneoverskriftene for å sortere alt på en gang.</key>
-    <key alias="sortPleaseWait"><![CDATA[Vennligst vent. Elementene blir sortert, dette kan ta litt tid.<br/> <br/> Ikke lukk dette vinduet under sortering]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Vennligst vent. Elementene blir sortert, dette kan ta litt tid.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="operationFailedHeader">En feil oppsto</key>

src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml

@@ -905,7 +905,7 @@
     <key alias="sortCreationDate">增添時間</key>
     <key alias="sortDone">排序完成。</key>
     <key alias="sortHelp">上下拖拽項目或按一下列頭進行排序</key>
-    <key alias="sortPleaseWait"><![CDATA[ 請稍後。項目正在排序，這需要一點時間。<br/> <br/>排序中請不要關閉視窗。]]></key>
+    <key alias="sortPleaseWait"><![CDATA[ 請稍後。項目正在排序，這需要一點時間。]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="validationFailedHeader">驗證</key>

src/Umbraco.Web.UI/config/imageprocessor/processing.config

@@ -14,6 +14,7 @@
     <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web" />
     <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web" />
     <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true" />
+    <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web" />
     <plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
       <settings>
         <setting key="MaxSize" value="22" />

src/Umbraco.Web.UI/packages.config

@@ -4,10 +4,10 @@
   <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.5.2" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" 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="Examine" version="0.1.88" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="4.8.7" targetFramework="net45" />
+  <package id="ImageProcessor.Web.Config" version="2.3.1" 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" />
@@ -22,7 +22,7 @@
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net45" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net45" />

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

@@ -1014,7 +1014,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="sortCreationDate">Oprettelsesdato</key>
     <key alias="sortDone">Sortering udført</key>
     <key alias="sortHelp">Træk de forskellige sider op eller ned for at indstille hvordan de skal arrangeres, eller klik på kolonnehovederne for at sortere hele rækken af sider</key>
-    <key alias="sortPleaseWait"><![CDATA[Vent venligst mens siderne sorteres. Det kan tage et stykke tid<br/><br/>Luk ikke dette vindue imens]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Vent venligst mens siderne sorteres. Det kan tage et stykke tid.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="operationCancelledHeader">Annulleret</key>

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

@@ -764,7 +764,7 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="sortCreationDate">Erstellungsdatum</key>
     <key alias="sortDone">Sortierung abgeschlossen.</key>
     <key alias="sortHelp">Ziehen Sie die Elemente an ihre gewünschte neue Position.</key>
-    <key alias="sortPleaseWait">Bitte warten, die Seiten werden sortiert. Das kann einen Moment dauern. Bitte schließen Sie dieses Fenster nicht, bis der Sortiervorgang abgeschlossen ist.</key>
+    <key alias="sortPleaseWait">Bitte warten, die Seiten werden sortiert. Das kann einen Moment dauern.</key>
   </area>
   <area alias="speechBubbles">
     <key alias="operationFailedHeader">Fehlgeschlagen</key>

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

@@ -685,8 +685,7 @@
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Ordenación completa.</key>
     <key alias="sortHelp">Arrastra las diferentes páginas debajo para colocarlas como deberían estar. O haz click en las cabeceras de las columnas para ordenar todas las páginas</key>
-    <key alias="sortPleaseWait"><![CDATA[Espere por favor, las páginas están siendo ordenadas. El proceso puede durar un poco.<br/>
-<br/> No cierre esta ventana mientras se está ordenando ]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Espere por favor, las páginas están siendo ordenadas. El proceso puede durar un poco.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">La publicación fue cancelada por un complemento de terceros</key>

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

@@ -1015,7 +1015,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="sortCreationDate">Date de création</key>
     <key alias="sortDone">Tri achevé.</key>
     <key alias="sortHelp">Faites glisser les différents éléments vers le haut ou vers le bas pour définir la manière dont ils doivent être organisés. Ou cliquez sur les entêtes de colonnes pour trier la collection complète d'éléments</key>
-    <key alias="sortPleaseWait"><![CDATA[Veuillez patienter. Les éléments sont en cours de tri, cela peut prendre un moment.<br/> <br/> Ne fermez pas cette fenêtre durant le tri.]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Veuillez patienter. Les éléments sont en cours de tri, cela peut prendre un moment.]]></key>
   </area>
   <area alias="speechBubbles">
 	<key alias="validationFailedHeader">Validation</key>

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

@@ -681,7 +681,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">המיון הושלם.</key>
     <key alias="sortHelp">יש לגרור את הפריטים מעלה או מטה כדי להגדיר את סדר התוכן. או לחץ על כותרת העמודה כדי למיין את כל פריטי התוכן</key>
-    <key alias="sortPleaseWait"><![CDATA[פריטי התוכן ממיונים ברגע זה, תהליך זה לוקח זמן מה.<br/> <br/> נא לא לסגור את החלון בזמן המיון]]></key>
+    <key alias="sortPleaseWait"><![CDATA[פריטי התוכן ממיונים ברגע זה, תהליך זה לוקח זמן מה.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">הפירסום בוטל על ידי תוסף צד שלישי</key>

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

@@ -657,7 +657,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone"><![CDATA[Ordinamento completato.]]></key>
     <key alias="sortHelp"><![CDATA[Sposta su o giù le pagine trascinandole per determinarne l'ordinamento. Oppure clicca la testata della colonna per ordinare l'intero gruppo di pagine]]></key>
-    <key alias="sortPleaseWait"><![CDATA[Si prega di attendere. Gli elementi sono in fase di ordinamento, questo può richiedere del tempo.<br/> <br/>Non chiudere questa finestra durante l'operazione]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Si prega di attendere. Gli elementi sono in fase di ordinamento, questo può richiedere del tempo.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent"><![CDATA[La pubblicazione è stata cancellata da un add-in di terze parti.]]></key>

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

@@ -887,7 +887,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">ソートが完了しました。</key>
     <key alias="sortHelp">上下にアイテムをドラッグするなどして適当に配置したり、列のヘッダーをクリックしてコレクション全体をソートできます</key>
-    <key alias="sortPleaseWait"><![CDATA[ 項目の並べ替えには少し時間がかかります。しばらくお待ちください。<br/> <br/> 並び替え中はウィンドウを閉じないでください。]]></key>
+    <key alias="sortPleaseWait"><![CDATA[ 項目の並べ替えには少し時間がかかります。しばらくお待ちください。]]></key>
   </area>
   <area alias="speechBubbles">
 	<key alias="validationFailedHeader">検証</key>

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

@@ -658,7 +658,7 @@
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">정렬 완료</key>
     <key alias="sortHelp">다른 아이템을 마우스로 위,아래로 드래그 하여 이동하거나 열의 헤더를 클릭하여 아이템을 정렬할 수 있습니다</key>
-    <key alias="sortPleaseWait"><![CDATA[잠시 기다리십시오. 아이템을 정렬 하는데 잠시 시간이 소요될 수 있습니다<br/><br/>정렬하는 동안 이 창을 닫지 마십시오]]></key>
+    <key alias="sortPleaseWait"><![CDATA[잠시 기다리십시오. 아이템을 정렬 하는데 잠시 시간이 소요될 수 있습니다]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">3rd party add-in 때문에 발행이 취소되었습니다.</key>

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

@@ -949,7 +949,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Sorteren gereed.</key>
     <key alias="sortHelp">Sleep de pagina's omhoog of omlaag om de volgorde te veranderen. Of klik op de kolom-header om alle pagina's daarop te sorteren.</key>
-    <key alias="sortPleaseWait"><![CDATA[Een ogenblik geduld. Paginas worden gesorteerd, dit kan even duren.<br/> <br/> Sluit dit venster niet tijdens het sorteren]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Een ogenblik geduld. Paginas worden gesorteerd, dit kan even duren.]]></key>
   </area>
   <area alias="speechBubbles">
 	<key alias="validationFailedHeader">Validatie</key>

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

@@ -1012,7 +1012,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="sortCreationDate">Data utworzenia</key>
     <key alias="sortDone">Sortowanie zakończone.</key>
     <key alias="sortHelp">Przesuń poszczególne elementy w górę oraz w dół aż będą w odpowiedniej kolejności lub kliknij na nagłówku kolumny, aby posortować całą kolekcję elementów</key>
-    <key alias="sortPleaseWait"><![CDATA[Proszę czekać. Trwa sortowanie elementów.<br/><br/>Nie zamykaj tego okna podczas sortowania]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Proszę czekać. Trwa sortowanie elementów.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="validationFailedHeader">Walidacja</key>

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

@@ -646,7 +646,7 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar <em>pub
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Classificação concluída.</key>
     <key alias="sortHelp">Arraste os diferentes itens para cima ou para baixo para definir como os mesmos serão arranjados. Ou clique no título da coluna para classificar a coleção completa de itens</key>
-    <key alias="sortPleaseWait"><![CDATA[Favor esperar. Itens estão sendo classificados, isto pode demorar um tempo. <br /><br /> Não feche esta janela durante a classificação]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Favor esperar. Itens estão sendo classificados, isto pode demorar um tempo.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">Publicação foi cancelada por add-in de terceiros</key>

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

@@ -1310,7 +1310,7 @@
     <key alias="sortCreationDate">Дата создания</key>
     <key alias="sortDone">Сортировка завершена</key>
     <key alias="sortHelp">Перетаскивайте элементы на нужное место вверх или вниз для определения необходимого Вам порядка сортировки. Также можно использовать заголовки столбцов, чтобы отсортировать все элементы сразу.</key>
-    <key alias="sortPleaseWait"><![CDATA[Пожалуйста, подождите... Страницы сортируются, это может занять некоторое время.<br/> <br/> Не закрывайте это окно до окончания процесса сортировки.]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Пожалуйста, подождите... Страницы сортируются, это может занять некоторое время.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">Процесс публикации был отменен установленным пакетом дополнений.</key>

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

@@ -694,7 +694,7 @@
     <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Sortering klar</key>
     <key alias="sortHelp">Välj i vilken ordning du vill ha sidorna genom att dra dem upp eller ner i listan. Du kan också klicka på kolumnrubrikerna för att sortera grupper av sidor</key>
-    <key alias="sortPleaseWait"><![CDATA[Vänta medan sidorna sorteras. Det kan ta en stund.<br/><br/>Stäng inte fönstret under tiden sidorna sorteras.]]></key>
+    <key alias="sortPleaseWait"><![CDATA[Vänta medan sidorna sorteras. Det kan ta en stund.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="contentPublishedFailedByEvent">Publiceringen avbröts av ett tredjepartstillägg</key>

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

@@ -844,7 +844,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="sort">
     <key alias="sortDone">Sorting complete.</key>
     <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
-    <key alias="sortPleaseWait"><![CDATA[ Please wait. Items are being sorted, this can take a while.<br/> <br/> Do not close this window during sorting]]></key>
+    <key alias="sortPleaseWait"><![CDATA[ Please wait. Items are being sorted, this can take a while.]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="operationFailedHeader">Hata</key>

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

@@ -1065,7 +1065,7 @@
     <key alias="sortCreationDate">创建日期</key>
     <key alias="sortDone">排序完成。</key>
     <key alias="sortHelp">上下拖拽项目或单击列头进行排序</key>
-    <key alias="sortPleaseWait"><![CDATA[正在排序请稍候…<br/><br/>请不要关闭窗口]]></key>
+    <key alias="sortPleaseWait"><![CDATA[正在排序请稍候…]]></key>
   </area>
   <area alias="speechBubbles">
     <key alias="validationFailedHeader">验证</key>

src/Umbraco.Web.UI/umbraco_client/Dialogs/SortDialog.js

@@ -105,6 +105,7 @@
             
             //wire up the submit button
             self._opts.submitButton.click(function() {
+                this.disabled = true;
                 self._saveSort();
             });
             

src/Umbraco.Web/Editors/ContentController.cs

@@ -792,11 +792,8 @@ namespace Umbraco.Web.Editors
             {
                 var contentService = Services.ContentService;
 
-                // content service GetByIds does order the content items based on the order of Ids passed in
-                var content = contentService.GetByIds(sorted.IdSortOrder);
-
                 // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(content) == false)
+                if (contentService.Sort(sorted.IdSortOrder) == false)
                 {
                     LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
                     return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");

src/Umbraco.Web/Editors/MemberController.cs

@@ -393,7 +393,7 @@ namespace Umbraco.Web.Editors
             UpdateName(contentItem);
 
             //map the custom properties - this will already be set for new entities in our member binder
-            contentItem.PersistedContent.Email = contentItem.Email;
+            contentItem.PersistedContent.Email = contentItem.Email;
             contentItem.PersistedContent.Username = contentItem.Username;
 
             //use the base method to map the rest of the properties

src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs

@@ -139,7 +139,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
 
         public override IEnumerable<HealthCheckStatus> GetStatus()
         {
-            var successMessage = string.Format(CheckSuccessMessage, FileName, XPath, Values, CurrentValue);
+            var successMessage = string.Format(CheckSuccessMessage, FileName, XPath, Values);
 
             var configValue = _configurationService.GetConfigurationValue();
             if (configValue.Success == false)
@@ -155,6 +155,9 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
 
             CurrentValue = configValue.Result;
 
+            // need to update the successMessage with the CurrentValue
+            successMessage = string.Format(CheckSuccessMessage, FileName, XPath, Values, CurrentValue);
+
             var valueFound = Values.Any(value => string.Equals(CurrentValue, value.Value, StringComparison.InvariantCultureIgnoreCase));
             if (ValueComparisonType == ValueComparisonType.ShouldEqual && valueFound || ValueComparisonType == ValueComparisonType.ShouldNotEqual && valueFound == false)
             {

src/Umbraco.Web/HealthCheck/HealthCheckController.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Configuration;
 using System.Linq;
 using System.Web.Http;
@@ -29,9 +30,26 @@ namespace Umbraco.Web.HealthCheck
                 .ToList();
         }
 
+        [Obsolete("Use the contructor specifying all parameters instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public HealthCheckController(IHealthCheckResolver healthCheckResolver)
         {
             _healthCheckResolver = healthCheckResolver;
+            var healthCheckConfig = UmbracoConfig.For.HealthCheck();
+            _disabledCheckIds = healthCheckConfig.DisabledChecks
+                .Select(x => x.Id)
+                .ToList();
+        }
+
+        public HealthCheckController(IHealthCheckResolver healthCheckResolver, IHealthChecks healthCheckConfig)
+        {
+            if (healthCheckResolver == null) throw new ArgumentNullException("healthCheckResolver");
+            if (healthCheckConfig == null) throw new ArgumentNullException("healthCheckConfig");
+
+            _healthCheckResolver = healthCheckResolver;
+            _disabledCheckIds = healthCheckConfig.DisabledChecks
+                .Select(x => x.Id)
+                .ToList();
         }
 
         /// <summary>

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using AutoMapper;
 using Umbraco.Core;
@@ -28,7 +29,7 @@ namespace Umbraco.Web.Models.Mapping
 
         public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IEnumerable<string> ignoreProperties)
             : this(localizedTextService)
-        {         
+        {
             if (ignoreProperties == null) throw new ArgumentNullException("ignoreProperties");
             IgnoreProperties = ignoreProperties;
         }
@@ -84,7 +85,7 @@ namespace Umbraco.Web.Models.Mapping
                     Alias = string.Format("{0}createdate", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
                     Label = localizedTextService.Localize("content/createDate"),
                     Description = localizedTextService.Localize("content/createDateDesc"),
-                    Value = display.CreateDate.ToIsoString(),
+                    Value = display.CreateDate.ToString(CultureInfo.CurrentCulture),
                     View = labelEditor
                 },
                 new ContentPropertyDisplay
@@ -92,7 +93,7 @@ namespace Umbraco.Web.Models.Mapping
                     Alias = string.Format("{0}updatedate", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
                     Label = localizedTextService.Localize("content/updateDate"),
                     Description = localizedTextService.Localize("content/updateDateDesc"),
-                    Value = display.UpdateDate.ToIsoString(),
+                    Value = display.UpdateDate.ToString(CultureInfo.CurrentCulture),
                     View = labelEditor
                 }
             };
@@ -132,8 +133,8 @@ namespace Umbraco.Web.Models.Mapping
             switch (entityType)
             {
                 case "content":
-                    dtdId = Constants.System.DefaultContentListViewDataTypeId;
-                    
+                    dtdId = Constants.System.DefaultContentListViewDataTypeId;
+
                     break;
                 case "media":
                     dtdId = Constants.System.DefaultMediaListViewDataTypeId;
@@ -146,7 +147,7 @@ namespace Umbraco.Web.Models.Mapping
             }
 
             //first try to get the custom one if there is one
-            var dt = dataTypeService.GetDataTypeDefinitionByName(customDtdName) 
+            var dt = dataTypeService.GetDataTypeDefinitionByName(customDtdName)
                 ?? dataTypeService.GetDataTypeDefinitionById(dtdId);
 
             if (dt == null)
@@ -170,15 +171,15 @@ namespace Umbraco.Web.Models.Mapping
 
             var listViewConfig = editor.PreValueEditor.ConvertDbToEditor(editor.DefaultPreValues, preVals);
             //add the entity type to the config
-            listViewConfig["entityType"] = entityType;
-
+            listViewConfig["entityType"] = entityType;
+
             //Override Tab Label if tabName is provided
             if (listViewConfig.ContainsKey("tabName"))
             {
                 var configTabName = listViewConfig["tabName"];
                 if (configTabName != null && string.IsNullOrWhiteSpace(configTabName.ToString()) == false)
                     listViewTab.Label = configTabName.ToString();
-            }
+            }
 
             var listViewProperties = new List<ContentPropertyDisplay>();
             listViewProperties.Add(new ContentPropertyDisplay
@@ -195,9 +196,9 @@ namespace Umbraco.Web.Models.Mapping
             SetChildItemsTabPosition(display, listViewConfig, listViewTab);
         }
 
-        private static void SetChildItemsTabPosition<TPersisted>(TabbedContentItem<ContentPropertyDisplay, TPersisted> display, 
+        private static void SetChildItemsTabPosition<TPersisted>(TabbedContentItem<ContentPropertyDisplay, TPersisted> display,
                 IDictionary<string, object> listViewConfig,
-                Tab<ContentPropertyDisplay> listViewTab) 
+                Tab<ContentPropertyDisplay> listViewTab)
             where TPersisted : IContentBase
         {
             // Find position of tab from config
@@ -237,9 +238,9 @@ namespace Umbraco.Web.Models.Mapping
             var groupsGroupsByName = content.PropertyGroups.OrderBy(x => x.SortOrder).GroupBy(x => x.Name);
             foreach (var groupsByName in groupsGroupsByName)
             {
-                var properties = new List<Property>();
-                
-                // merge properties for groups with the same name
+                var properties = new List<Property>();
+
+                // merge properties for groups with the same name
                 foreach (var group in groupsByName)
                 {
                     var groupProperties = content.GetPropertiesForGroup(group)
@@ -281,8 +282,8 @@ namespace Umbraco.Web.Models.Mapping
 
             tabs.Add(new Tab<ContentPropertyDisplay>
             {
-                Id = 0,
-                    Label = _localizedTextService.Localize("general/properties"),
+                Id = 0,
+                Label = _localizedTextService.Localize("general/properties"),
                 Alias = "Generic properties",
                 Properties = genericproperties
             });

src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs

@@ -24,9 +24,8 @@ namespace Umbraco.Web.PropertyEditors
 
         internal class TextboxPreValueEditor : PreValueEditor
         {
-            [PreValueField("maxChars", "Maximum allowed characters", "number", Description = "If empty - no character limit")]
+            [PreValueField("maxChars", "Maximum allowed characters", "textstringlimited", Description = "If empty - 500 character limit")]
             public bool MaxChars { get; set; }
-        }
-
+        }
     }
 }

src/Umbraco.Web/Scheduling/KeepAlive.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Sync;
 
 namespace Umbraco.Web.Scheduling
 {
@@ -20,9 +21,21 @@ namespace Umbraco.Web.Scheduling
             _appContext = appContext;
         }
 
+        private ILogger Logger { get { return _appContext.ProfilingLogger.Logger; } }
+
         public override async Task<bool> PerformRunAsync(CancellationToken token)
         {
             if (_appContext == null) return true; // repeat...
+            
+            switch (_appContext.GetCurrentServerRole())
+            {
+                case ServerRole.Slave:
+                    Logger.Debug<ScheduledPublishing>("Does not run on slave servers.");
+                    return true; // DO repeat, server role can change
+                case ServerRole.Unknown:
+                    Logger.Debug<ScheduledPublishing>("Does not run on servers with unknown role.");
+                    return true; // DO repeat, server role can change
+            }
 
             // ensure we do not run if not main domain, but do NOT lock it
             if (_appContext.MainDom.IsMainDom == false)
@@ -31,7 +44,7 @@ namespace Umbraco.Web.Scheduling
                 return false; // do NOT repeat, going down
             }
 
-            using (DisposableTimer.DebugDuration<KeepAlive>(() => "Keep alive executing", () => "Keep alive complete"))
+            using (_appContext.ProfilingLogger.DebugDuration<KeepAlive>("Keep alive executing", "Keep alive complete"))
             {
                 string umbracoAppUrl = null;
 

src/Umbraco.Web/Scheduling/ScheduledPublishing.cs

@@ -31,7 +31,7 @@ namespace Umbraco.Web.Scheduling
 
         private ILogger Logger { get { return _appContext.ProfilingLogger.Logger; } }
 
-        public override async Task<bool> PerformRunAsync(CancellationToken token)
+        public override bool PerformRun()
         {
             if (_appContext == null) return true; // repeat...
 
@@ -94,7 +94,7 @@ namespace Umbraco.Web.Scheduling
 
         public override bool IsAsync
         {
-            get { return true; }
+            get { return false; }
         }
     }
 }

src/Umbraco.Web/Umbraco.Web.csproj

@@ -112,8 +112,8 @@
     <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.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>

src/Umbraco.Web/UriUtility.cs

@@ -70,7 +70,7 @@ namespace Umbraco.Web
 				if (!GlobalSettings.UseDirectoryUrls)
 					path += ".aspx";
                 else if (UmbracoConfig.For.UmbracoSettings().RequestHandler.AddTrailingSlash)
-					path += "/";
+				    path = path.EnsureEndsWith("/");
 			}
 
 			path = ToAbsolute(path);

src/Umbraco.Web/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Markdown" version="1.14.7" targetFramework="net45" />

src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs

@@ -175,13 +175,16 @@ namespace umbraco.presentation.webservices
         {
             var contentService = ApplicationContext.Services.ContentService;
             try
-            {
-                var intIds = ids.Select(int.Parse).ToArray();
-                var allContent = contentService.GetByIds(intIds).ToDictionary(x => x.Id, x => x);
-                var sortedContent = intIds.Select(x => allContent[x]);
-
+            {
                 // Save content with new sort order and update db+cache accordingly
-                var sorted = contentService.Sort(sortedContent);
+                var intIds = new List<int>();
+                foreach (var stringId in ids)
+                {
+                    int intId;
+                    if (int.TryParse(stringId, out intId))
+                        intIds.Add(intId);
+                }
+                var sorted = contentService.Sort(intIds.ToArray());
 
                 // refresh sort order on cached xml
                 // but no... this is not distributed - solely relying on content service & events should be enough

src/UmbracoExamine/UmbracoContentIndexer.cs

@@ -218,7 +218,8 @@ namespace UmbracoExamine
                 new StaticField("writerName", FieldIndexTypes.ANALYZED, false, string.Empty),
                 new StaticField("creatorName", FieldIndexTypes.ANALYZED, false, string.Empty),
                 new StaticField("nodeTypeAlias", FieldIndexTypes.ANALYZED, false, string.Empty),
-                new StaticField("path", FieldIndexTypes.NOT_ANALYZED, false, string.Empty)
+                new StaticField( "path", FieldIndexTypes.NOT_ANALYZED, false, string.Empty),
+                new StaticField( "isPublished", FieldIndexTypes.NOT_ANALYZED, false, string.Empty)
             };
 
         #endregion

src/UmbracoExamine/UmbracoExamine.csproj

@@ -82,8 +82,8 @@
     <AssemblyOriginatorKeyFile>..\Solution Items\TheFARM-Public.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/UmbracoExamine/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>

src/umbraco.MacroEngines/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />

src/umbraco.MacroEngines/umbraco.MacroEngines.csproj

@@ -45,8 +45,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>