Bump version to 7.12.4

(cherry picked from commit 1429053681)

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -28,7 +28,7 @@
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />

docs/ISSUE_TEMPLATE/1_Bug.md

@@ -0,0 +1,66 @@
+---
+name: 🐛 Bug Report
+about: File a bug report, if you've discovered a problem in Umbraco.
+---
+
+A brief description of the issue goes here.
+
+<!--
+
+If you haven't yet done so, please read the "contributing guidelines"
+thoroughly. Then, proceed by filling out the rest of the details in the issue
+template below. The more details you can give us, the easier it will be for us
+to determine the cause of a problem.
+
+See: https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/docs/CONTRIBUTING.md
+
+-->
+
+
+
+Reproduction
+------------
+
+If you're filing a bug, please describe how to reproduce it. Include as much
+relevant information as possible, such as:
+
+### Bug summary
+
+<!--
+    * Write a short summary of the bug
+    * Try to pinpoint it as much as possible
+    * Try to state the _actual problem_, and not just what you _think_ the
+      solution might be.
+-->
+
+### Specifics
+
+<!--
+    * Mention the URL where this bug occurs, if applicable
+    * What version of Umbraco are you using (down to the very last digit!)
+    * What browser and version you are using
+    * Please mention if you've checked it in other browsers as well
+    * Please include *full error messages* and *screenshots* if possible
+-->
+
+### Steps to reproduce
+
+<!--
+    * Clearly mention the steps to reproduce the bug
+-->
+
+### Expected result
+
+<!--
+    * What did you _expect_ that would happen on your Umbraco site?
+    * Describe the intended/desired outcome after you did the steps mentioned.
+-->
+
+### Actual result
+
+<!--
+    * What is the actual result of the above steps?
+    * Describe the behaviour of the bug
+    * Please, please include **error messages** and screenshots. They might mean
+      nothing to you, but they are _very_ helpful to us.
+-->

docs/ISSUE_TEMPLATE/2_Feature_request.md

@@ -0,0 +1,31 @@
+---
+name:  📮 Feature Request
+about: Open a feature request, if you want to propose a new feature.
+---
+
+A brief description of your feature request goes here.
+
+
+<!--
+If you want to discuss the feature you're imagining, please make sure to keep
+those discussions on the forum at https://our.umbraco.com/ (choose the
+category "Contributing to Umbraco", Umbraco HQ follows all new topics there).
+
+Once you've come to a conclusion in the discussion, feel free to propose the
+new feature here. 
+-->
+
+How can you help?
+-------------------------------
+
+<!--
+The resources (read: available time and effort) of Umbraco's core team are
+limited.
+
+If we can not work on your suggestion, please don't take it personally. Most
+likely, it's either:
+
+ - We think your idea is valid, but we can't find the time to work on it.
+ - Your idea might be better suited as a package, if it's not suitable for
+   the majority of users.
+-->

docs/ISSUE_TEMPLATE/3_Support_question.md

@@ -0,0 +1,9 @@
+---
+name: ⁉️ Support Question
+about: Having trouble with Umbraco? -> https://our.umbraco.com
+---
+
+This issue tracker is NOT meant for support questions. If you have a question,
+please join us on the forum at https://our.umbraco.com.
+
+Thanks!

docs/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -0,0 +1,9 @@
+---
+name: 📖 Documentation Issue
+about: See https://github.com/umbraco/UmbracoDocs/issues for documentation issues
+---
+
+The Umbraco documentation has its own dedicated repository. Please open your
+documentation-related issue at https://github.com/umbraco/UmbracoDocs/issues
+
+Thanks!

docs/ISSUE_TEMPLATE/5_Security_issue.md

@@ -0,0 +1,31 @@
+---
+name: 🔐 Security Issue
+about: Discovered a Security Issue in Umbraco?
+---
+
+⚠️ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
+
+If you have found a security issue in Umbraco, please send the details to
+security@umbraco.com and don't disclose it publicly until we can provide a fix for
+it. If you wish, we'll credit you for finding verified issues, when we release
+the patched version.
+
+❗ Please read more about how to report security issues on https://umbraco.com/security
+
+A note on "Self XSS"
+--------------------
+
+Umbraco is a CMS, that allows users to edit content on a website. As such,
+all _authenticated users_ can:
+
+ - Edit content, and (depending on the field types) insert HTML and CSS in that
+   content, with a variety of allowed attributes.
+ - Depending on the user level: Edit template files, and insert C#, HTML, CSS and
+   javascript in so on.
+ - Upload files to the site, which will become publicly available.
+
+We see these functionalities as _features_, and not as security issues. Please
+report the mentioned items only if they can be performed by non-authorized
+users, or other exploitable vulnerabilities.
+
+Thanks!

docs/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,11 @@
 ### Prerequisites
 
-- [ ] I have written a descriptive pull-request title
-- [ ] I have linked this PR to an issue on the tracker at http://issues.umbraco.org
+- [ ] I have [created an issue](https://github.com/umbraco/Umbraco-CMS/issues) for the proposed changes in this PR, the link is:
+- [ ] I have added steps to test this contribution in the description below
 
 ### Description
 <!-- A description of the changes proposed in the pull-request -->
-
+<!-- Make sure to link to the related issue number so we can easily find it in the issue tracker -->
 
 
 <!-- Thanks for contributing to Umbraco CMS! -->

src/SolutionInfo.cs

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

src/Umbraco.Core/ApplicationContext.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using Semver;
+using System;
+using System.Collections.Concurrent;
 using System.Configuration;
 using System.Threading;
-using Semver;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
@@ -13,7 +13,7 @@ using Umbraco.Core.Sync;
 
 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
     /// the Umbraco Application context
     /// </summary>
     /// <remarks>
@@ -270,7 +270,7 @@ namespace Umbraco.Core
                 return _umbracoApplicationUrl;
             }
         }
-
+
         /// <summary>
         /// Resets the url.
         /// </summary>
@@ -280,10 +280,10 @@ namespace Umbraco.Core
         }
 
 	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
-
-        internal List<string> _umbracoApplicationDomains = new List<string>();
-
+	    internal string _umbracoApplicationUrl;
+
+        internal ConcurrentDictionary<string, string> _umbracoApplicationDomains = new ConcurrentDictionary<string, string>();
+
         internal string _umbracoApplicationDeploymentId;
 
         private Lazy<bool> _configured;
@@ -399,7 +399,7 @@ namespace Umbraco.Core
             }
 
             return version;
-        }
+        }
 
         private void AssertIsNotReady()
         {

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.12.1");
+        private static readonly Version Version = new Version("7.12.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Models/Membership/User.cs

@@ -259,7 +259,7 @@ namespace Umbraco.Core.Models.Membership
         {
             get
             {
-                if (LastLoginDate == default(DateTime) && IsApproved == false && InvitedDate != null)
+                if (LastLoginDate == default && IsApproved == false && InvitedDate != null)
                     return UserState.Invited;
 
                 if (IsLockedOut)
@@ -267,7 +267,11 @@ namespace Umbraco.Core.Models.Membership
                 if (IsApproved == false)
                     return UserState.Disabled;
 
-                return UserState.Active;
+                // User is not disabled or locked and has never logged in before
+                if (LastLoginDate == default && IsApproved && IsLockedOut == false)
+                    return UserState.Inactive;
+
+                    return UserState.Active;
             }
         }
 

src/Umbraco.Core/Models/Membership/UserState.cs

@@ -9,6 +9,7 @@
         Active = 0,
         Disabled = 1,
         LockedOut = 2,
-        Invited = 3
+        Invited = 3,
+        Inactive = 4
     }
-}
+}

src/Umbraco.Core/Persistence/Factories/MediaFactory.cs

@@ -140,6 +140,9 @@ namespace Umbraco.Core.Persistence.Factories
         /// <returns></returns>
         internal static bool TryMatch(string text, out string mediaPath)
         {
+            //TODO: In v8 we should allow exposing this via the property editor in a much nicer way so that the property editor
+            // can tell us directly what any URL is for a given property if it contains an asset
+
             mediaPath = null;
 
             if (string.IsNullOrWhiteSpace(text))
@@ -155,4 +158,4 @@ namespace Umbraco.Core.Persistence.Factories
             return true;
         }
     }
-}
+}

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

@@ -331,14 +331,23 @@ namespace Umbraco.Core.Persistence.Repositories
             return list;
         }
 
+        /// <summary>
+        /// Gets entities by query.
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectTypeId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Note that this will also fetch all property data for media items, which can cause performance problems
+        /// when used without paging, in sites with large amounts of data in cmsPropertyData.
+        /// </remarks>
         public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectTypeId)
         {
-
-            bool isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
-            bool isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
+            var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid;
+            var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid;
 
             var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, null, objectTypeId);
-            
+
             var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
             var entitySql = translator.Translate();
 
@@ -364,22 +373,49 @@ namespace Umbraco.Core.Persistence.Repositories
             }
             else
             {
-                //use dynamic so that we can get ALL properties from the SQL so we can chuck that data into our AdditionalData
-                var finalSql = entitySql.Append(GetGroupBy(isContent, false));
-
-                //query = read forward data reader, do not load everything into mem
-                var dtos = _work.Database.Query<dynamic>(finalSql);
-                var collection = new EntityDefinitionCollection();
-                foreach (var dto in dtos)
-                {
-                    collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, false));
-                }
-                return collection.Select(x => x.BuildFromDynamic()).ToList();
+                return GetByQueryInternal(entitySql, isContent, isMedia);
             }
         }
 
+        /// <summary>
+        /// Gets entities by query without fetching property data.
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectTypeId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is supposed to be internal and can be used when getting all entities without paging, without causing
+        /// performance issues.
+        /// </remarks>
+        internal IEnumerable<IUmbracoEntity> GetMediaByQueryWithoutPropertyData(IQuery<IUmbracoEntity> query)
+        {
+            var sqlClause = GetBaseWhere(GetBase, false, true, null, UmbracoObjectTypes.Media.GetGuid());
+
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var entitySql = translator.Translate();
+
+            return GetByQueryInternal(entitySql, false, true);
+        }
+
+        internal IEnumerable<IUmbracoEntity> GetByQueryInternal(Sql entitySql, bool isContent, bool isMedia)
+        {
+            var factory = new UmbracoEntityFactory();
+
+            //use dynamic so that we can get ALL properties from the SQL so we can chuck that data into our AdditionalData
+            var finalSql = entitySql.Append(GetGroupBy(isContent, isMedia));
+
+            //query = read forward data reader, do not load everything into mem
+            var dtos = _work.Database.Query<dynamic>(finalSql);
+            var collection = new EntityDefinitionCollection();
+            foreach (var dto in dtos)
+            {
+                collection.AddOrUpdate(new EntityDefinition(factory, dto, isContent, isMedia));
+            }
+            return collection.Select(x => x.BuildFromDynamic()).ToList();
+        }
+
         #endregion
-        
+
 
         #region Sql Statements
 
@@ -851,4 +887,4 @@ namespace Umbraco.Core.Persistence.Repositories
         }
         #endregion
     }
-}
+}

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

@@ -186,6 +186,8 @@ UNION
 SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
 UNION
 SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
+UNION
+SELECT '6CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL 
 ORDER BY colName";
 
             var result = Database.Fetch<dynamic>(sql);
@@ -196,7 +198,8 @@ ORDER BY colName";
                 {UserState.Active, (int)result[1].num},
                 {UserState.Disabled, (int)result[2].num},
                 {UserState.LockedOut, (int)result[3].num},
-                {UserState.Invited, (int)result[4].num}
+                {UserState.Invited, (int)result[4].num},
+                {UserState.Inactive, (int) result[5].num}
             };
         }
 
@@ -765,6 +768,12 @@ ORDER BY colName";
                         sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL)");
                         appended = true;
                     }
+                    if (userState.Contains(UserState.Inactive))
+                    {
+                        if (appended) sb.Append(" OR ");
+                        sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL)");
+                        appended = true;
+                    }
                     if (userState.Contains(UserState.Disabled))
                     {
                         if (appended) sb.Append(" OR ");
@@ -915,4 +924,4 @@ ORDER BY colName";
         }
         
     }
-}
+}

src/Umbraco.Core/Services/EntityService.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Umbraco.Core.Cache;
 using Umbraco.Core.CodeAnnotations;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
@@ -13,6 +11,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
@@ -287,16 +286,35 @@ namespace Umbraco.Core.Services
         public virtual IEnumerable<IUmbracoEntity> GetChildren(int parentId, UmbracoObjectTypes umbracoObjectType)
         {
             var objectTypeId = umbracoObjectType.GetGuid();
-            using (var uow = UowProvider.GetUnitOfWork(readOnly:true))
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateEntityRepository(uow);
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
+                return repository.GetByQuery(query, objectTypeId);
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of children by the parent's Id and UmbracoObjectType without adding property data
+        /// </summary>
+        /// <param name="parentId">Id of the parent to retrieve children for</param>
+        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        internal IEnumerable<IUmbracoEntity> GetMediaChildrenWithoutPropertyData(int parentId)
+        {
+            var objectTypeId = UmbracoObjectTypes.Media.GetGuid();
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateEntityRepository(uow);
                 var query = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == parentId);
 
-                var contents = repository.GetByQuery(query, objectTypeId);
-                return contents;
+                // Not pretty having to cast the repository, but it is the only way to get to use an internal method that we
+                // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
+                // See this issue for details on why we need this:
+                // https://github.com/umbraco/Umbraco-CMS/issues/3457
+                return ((EntityRepository)repository).GetMediaByQueryWithoutPropertyData(query);
             }
         }
-
+        
         /// <summary>
         /// Returns a paged collection of children
         /// </summary>
@@ -781,4 +799,4 @@ namespace Umbraco.Core.Services
             return node.NodeId;
         }
     }
-}
+}

src/Umbraco.Core/Services/UserService.cs

@@ -699,7 +699,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateUserRepository(uow);
-                return repository.GetPagedResultsByQuery(null, pageIndex, pageSize, out totalRecords, member => member.Username);
+                return repository.GetPagedResultsByQuery(null, pageIndex, pageSize, out totalRecords, member => member.Name);
             }
         }
 

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -51,10 +51,9 @@ namespace Umbraco.Core.Sync
             if (request != null)
             {
                 var applicationUrl = GetApplicationUrlFromRequest(request);
-                newApplicationUrl = !appContext._umbracoApplicationDomains.Contains(applicationUrl);
+                newApplicationUrl = appContext._umbracoApplicationDomains.TryAdd(applicationUrl, applicationUrl);
                 if (newApplicationUrl)
                 {
-                    appContext._umbracoApplicationDomains.Add(applicationUrl);
                     LogHelper.Info(typeof(ApplicationUrlHelper), string.Format("New ApplicationUrl detected: {0}", applicationUrl));
                 }
             }

src/Umbraco.Core/Umbraco.Core.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,8 +45,8 @@
     <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -567,8 +567,8 @@
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddInstructionCountColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddCmsMediaTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddUserLoginTable.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\RenameTrueFalseField.cs" />	
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\SetDefaultTagsStorageType.cs" />      
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\RenameTrueFalseField.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\SetDefaultTagsStorageType.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddUmbracoAuditTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddUmbracoConsentTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddIsSensitiveMemberTypeColumn.cs" />
@@ -638,7 +638,7 @@
     <Compile Include="Media\Exif\TIFFStrip.cs" />
     <Compile Include="Media\Exif\Utility.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeOne\UpdateUserLanguagesToIsoCode.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\IncreaseLanguageIsoCodeColumnLength.cs" />      
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\IncreaseLanguageIsoCodeColumnLength.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\UpdateUmbracoConsent.cs" />
     <Compile Include="Persistence\PocoDataDataReader.cs" />
     <Compile Include="Persistence\Querying\CachedExpression.cs" />
@@ -1688,4 +1688,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Umbraco.Core/packages.config

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

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

@@ -10,10 +10,12 @@
             scope.publishStatus = {};
 
             scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
-            
-            function onInit() {
 
-                scope.allowOpen = true;
+            function onInit() {
+                // If logged in user has access to the settings section
+                // show the open anchors - if the user doesn't have 
+                // access, documentType is null, see ContentModelMapper
+                scope.allowOpen = scope.node.documentType !== null;
 
                 scope.datePickerConfig = {
                     pickDate: true,
@@ -41,11 +43,13 @@
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
 
-                // Declare a fallback URL for the <umb-node-preview/> directive
-                scope.previewOpenUrl = '#/settings/documenttypes/edit/' + scope.documentType.id;
-
+                // Make sure to set the node status
                 setNodePublishStatus(scope.node);
-                
+
+                // Declare a fallback URL for the <umb-node-preview/> directive
+                if (scope.documentType !== null) {
+                    scope.previewOpenUrl = '#/settings/documenttypes/edit/' + scope.documentType.id;
+                }
             }
 
             scope.auditTrailPageChange = function (pageNumber) {
@@ -53,7 +57,7 @@
                 loadAuditTrail();
             };
 
-            scope.openDocumentType = function (documentType) {               
+            scope.openDocumentType = function (documentType) {
                 var url = "/settings/documenttypes/edit/" + documentType.id;
                 $location.url(url);
             };
@@ -99,7 +103,7 @@
                                 item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL');
                             });
                         });
-                    
+
                         scope.auditTrail = data.items;
                         scope.auditTrailOptions.pageNumber = data.pageNumber;
                         scope.auditTrailOptions.pageSize = data.pageSize;
@@ -107,7 +111,7 @@
                         scope.auditTrailOptions.totalPages = data.totalPages;
 
                         setAuditTrailLogTypeColor(scope.auditTrail);
-                        
+
                         scope.loadingAuditTrail = false;
                     });
 
@@ -115,6 +119,7 @@
 
             function setAuditTrailLogTypeColor(auditTrail) {
                 angular.forEach(auditTrail, function (item) {
+
                     switch (item.logType) {
                         case "Publish":
                             item.logTypeColor = "success";
@@ -130,7 +135,6 @@
             }
 
             function setNodePublishStatus(node) {
-                
                 // deleted node
                 if(node.trashed === true) {
                     scope.publishStatus.label = localizationService.localize("general_deleted");
@@ -224,7 +228,7 @@
                 eventsService.emit("editors.content.changeUnpublishDate", args);
 
             }
-            
+
             function ucfirst(string) {
                 return string.charAt(0).toUpperCase() + string.slice(1);
             }
@@ -233,13 +237,13 @@
                 // get current backoffice user and format dates
                 userService.getCurrentUser().then(function (currentUser) {
                     scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
-                    
+
                     scope.node.releaseDateYear = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'YYYY')) : null;
                     scope.node.releaseDateMonth = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'MMMM')) : null;
                     scope.node.releaseDateDayNumber = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'DD')) : null;
                     scope.node.releaseDateDay = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'dddd')) : null;
                     scope.node.releaseDateTime = scope.node.releaseDate ? ucfirst(dateHelper.getLocalDate(scope.node.releaseDate, currentUser.locale, 'HH:mm')) : null;
-                    
+
                     scope.node.removeDateYear = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'YYYY')) : null;
                     scope.node.removeDateMonth = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'MMMM')) : null;
                     scope.node.removeDateDayNumber = scope.node.removeDate ? ucfirst(dateHelper.getLocalDate(scope.node.removeDate, currentUser.locale, 'DD')) : null;
@@ -264,8 +268,8 @@
             scope.$watch('node.updateDate', function(newValue, oldValue){
 
                 if(!newValue) { return; }
-                if(newValue === oldValue) { return; }             
-                
+                if(newValue === oldValue) { return; }
+
                 if(isInfoTab) {
                     loadAuditTrail();
                     formatDatesToLocal();

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

@@ -8,11 +8,16 @@
             var evts = [];
 
             function onInit() {
-                scope.allowOpenMediaType = true;
+                // If logged in user has access to the settings section
+                // show the open anchors - if the user doesn't have 
+                // access, contentType is null, see MediaModelMapper
+                scope.allowOpen = scope.node.contentType !== null;
+                
                 // get document type details
                 scope.mediaType = scope.node.contentType;
-                // get node url
-                scope.nodeUrl = scope.node.mediaLink;
+
+                // set the media link initially
+                setMediaLink();
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
             }
@@ -25,16 +30,25 @@
                 });
             }
 
+            function setMediaLink(){
+                scope.nodeUrl = scope.node.mediaLink;
+            }
+
             scope.openMediaType = function (mediaType) {
                 // remove first "#" from url if it is prefixed else the path won't work
                 var url = "/settings/mediaTypes/edit/" + mediaType.id;
                 $location.path(url);
             };
-            
+
             // watch for content updates - reload content when node is saved, published etc.
             scope.$watch('node.updateDate', function(newValue, oldValue){
                 if(!newValue) { return; }
                 if(newValue === oldValue) { return; }
+
+                // Update the media link
+                setMediaLink();
+
+                // Update the create and update dates
                 formatDatesToLocal();
             });
 
@@ -46,7 +60,6 @@
             });
 
             onInit();
-
         }
 
         var directive = {
@@ -64,4 +77,4 @@
 
     angular.module('umbraco.directives').directive('umbMediaNodeInfo', MediaNodeInfoDirective);
 
-})();
+})();

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

@@ -260,7 +260,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
                 // if save button is alread the default don't change it just update the label
                 if (buttons.defaultButton && buttons.defaultButton.letter === "A") {
                     buttons.defaultButton.labelKey = "buttons_saveAndSchedule";
-                    return;
+                    return buttons;
                 }
                 
                 if(buttons.defaultButton && buttons.subButtons && buttons.subButtons.length > 0) {

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

@@ -8,7 +8,8 @@
             { "value": 0, "name": "Active", "key": "Active", "color": "success" },
             { "value": 1, "name": "Disabled", "key": "Disabled", "color": "danger" },
             { "value": 2, "name": "Locked out", "key": "LockedOut", "color": "danger" },
-            { "value": 3, "name": "Invited", "key": "Invited", "color": "warning" }
+            { "value": 3, "name": "Invited", "key": "Invited", "color": "warning" },
+            { "value": 4, "name": "Inactive", "key": "Inactive", "color": "warning" }
         ];
 
         angular.forEach(userStates, function (userState) {

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

@@ -27,12 +27,18 @@
 }
 
 .umb-iconpicker-item a:hover,
-.umb-iconpicker-item a:focus,
-.umb-iconpicker-item.-selected {
+.umb-iconpicker-item a:focus {
     background: @gray-10;
     outline: none;
 }
 
+.umb-iconpicker-item.-selected {
+    background: @gray-10;
+    border: solid 1px @turquoise-d1;
+    border-radius: @baseBorderRadius;
+    box-sizing: border-box;
+}
+
 .umb-iconpicker-item a:active {
     background: @gray-10;
 }
@@ -54,11 +60,6 @@
         border-radius: 3px;
     }
 
-    // Hide Circle when not active
-    i.small{
-    display: none;
-    }
-
     // Circle behind the checkmark
     i.small.active{
         font-size: 14px;

src/Umbraco.Web.UI.Client/src/less/pages/login.less

@@ -5,7 +5,7 @@
     width: 100%;
     height: 100%;
     position: absolute;
-    z-index: 10000;
+    z-index: 65537;
     top: 0;
     left: 0;
     margin: 0 !important;

src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js

@@ -40,11 +40,18 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 				// if a link exists, get the properties to build the anchor name list
 				contentResource.getById(id).then(function (resp) {
 					$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-					$scope.model.target.url = resp.urls[0];
+					$scope.target.url = resp.urls[0];
 				});
 			} else if ($scope.target.url.length) {
-				// a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
-				$scope.target.url = $scope.model.url.substring(0, $scope.model.url.search(/(#|\?)/));
+                // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
+                // only do the substring if there's a # or a ?
+                var indexOfAnchor = $scope.target.url.search(/(#|\?)/);
+                if (indexOfAnchor > -1) {
+                    // populate the anchor
+                    $scope.target.anchor = $scope.target.url.substring(indexOfAnchor);
+                    // then rewrite the model and populate the link
+                    $scope.target.url = $scope.target.url.substring(0, indexOfAnchor);
+                }
 			}
 		}
 
@@ -81,7 +88,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 				} else {
 					contentResource.getById(args.node.id).then(function (resp) {
 						$scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties));
-						$scope.model.target.url = resp.urls[0];
+						$scope.target.url = resp.urls[0];
 					});
 				}
 

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

@@ -181,7 +181,7 @@
                     <form method="POST" name="requestPasswordResetForm" ng-submit="requestPasswordResetSubmit(email)">
                         <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
                             <label><localize key="general_email">Email</localize></label>
-                            <input type="email" ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
+                            <input type="email" val-email ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
                         </div>
 
                         <div class="control-group" ng-show="requestPasswordResetForm.$invalid">

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js

@@ -3,8 +3,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	function ($scope, eventsService, dialogService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
 		var dialogOptions = $scope.model;
 
-		var anchorPattern = /<a id=\\"(.*?)\\">/gi;
-
 		var searchText = "Search...";
 		localizationService.localize("general_search").then(function (value) {
 			searchText = value + "...";
@@ -52,8 +50,15 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 					$scope.model.target.url = resp.urls[0];
 				});
 			} else if ($scope.model.target.url.length) {
-				// a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
-				$scope.model.target.url = $scope.model.target.url.substring(0, $scope.model.target.url.search(/(#|\?)/));				
+			    // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
+                // only do the substring if there's a # or a ?
+                var indexOfAnchor = $scope.model.target.url.search(/(#|\?)/);
+                if (indexOfAnchor > -1) {
+                    // populate the anchor
+                    $scope.model.target.anchor = $scope.model.target.url.substring(indexOfAnchor);
+                    // then rewrite the model and populate the link
+                    $scope.model.target.url = $scope.model.target.url.substring(0, indexOfAnchor);
+                }
 			}
 		} else if (dialogOptions.anchors) {
 			$scope.anchorValues = dialogOptions.anchors;

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

@@ -28,6 +28,7 @@
                             label-key="general_upload"
                             action="upload()"
                             disabled="lockedFolder"
+                            button-style="info"
                             ng-if="acceptedMediatypes.length > 0">
                 </umb-button>
             </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js

@@ -24,7 +24,16 @@ angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerControll
         }
 
         function selectMemberGroups(id) {
-           $scope.model.selectedMemberGroups.push(id);
+            var index = $scope.model.selectedMemberGroups.indexOf(id);
+
+            if(index === -1){
+                // If the id does not exists in the array then add it
+                $scope.model.selectedMemberGroups.push(id);
+            }
+            else{
+                // Otherwise we will remove it from the array instead
+                $scope.model.selectedMemberGroups.splice(index, 1);
+            }
         }
 
         /** Method used for selecting a node */

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

@@ -178,15 +178,16 @@
                 <umb-control-group data-element="node-info-document-type" label="@content_documentType">
                     <umb-node-preview
                         style="max-width: 100%; margin-bottom: 0;"
-                        icon="documentType.icon"
-                        name="documentType.name"
+                        icon="node.icon"
+                        name="node.contentTypeName"
                         allow-open="allowOpen"
                         on-open="openDocumentType(documentType)"
-						            open-url="previewOpenUrl">
+						open-url="previewOpenUrl">
                     </umb-node-preview>
                 </umb-control-group>
 
                 <umb-control-group ng-if="disableTemplates == false" data-element="node-info-template" label="@template_template">
+
                     <div class="flex items-center">
                         <select class="input-block-level"
                                 ng-model="node.template"
@@ -194,7 +195,7 @@
                                 ng-change="updateTemplate(node.template)">
                             <option value=""><localize key="general_choose">Choose</localize>...</option>
                         </select>
-                        <a href="" class="umb-node-preview__action" style="margin-left:15px;" ng-click="openTemplate()" ng-if="node.template !== null">
+                        <a href="" class="umb-node-preview__action" style="margin-left:15px;" ng-click="openTemplate()" ng-if="node.template !== null && allowOpen">
                             <localize key="general_open">Open</localize>
                         </a>
                     </div>

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

@@ -9,7 +9,7 @@
                     size="small">
                     <localize key="content_noMediaLink"></localize>
                 </umb-empty-state>
-                
+
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
                         <a href="{{nodeUrl}}" target="_blank">
@@ -28,7 +28,7 @@
         <umb-box data-element="node-info-general">
             <umb-box-header title-key="general_general"></umb-box-header>
             <umb-box-content class="block-form">
-                
+
                 <umb-control-group data-element="node-info-create-date" label="@content_createDate">
                     {{node.createDateFormatted}} by {{ node.owner.name }}
                 </umb-control-group>
@@ -36,13 +36,13 @@
                 <umb-control-group data-element="node-info-update-date" label="@content_updateDate">
                     {{node.updateDateFormatted}}
                 </umb-control-group>
-            
+
                 <umb-control-group data-element="node-info-media-type" label="@content_mediatype">
                     <umb-node-preview
                         style="max-width: 100%; margin-bottom: 0px;"
-                        icon="mediaType.icon"
-                        name="mediaType.name"
-                        allow-open="allowOpenMediaType"
+                        icon="node.icon"
+                        name="node.contentTypeName"
+                        allow-open="allowOpen"
                         on-open="openMediaType(mediaType)">
                     </umb-node-preview>
                 </umb-control-group>
@@ -52,8 +52,8 @@
                     <small>{{ node.key }}</small>
                 </umb-control-group>
 
-            </umb-box-content>    
+            </umb-box-content>
         </umb-box>
     </div>
-    
-</div>
+
+</div>

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

@@ -13,7 +13,7 @@
         </div>
     </div>
     <div class="umb-node-preview__actions">
-        <a class="umb-node-preview__action" title="Open" href="{{editUrl}}" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
+        <a class="umb-node-preview__action" title="Edit" href="{{editUrl}}" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
         <a class="umb-node-preview__action" title="Open" href="{{openUrl}}" ng-if="allowOpen"  ng-click="onOpen()"><localize key="general_open">Open</localize></a>
         <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="{{removeUrl}}" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
     </div>

src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html

@@ -37,6 +37,12 @@
         </div>
     </div>
 
+    <div ng-show="hideDropzone" ngf-drag-over-class="hide" class="text-center">
+        <small>
+            <localize key="media_dragFilesHereToUpload">You can drag files here to upload</localize>
+        </small>
+    </div>
+
     <!-- List of uploading/uploaded files  -->
     <ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0 || filesHolder.length > 0">
 

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

@@ -8,6 +8,7 @@
         </div>
         <div class="sub-view-column-right">
             <umb-toggle
+                data-element="permissions-allow-as-root"
                 checked="model.allowAsRoot"
                 on-click="vm.toggle()"
                 hotkey="alt+shift+r"

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

@@ -49,6 +49,7 @@
     <RestorePackages>true</RestorePackages>
     <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
     <UseGlobalApplicationHostFile />
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>
@@ -116,8 +117,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
@@ -1034,9 +1035,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7121</DevelopmentServerPort>
+          <DevelopmentServerPort>7124</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7121</IISUrl>
+          <IISUrl>http://localhost:7124</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json

@@ -140,7 +140,7 @@
             {
                 "element": "[data-element='editor-description']",
                 "title": "Enter a description",
-                "content": "<p>A description helps to pick the right document type when creating content.</p><p>Write a description to our Home page. It could be: <br/><pre>The home page of the website</pre></p>"
+                "content": "<p>A description helps to pick the right document type when creating content.</p><p>Write a description for our Home page. It could be: <br/><pre>The home page of the website</pre></p>"
             },
             {
                 "element": "[data-element='group-add']",
@@ -169,7 +169,7 @@
             {
                 "element": "[data-element~='overlay-property-settings'] [data-element='property-description']",
                 "title": "Enter a description",
-                "content": "<p>A description will help to fill in the right content.</p><p>Enter a description for the property editor. It could be:<br/> <pre>Write a nice introduction text so the visitors feel welcome</pre></p>"
+                "content": "<p>A description will help your editor fill in the right content.</p><p>Enter a description for the property editor. It could be:<br/> <pre>Write a nice introduction text so the visitors feel welcome</pre></p>"
             },
             {
                 "element": "[data-element~='overlay-property-settings'] [data-element='editor-add']",
@@ -207,6 +207,18 @@
                 "content": "Click <b>Submit</b> to add the property to the document type.",
                 "event": "click"
             },
+            {
+                "element": "[data-element~='sub-view-permissions']",
+                "title": "Check the document type permissions",
+                "content": "Click <b>Permissions</b> to view the permissions page.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='permissions-allow-as-root']",
+                "title": "Allow this document type to work at the root of your site",
+                "content": "Toggle the switch <b>Allow as root</b> to allow new content pages based on this document type to be created at the root of your site",
+                "event": "click"
+            },
             {
                 "element": "[data-element='button-save']",
                 "title": "Save the document type",
@@ -247,7 +259,7 @@
                 "title": "Open context menu",
                 "content": "<p>Open the context menu by hovering over the root of the content section.</p><p>Now click the <b>three small dots</b> to the right.</p>",
                 "event": "click",
-                "eventElement": "[data-element='tree-root'] [data-element='tree-item-options']"
+                "eventElement": "#tree [data-element='tree-root'] [data-element='tree-item-options']"
             },
             {
                 "element": "[data-element='action-create-homePage']",
@@ -346,7 +358,7 @@
         "steps": [
             {
                 "title": "View your Umbraco site",
-                "content": "<p>Our three main components to a page are done: <b>Document type, Template, and Content</b>. It is now time to see the result.</p><p>In this tour you will learn how to see your published website.</p>",
+                "content": "<p>Our three main components for a page are done: <b>Document type, Template, and Content</b>. It is now time to see the result.</p><p>In this tour you will learn how to see your published website.</p>",
                 "type": "intro"
             },
             {

src/Umbraco.Web.UI/packages.config

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

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

@@ -259,6 +259,7 @@
     <key alias="dropFilesHere">Slip filerne her...</key>
     <key alias="urls">Link til medie</key>
     <key alias="orClickHereToUpload">eller klik her for at vælge filer</key>
+    <key alias="dragFilesHereToUpload">Du kan trække filer herind for at uploade</key>
     <key alias="onlyAllowedFiles">Tilladte filtyper er kun</key>
     <key alias="disallowedFileType">Kan ikke uploade denne fil, den har ikke en godkendt filtype</key>
     <key alias="maxFileSize">Maks filstørrelse er</key>

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

@@ -267,6 +267,7 @@
         <key alias="dropFilesHere">Drop your files here...</key>
         <key alias="urls">Link to media</key>
         <key alias="orClickHereToUpload">or click here to choose files</key>
+        <key alias="dragFilesHereToUpload">You can drag files here to upload</key>
         <key alias="onlyAllowedFiles">Only allowed file types are</key>
         <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
         <key alias="maxFileSize">Max file size is</key>
@@ -479,6 +480,7 @@
         <key alias="currentListViewDesc" version="7.2">The active list view data type</key>
         <key alias="createListView" version="7.2">Create custom list view</key>
         <key alias="removeListView" version="7.2">Remove custom list view</key>
+        <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
     </area>
     <area alias="renamecontainer">
         <key alias="renamed">Renamed</key>

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

@@ -268,6 +268,7 @@
         <key alias="dropFilesHere">Drop your files here...</key>
         <key alias="urls">Link to media</key>
         <key alias="orClickHereToUpload">or click here to choose files</key>
+        <key alias="dragFilesHereToUpload">You can drag files here to upload</key>
         <key alias="onlyAllowedFiles">Only allowed file types are</key>
         <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
         <key alias="maxFileSize">Max file size is</key>
@@ -479,6 +480,7 @@
         <key alias="currentListViewDesc" version="7.2">The active list view data type</key>
         <key alias="createListView" version="7.2">Create custom list view</key>
         <key alias="removeListView" version="7.2">Remove custom list view</key>
+        <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
     </area>
     <area alias="renamecontainer">
         <key alias="renamed">Renamed</key>

src/Umbraco.Web/BatchedDatabaseServerMessenger.cs

@@ -46,7 +46,7 @@ namespace Umbraco.Web
                 //start the background task runner for processing instructions
                 const int delayMilliseconds = 60000;
                 var instructionProcessingRunner = new BackgroundTaskRunner<IBackgroundTask>("InstructionProcessing", ApplicationContext.ProfilingLogger.Logger);
-                var instructionProcessingTask = new InstructionProcessing(instructionProcessingRunner, this, _appContext.ScopeProvider, delayMilliseconds, Options.ThrottleSeconds * 1000);
+                var instructionProcessingTask = new InstructionProcessing(instructionProcessingRunner, this, _appContext.ScopeProvider, ApplicationContext.ProfilingLogger.Logger, delayMilliseconds, Options.ThrottleSeconds * 1000);
                 instructionProcessingRunner.TryAdd(instructionProcessingTask);
                 e.Add(instructionProcessingTask);
             }
@@ -78,18 +78,36 @@ namespace Umbraco.Web
         {
             private readonly DatabaseServerMessenger _messenger;
             private readonly IScopeProvider _scopeProvider;
+            private readonly ILogger _logger;
 
             public InstructionProcessing(IBackgroundTaskRunner<RecurringTaskBase> runner,
                 DatabaseServerMessenger messenger,
                 IScopeProvider scopeProvider,
+                ILogger logger,
                 int delayMilliseconds, int periodMilliseconds)
                 : base(runner, delayMilliseconds, periodMilliseconds)
             {
                 _messenger = messenger;
                 _scopeProvider = scopeProvider;
+                _logger = logger;
             }
 
             public override bool PerformRun()
+            {
+                try
+                {
+                    TryPerformRun();
+                }
+                catch (Exception e)
+                {
+                    _logger.Error<InstructionProcessing>("Failed (will repeat).", e);
+                }
+
+                //return true to repeat
+                return true;
+            }
+
+            private void TryPerformRun()
             {
                 // beware!
                 // DatabaseServerMessenger uses _appContext.DatabaseContext.Database without creating
@@ -102,8 +120,6 @@ namespace Umbraco.Web
                     _messenger.Sync();
                     scope.Complete();
                 }
-                //return true to repeat
-                return true;
             }
 
             public override bool IsAsync
@@ -167,7 +183,7 @@ namespace Umbraco.Web
             // can get the http context from it
             var httpContext = (UmbracoContext.Current == null ? null : UmbracoContext.Current.HttpContext)
                 // if this is null, it could be that an async thread is calling this method that we weren't aware of and the UmbracoContext
-                // wasn't ensured at the beginning of the thread. We can try to see if the HttpContext.Current is available which might be 
+                // wasn't ensured at the beginning of the thread. We can try to see if the HttpContext.Current is available which might be
                 // the case if the asp.net synchronization context has kicked in
                 ?? (HttpContext.Current == null ? null : new HttpContextWrapper(HttpContext.Current));
 

src/Umbraco.Web/Editors/ContentTypeControllerBase.cs

@@ -227,9 +227,9 @@ namespace Umbraco.Web.Editors
             // works since that is based on aliases.
             var allAliases = Services.ContentTypeService.GetAllContentTypeAliases();
             var exists = allAliases.InvariantContains(contentTypeSave.Alias);
-            if ((exists) && (ctId == 0 || ct.Alias != contentTypeSave.Alias))
+            if (exists && (ctId == 0 || ct.Alias.InvariantEquals(contentTypeSave.Alias) == false))
             {
-                ModelState.AddModelError("Alias", "A content type, media type or member type with this alias already exists");
+                ModelState.AddModelError("Alias", Services.TextService.Localize("editcontenttype/aliasAlreadyExists"));
             }
 
             //now let the external validators execute

src/Umbraco.Web/Editors/UsersController.cs

@@ -219,6 +219,7 @@ namespace Umbraco.Web.Editors
             // so to do that here, we'll need to check if this current user is an admin and if not we should exclude all user who are
             // also admins
 
+            var hideDisabledUsers = UmbracoConfig.For.UmbracoSettings().Security.HideDisabledUsersInBackoffice;
             var excludeUserGroups = new string[0];
             var isAdmin = Security.CurrentUser.IsAdmin();
             if (isAdmin == false)
@@ -241,10 +242,18 @@ namespace Umbraco.Web.Editors
                 filterQuery.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
             }
 
+            if (hideDisabledUsers)
+            {
+                if (userStates == null || userStates.Any() == false)
+                {
+                    userStates = new[] { UserState.Active, UserState.Invited, UserState.LockedOut, UserState.Inactive };
+                }
+            }
+
             long pageIndex = pageNumber - 1;
             long total;
             var result = Services.UserService.GetAll(pageIndex, pageSize, out total, orderBy, orderDirection, userStates, userGroups, excludeUserGroups, filterQuery);
-            
+
             var paged = new PagedUserResult(total, pageNumber, pageSize)
             {
                 Items = Mapper.Map<IEnumerable<UserBasic>>(result),

src/Umbraco.Web/Models/ImageCropDataSet.cs

@@ -66,7 +66,7 @@ namespace Umbraco.Web.Models
 
         public bool HasFocalPoint()
         {
-            return FocalPoint != null && FocalPoint.Left != 0.5m && FocalPoint.Top != 0.5m;
+            return FocalPoint != null && (FocalPoint.Left != 0.5m || FocalPoint.Top != 0.5m);
         }
 
         public bool HasCrop(string alias)
@@ -153,4 +153,4 @@ namespace Umbraco.Web.Models
             return !Equals(left, right);
         }
     }
-}
+}

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

@@ -116,7 +116,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                 {
                     var strLinkId = linkData.Link;
                     var udiAttempt = strLinkId.TryConvertTo<Udi>();
-                    if (udiAttempt.Success)
+                    if (udiAttempt.Success && udiAttempt.Result != null)
                     {
                         var content = helper.TypedContent(udiAttempt.Result);
                         if (content != null)
@@ -168,4 +168,4 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return link;
         }
     }
-}
+}

src/Umbraco.Web/Security/MembershipHelper.cs

@@ -647,10 +647,15 @@ namespace Umbraco.Web.Security
                 var provider = _membershipProvider;
 
                 string username;
+                
                 if (provider.IsUmbracoMembershipProvider())
                 {
                     var member = GetCurrentPersistedMember();
+                    // If a member could not be resolved from the provider, we are clearly not authorized and can break right here
+                    if (member == null)
+                        return false;
                     username = member.Username;
+                    
                     // If types defined, check member is of one of those types
                     var allowTypesList = allowTypes as IList<string> ?? allowTypes.ToList();
                     if (allowTypesList.Any(allowType => allowType != string.Empty))
@@ -669,6 +674,9 @@ namespace Umbraco.Web.Security
                 else
                 {
                     var member = provider.GetCurrentUser();
+                    // If a member could not be resolved from the provider, we are clearly not authorized and can break right here
+                    if (member == null)
+                        return false;
                     username = member.UserName;
                 }
 

src/Umbraco.Web/Trees/ContentTreeController.cs

@@ -207,6 +207,9 @@ namespace Umbraco.Web.Trees
             return HasPathAccess(entity, queryStrings);
         }
 
+        internal override IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId)
+            => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
+
         /// <summary>
         /// Returns a collection of all menu items that can be on a content node
         /// </summary>

src/Umbraco.Web/Trees/ContentTreeControllerBase.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -11,12 +10,12 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.WebApi.Filters;
 using umbraco;
 using umbraco.BusinessLogic.Actions;
 using System.Globalization;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Trees
 {
@@ -203,9 +202,16 @@ namespace Umbraco.Web.Trees
                 entityId = entity.Id;
             }
 
-            return Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
+            return GetChildrenFromEntityService(entityId);
         }
 
+        /// <summary>
+        /// Abstract method to fetch the entities from the entity service
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <returns></returns>
+        internal abstract IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId);
+
         /// <summary>
         /// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access
         /// </summary>

src/Umbraco.Web/Trees/MediaTreeController.cs

@@ -173,5 +173,12 @@ namespace Umbraco.Web.Trees
         {
             return _treeSearcher.ExamineSearch(Umbraco, query, UmbracoEntityTypes.Media, pageSize, pageIndex, out totalFound, searchFrom);
         }
+
+        internal override IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId)
+            // Not pretty having to cast the service, but it is the only way to get to use an internal method that we
+            // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
+            // See this issue for details on why we need this:
+            // https://github.com/umbraco/Umbraco-CMS/issues/3457
+            => ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();
     }
-}
+}

src/Umbraco.Web/Umbraco.Web.csproj

@@ -107,8 +107,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
       <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>

src/Umbraco.Web/WebApi/CustomDateTimeConvertor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Umbraco.Core;
@@ -20,7 +21,7 @@ namespace Umbraco.Web.WebApi
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            writer.WriteValue(((DateTime)value).ToString(_dateTimeFormat));
+            writer.WriteValue(((DateTime)value).ToString(_dateTimeFormat, CultureInfo.InvariantCulture));
         }
     }
-}
+}

src/Umbraco.Web/packages.config

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

src/umbraco.cms/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.6" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Tidy.Net" version="1.0.0" targetFramework="net45" />

src/umbraco.cms/umbraco.cms.csproj

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

src/umbraco.controls/packages.config

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

src/umbraco.controls/umbraco.controls.csproj

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

src/umbraco.editorControls/packages.config

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

src/umbraco.editorControls/umbraco.editorControls.csproj

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