Bumps version to 7.12.3 and updates CDF

Whoops, fixes previous commit for #2896
(cherry picked from commit b2b9b53af1)
2018-09-20 08:42:13 +02:00 · 2018-09-02 10:06:24 +02:00 · 2018-09-02 09:58:34 +02:00 · 2018-08-31 20:07:10 +02:00 · 2018-08-31 20:07:05 +02:00 · 2018-08-31 19:53:52 +02:00
90 changed files with 672 additions and 448 deletions
@@ -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)" />
@@ -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.
+-->
@@ -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.
+-->
@@ -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!
@@ -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!
@@ -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!
@@ -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! -->
@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.12.0")]
-[assembly: AssemblyInformationalVersion("7.12.0")]
+[assembly: AssemblyFileVersion("7.12.3")]
+[assembly: AssemblyInformationalVersion("7.12.3")]
@@ -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()
        {
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.12.0");
+        private static readonly Version Version = new Version("7.12.3");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -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;
            }
        }

@@ -9,6 +9,7 @@
        Active = 0,
        Disabled = 1,
        LockedOut = 2,
-        Invited = 3
+        Invited = 3,
+        Inactive = 4
    }
-}
+}
@@ -6,17 +6,17 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
    {
        public ConstraintDefinition(ConstraintType type)
        {
-            constraintType = type;
+            _constraintType = type;
        }

-        private ConstraintType constraintType;
-        public bool IsPrimaryKeyConstraint { get { return ConstraintType.PrimaryKey == constraintType; } }
-        public bool IsUniqueConstraint { get { return ConstraintType.Unique == constraintType; } }
-        public bool IsNonUniqueConstraint { get { return ConstraintType.NonUnique == constraintType; } }
+        private readonly ConstraintType _constraintType;
+        public bool IsPrimaryKeyConstraint => ConstraintType.PrimaryKey == _constraintType;
+        public bool IsUniqueConstraint => ConstraintType.Unique == _constraintType;
+        public bool IsNonUniqueConstraint => ConstraintType.NonUnique == _constraintType;

        public string SchemaName { get; set; }
        public string ConstraintName { get; set; }
        public string TableName { get; set; }
        public ICollection<string> Columns = new HashSet<string>();
    }
-}
+}
@@ -1,3 +1,5 @@
+using System;
+
 namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
    /// <summary>
@@ -5,9 +7,17 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
    /// </summary>
    internal class DbIndexDefinition
    {
-        public virtual string IndexName { get; set; }
-        public virtual string TableName { get; set; }
-        public virtual string ColumnName { get; set; }
-        public virtual bool IsUnique { get; set; }
+        public DbIndexDefinition(Tuple<string, string, string, bool> data)
+        {
+            TableName = data.Item1;
+            IndexName = data.Item2;
+            ColumnName = data.Item3;
+            IsUnique = data.Item4;
+        }
+
+        public string IndexName { get; }
+        public string TableName { get; }
+        public string ColumnName { get; }
+        public bool IsUnique { get; }
    }
-}
+}
@@ -159,13 +159,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial

            //get the db index defs
            result.DbIndexDefinitions = _sqlSyntaxProvider.GetDefinedIndexes(_database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            foreach (var item in OrderedTables.OrderBy(x => x.Key))
            {
@@ -184,6 +178,14 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            return result;
        }

+        /// <summary>
+        /// This validates the Primary/Foreign keys in the database
+        /// </summary>
+        /// <param name="result"></param>
+        /// <remarks>
+        /// This does not validate any database constraints that are not PKs or FKs because Umbraco does not create a database with non PK/FK contraints.
+        /// Any unique "constraints" in the database are done with unique indexes.
+        /// </remarks>
        private void ValidateDbConstraints(DatabaseSchemaResult result)
        {
            //MySql doesn't conform to the "normal" naming of constraints, so there is currently no point in doing these checks.
@@ -196,8 +198,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            var constraintsInDatabase = _sqlSyntaxProvider.GetConstraintsPerColumn(_database).DistinctBy(x => x.Item3).ToList();
            var foreignKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("FK_")).Select(x => x.Item3).ToList();
            var primaryKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("PK_")).Select(x => x.Item3).ToList();
-            var indexesInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("IX_")).Select(x => x.Item3).ToList();
-            var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
+
            var unknownConstraintsInDatabase =
                constraintsInDatabase.Where(
                    x =>
@@ -212,7 +213,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            // In theory you could have: FK_ or fk_ ...or really any standard that your development department (or developer) chooses to use.
            foreach (var unknown in unknownConstraintsInDatabase)
            {
-                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown) || indexesInSchema.InvariantContains(unknown))
+                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown))
                {
                    result.ValidConstraints.Add(unknown);
                }
@@ -254,23 +255,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                result.Errors.Add(new Tuple<string, string>("Constraint", primaryKey));
            }

-            //Constaints:
-
-            //NOTE: SD: The colIndex checks above should really take care of this but I need to keep this here because it was here before
-            // and some schema validation checks might rely on this data remaining here!
-            //Add valid and invalid index differences to the result object
-            var validIndexDifferences = indexesInDatabase.Intersect(indexesInSchema, StringComparer.InvariantCultureIgnoreCase);
-            foreach (var index in validIndexDifferences)
-            {
-                result.ValidConstraints.Add(index);
-            }
-            var invalidIndexDifferences =
-                indexesInDatabase.Except(indexesInSchema, StringComparer.InvariantCultureIgnoreCase)
-                                .Union(indexesInSchema.Except(indexesInDatabase, StringComparer.InvariantCultureIgnoreCase));
-            foreach (var index in invalidIndexDifferences)
-            {
-                result.Errors.Add(new Tuple<string, string>("Constraint", index));
-            }
        }

        private void ValidateDbColumns(DatabaseSchemaResult result)
@@ -28,13 +28,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = _skipIndexCheck ? new DbIndexDefinition[]{} : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            //make sure it doesn't already exist
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacroProperty_Alias")) == false)
@@ -54,4 +48,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            Delete.Index("IX_cmsMacroProperty_Alias").OnTable("cmsMacroProperty");
        }
    }
-}
+}
@@ -30,13 +30,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = _forTesting ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            //make sure it doesn't already exist
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacro_Alias")) == false)
@@ -75,4 +69,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            Delete.Index("IX_cmsMacro_Alias").OnTable("cmsMacro");
        }
    }
-}
+}
@@ -18,13 +18,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();
            
            //add a foreign key to the parent id column too!

@@ -54,4 +48,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified");
        }
    }
-}
+}
@@ -26,13 +26,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            // it is absolutely required to exist in order to have it as a foreign key reference, so we'll need to check it's existence
            // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContent")) == false)
            {
                Create.Index("IX_cmsContent").OnTable("cmsContent").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -95,4 +89,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            //don't do anything, these keys should have always existed!
        }
    }
-}
+}
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZe
        {
            Execute.Code(database =>
            {                
-                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database);
+                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database);

                //make sure it doesn't already exist
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsPropertyTypeAlias")) == false)
@@ -62,13 +62,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
                }

                var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition
-                    {
-                        TableName = x.Item1,
-                        IndexName = x.Item2,
-                        ColumnName = x.Item3,
-                        IsUnique = x.Item4
-                    }).ToArray();
+                    .Select(x => new DbIndexDefinition(x)).ToArray();

                //make sure it doesn't already exist
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsDictionary_id")) == false)
@@ -104,4 +98,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
            throw new NotImplementedException();
        }
    }
-}
+}
@@ -120,13 +120,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe


            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            //in some databases there's an index (IX_Master) on the master column which needs to be dropped first
            var foundIndex = dbIndexes.FirstOrDefault(x => x.TableName.InvariantEquals("cmsTemplate") && x.ColumnName.InvariantEquals("master"));
@@ -167,4 +161,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
            return path;
        }
    }
-}
+}
@@ -15,13 +15,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
        public override void Up()
        {
            var indexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            // drop the index if it exists
            if (indexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoNodeUniqueID")))
@@ -38,4 +32,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
        public override void Down()
        { }
    }
-}
+}
@@ -1,7 +1,4 @@
-using System;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
@@ -16,20 +13,22 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ

        public override void Up()
        {
-            var exists = Context.Database.FirstOrDefault<RelationTypeDto>("WHERE alias=@alias", new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
-            if (exists == null)
+            var relationTypeCount = Context.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoRelationType WHERE alias=@alias",
+                new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
+
+            if (relationTypeCount > 0)
+                return;
+
+            var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
+            Insert.IntoTable("umbracoRelationType").Row(new
            {
-                var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
-                Insert.IntoTable("umbracoRelationType").Row(new
-                {
-                    typeUniqueId = uniqueId,
-                    alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
-                    name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
-                    childObjectType = Constants.ObjectTypes.MediaType,
-                    parentObjectType = Constants.ObjectTypes.MediaType,
-                    dual = false
-                });
-            }
+                typeUniqueId = uniqueId,
+                alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
+                name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
+                childObjectType = Constants.ObjectTypes.MediaType,
+                parentObjectType = Constants.ObjectTypes.MediaType,
+                dual = false
+            });
        }

        public override void Down()
@@ -15,21 +15,35 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ

        public override void Up()
        {
-            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
-
-            //Ensure the index exists before dropping it
-            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+            Execute.Code(database =>
            {
-                Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
-            }
-            
+                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
+                // Some people seem to have a constraint in their DB instead of an index, we'd need to drop that one
+                // See: https://our.umbraco.com/forum/using-umbraco-and-getting-started/93282-upgrade-from-711-to-712-fails
+                var constraints = SqlSyntax.GetConstraintsPerTable(database).Distinct().ToArray();
+                if (constraints.Any(x => x.Item2.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+                {
+                    localContext.Delete.UniqueConstraint("IX_umbracoLanguage_languageISOCode").FromTable("umbracoLanguage");
+                    return localContext.GetSql();
+                }
+                return null;
+            });
+
+            Execute.Code(database =>
+            {
+                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
+
+                //Now check for indexes of that name and drop that if it exists
+                var dbIndexes = SqlSyntax.GetDefinedIndexes(database)
+                    .Select(x => new DbIndexDefinition(x)).ToArray();
+                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+                {
+                    localContext.Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
+                    return localContext.GetSql();
+                }
+                return null;
+            });
+
            Alter.Table("umbracoLanguage")
                .AlterColumn("languageISOCode")
                .AsString(14)
@@ -38,6 +52,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
            Create.Index("IX_umbracoLanguage_languageISOCode")
                .OnTable("umbracoLanguage")
                .OnColumn("languageISOCode")
+                .Ascending()
+                .WithOptions()
                .Unique();
        }

@@ -48,14 +48,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
                //Some very old schemas don't have an index on the cmsContentType.nodeId column, I'm not actually sure when it was added but 
                // it is absolutely required to exist in order to add other foreign keys and much better for perf, so we'll need to check it's existence
                // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
-                var dbIndexes = SqlSyntaxContext.SqlSyntaxProvider.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition()
-                    {
-                        TableName = x.Item1,
-                        IndexName = x.Item2,
-                        ColumnName = x.Item3,
-                        IsUnique = x.Item4
-                    }).ToArray();
+                var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
+                    .Select(x => new DbIndexDefinition(x)).ToArray();
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContentType")) == false)
                {
                    Create.Index("IX_cmsContentType").OnTable("cmsContentType").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -82,4 +76,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
            throw new DataLossException("Cannot downgrade from a version 7.2 database to a prior version, the database schema has already been modified");
        }
    }
-}
+}
@@ -20,13 +20,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
        {

            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();

            //do not create any indexes if they already exist in the database

@@ -118,4 +112,4 @@ DROP TABLE ""umbracoUserLogins_temp""");

        }
    }
-}
+}
@@ -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";
        }
        
    }
-}
+}
@@ -53,6 +53,8 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        string TruncateTable { get; }
        string CreateConstraint { get; }
        string DeleteConstraint { get; }
+
+        [Obsolete("This is never used, use the Format(ForeignKeyDefinition) instead")]
        string CreateForeignKeyConstraint { get; }
        string DeleteDefaultConstraint { get; }
        string FormatDateTime(DateTime date, bool includeTime = true);
@@ -78,9 +80,32 @@ namespace Umbraco.Core.Persistence.SqlSyntax

        IEnumerable<string> GetTablesInSchema(Database db);
        IEnumerable<ColumnInfo> GetColumnsInSchema(Database db);
+
+        /// <summary>
+        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
+        /// </summary>
+        /// <param name="db"></param>
+        /// <returns>
+        /// A Tuple containing: TableName, ConstraintName
+        /// </returns>
        IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db);
+
+        /// <summary>
+        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
+        /// </summary>
+        /// <param name="db"></param>
+        /// <returns>
+        /// A Tuple containing: TableName, ColumnName, ConstraintName
+        /// </returns>
        IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db);

+        /// <summary>
+        /// Returns all defined Indexes in the database excluding primary keys
+        /// </summary>
+        /// <param name="db"></param>
+        /// <returns>
+        /// A Tuple containing: TableName, IndexName, ColumnName, IsUnique
+        /// </returns>
        IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db);
    }
-}
+}
@@ -78,6 +78,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
        {
            List<Tuple<string, string>> list;
@@ -100,6 +101,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
        {
            List<Tuple<string, string, string>> list;
@@ -126,6 +128,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
        {
            List<Tuple<string, string, string, bool>> list;
@@ -401,4 +404,4 @@ ORDER BY TABLE_NAME, INDEX_NAME",
            return PetaPocoExtensions.EscapeAtSymbols(MySql.Data.MySqlClient.MySqlHelper.EscapeString(val));
        }
    }
-}
+}
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
    /// <summary>
    /// Represents an SqlSyntaxProvider for Sql Ce
    /// </summary>
-    [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlCe)]
+    [SqlSyntaxProvider(Constants.DatabaseProviders.SqlCe)]
    public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlCeSyntaxProvider>
    {
        public SqlCeSyntaxProvider()
@@ -123,40 +123,27 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                   item.IS_NULLABLE, item.DATA_TYPE)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
        {
            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS");
-            var indexItems = db.Fetch<dynamic>("SELECT TABLE_NAME, INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES");
-            return
-                items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME))
-                     .Union(
-                         indexItems.Select(
-                             indexItem => new Tuple<string, string>(indexItem.TABLE_NAME, indexItem.INDEX_NAME)))
-                     .ToList();
+            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
        {
-            var items =
-                db.Fetch<dynamic>(
-                    "SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
-            var indexItems = db.Fetch<dynamic>("SELECT INDEX_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.INDEXES");
-            return
-                items.Select(
-                    item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME))
-                     .Union(
-                         indexItems.Select(
-                             indexItem =>
-                             new Tuple<string, string, string>(indexItem.TABLE_NAME, indexItem.COLUMN_NAME,
-                                                               indexItem.INDEX_NAME))).ToList();
+            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
+            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
        {
            var items =
                db.Fetch<dynamic>(
                    @"SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME, [UNIQUE] FROM INFORMATION_SCHEMA.INDEXES 
-WHERE INDEX_NAME NOT LIKE 'PK_%'
+WHERE PRIMARY_KEY=0
 ORDER BY TABLE_NAME, INDEX_NAME");
            return
                items.Select(
@@ -215,4 +202,4 @@ ORDER BY TABLE_NAME, INDEX_NAME");
        public override string DropIndex { get { return "DROP INDEX {1}.{0}"; } }
        
    }
-}
+}
@@ -88,6 +88,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                   item.IS_NULLABLE, item.DATA_TYPE)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
        {
            var items =
@@ -96,6 +97,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
        {
            var items =
@@ -104,6 +106,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
        }

+        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
        {
            var items =
@@ -113,7 +116,7 @@ CASE WHEN I.is_unique_constraint = 1 OR  I.is_unique = 1 THEN 1 ELSE 0 END AS [U
 from sys.tables as T inner join sys.indexes as I on T.[object_id] = I.[object_id] 
   inner join sys.index_columns as IC on IC.[object_id] = I.[object_id] and IC.[index_id] = I.[index_id] 
   inner join sys.all_columns as AC on IC.[object_id] = AC.[object_id] and IC.[column_id] = AC.[column_id] 
-WHERE I.name NOT LIKE 'PK_%'
+WHERE I.is_primary_key = 0
 order by T.name, I.name");
            return items.Select(item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME,
                item.UNIQUE == 1)).ToList();
@@ -183,4 +186,4 @@ order by T.name, I.name");


    }
-}
+}
@@ -537,10 +537,11 @@ namespace Umbraco.Core.Persistence.SqlSyntax

        public virtual string CreateConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} {2} ({3})"; } }
        public virtual string DeleteConstraint { get { return "ALTER TABLE {0} DROP CONSTRAINT {1}"; } }
+        
        public virtual string CreateForeignKeyConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}){5}{6}"; } }

        public virtual string ConvertIntegerToOrderableString { get { return "REPLACE(STR({0}, 8), SPACE(1), '0')"; } }
        public virtual string ConvertDateToOrderableString { get { return "CONVERT(nvarchar, {0}, 102)"; } }
        public virtual string ConvertDecimalToOrderableString { get { return "REPLACE(STR({0}, 20, 9), SPACE(1), '0')"; } }
    }
-}
+}
@@ -9,13 +9,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        public static IEnumerable<DbIndexDefinition> GetDefinedIndexesDefinitions(this ISqlSyntaxProvider sql, Database db)
        {
            return sql.GetDefinedIndexes(db)
-                .Select(x => new DbIndexDefinition()
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
+                .Select(x => new DbIndexDefinition(x)).ToArray();
        }

        /// <summary>
@@ -57,4 +51,4 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        In,
        NotIn
    }
-}
+}
@@ -42,18 +42,19 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                return null;
            }

+            var isMultipleDataType = IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias);
+
            var selectedValues = (string[]) source;
+            
            if (selectedValues.Any())
            {
-                if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
-                {
+                if (isMultipleDataType)
                    return selectedValues;
-                }

                return selectedValues.First();
            }

-            return source;
+            return isMultipleDataType ? source : string.Empty;
        }

        public Type GetPropertyValueType(PublishedPropertyType propertyType)
@@ -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);
            }
        }

@@ -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));
                }
            }
@@ -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>
@@ -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" />
@@ -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();
@@ -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);

-})();
+})();
@@ -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) {
@@ -761,6 +761,8 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 		 * @param {string} input the string to parse      
 		 */
 		getAnchorNames: function (input) {
+      if (!input) return [];
+        
 			var anchorPattern = /<a id=\\"(.*?)\\">/gi;
 			var matches = input.match(anchorPattern);
 			var anchors = [];
@@ -771,7 +773,9 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 				});
 			}

-			return anchors;
+			return anchors.filter(function(val, i, self) {
+          return self.indexOf(val) === i;
+      });
 		},

 		insertLinkInEditor: function (editor, target, anchorElm) {
@@ -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) {
@@ -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;
@@ -1,16 +1,13 @@
-.nested-content
-{
+.umb-nested-content {
    text-align: center;
 }

-.nested-content--not-supported
-{
+.umb-nested-content--not-supported {
    opacity: 0.3;
    pointer-events: none;
 }

-.nested-content-overlay
-{
+.umb-nested-content-overlay {
    position: absolute;
    top: 0;
    left: 0;
@@ -19,47 +16,39 @@
    z-index: 1000;
 }

-.nested-content__item
-{
+.umb-nested-content__item {
    position: relative;
    text-align: left;
    border-top: solid 1px transparent;
-    background: white;
-
-
+    background: @white;
 }

-.nested-content__item--active:not(.nested-content__item--single)
-{
-    background: #f8f8f8;
+.umb-nested-content__item--active:not(.umb-nested-content__item--single) {
+    background: @gray-10;
 }

-.nested-content__item.ui-sortable-placeholder
-{
-    background: #f8f8f8;
-    border: 1px dashed #d9d9d9;
+.umb-nested-content__item.ui-sortable-placeholder {
+    background: @gray-10;
+    border: 1px dashed @gray-8;
    visibility: visible !important;
    height: 55px;
    margin-top: -1px;
 }

-.nested-content__item--single > .nested-content__content
-{
+.umb-nested-content__item--single > .umb-nested-content__content {
    border: 0;
 }

-.nested-content__item--single > .nested-content__content > .umb-pane
-{
+.umb-nested-content__item--single > .umb-nested-content__content > .umb-pane {
    margin: 0;
 }

-.nested-content__header-bar
-{
+.umb-nested-content__header-bar {
    padding: 15px 20px;
-    border-bottom: 1px dashed #e0e0e0;
+    border-bottom: 1px dashed @gray-8;
    text-align: right;
    cursor: pointer;
-    background-color: white;
+    background-color: @white;

    -moz-user-select: none;
    -khtml-user-select: none;
@@ -67,24 +56,21 @@
    -o-user-select: none;
 }

-.nested-content__heading {
+.umb-nested-content__heading {
    line-height: 20px;
    position: relative;

-    &.-with-icon
-    {
+    &.-with-icon {
        padding-left: 20px;
    }

-    i
-    {
-        color: #999; /* same icon color as the icons in the item type picker */
+    i {
+        color: @gray-2;
        position: absolute;
        left: 0;
    }

-    .nested-content__item-name
-    {
+    .umb-nested-content__item-name {
        max-height: 20px;
        text-align: left;
        white-space: nowrap;
@@ -94,22 +80,16 @@
    }
 }

-.nested-content__icons
-{
+.umb-nested-content__icons {
    opacity: 0;
-
    transition: opacity .15s ease-in-out;
-   -moz-transition: opacity .15s ease-in-out;
-   -webkit-transition: opacity .15s ease-in-out;
-
    position: absolute;
    right: 0px;
    top: 2px;
-    background-color: white;
+    background-color: @white;
    padding: 5px;

-    &:before
-    {
+    &:before {
        content: ' ';
        position: absolute;
        display: block;
@@ -117,126 +97,129 @@
        left: -30px;
        top: 0;
        bottom: 0;
-        background: -webkit-linear-gradient(90deg, rgba(255,255,255,0), white);
-        background: -moz-linear-gradient(90deg, rgba(255,255,255,0), white);
        background: linear-gradient(90deg, rgba(255,255,255,0), white);
    }
 }


-.nested-content__header-bar:hover .nested-content__icons,
-.nested-content__item--active > .nested-content__header-bar .nested-content__icons
-{
+.umb-nested-content__header-bar:hover .umb-nested-content__icons,
+.umb-nested-content__item--active > .umb-nested-content__header-bar .umb-nested-content__icons {
    opacity: 1;
 }

-.nested-content__icon,
-.nested-content__icon.nested-content__icon--disabled:hover
-{
+.umb-nested-content__icon,
+.umb-nested-content__icon.umb-nested-content__icon--disabled:hover {
    display: inline-block;
    padding: 4px 6px;
    margin: 2px;
    cursor: pointer;
-    background: #fff;
-    border: 1px solid #b6b6b6;
+    background: @white;
+    border: 1px solid @gray-7;
    border-radius: 200px;
    text-decoration: none !important;
 }

-.nested-content__icon:hover,
-.nested-content__icon--active
+.umb-nested-content__icon:hover,
+.umb-nested-content__icon--active
 {
-    color: white;
-    background: #2e8aea;
-    border-color: #2e8aea;
+    color: @white;
+    background: @turquoise-d1;
+    border-color: @turquoise-d1;
    text-decoration: none;
 }

-.nested-content__icon .icon,
-.nested-content__icon.nested-content__icon--disabled:hover .icon
-{
+.umb-nested-content__icon .icon,
+.umb-nested-content__icon.umb-nested-content__icon--disabled:hover .icon {
    display: block;
    font-size: 16px !important;
-    color: #5f5f5f;
+    color: @gray-3;
 }

-.nested-content__icon:hover .icon,
-.nested-content__icon--active .icon
-{
-    color: white;
+.umb-nested-content__icon:hover .icon,
+.umb-nested-content__icon--active .icon {
+    color: @white;
 }

-.nested-content__icon--disabled
-{
+.umb-nested-content__icon--disabled {
    opacity: 0.3;
 }


-.nested-content__footer-bar
-{
+.umb-nested-content__footer-bar {
    text-align: center;
    padding-top: 20px;
 }

-.nested-content__content
-{
-    border-bottom: 1px dashed #e0e0e0;
+.umb-nested-content__content {
+    border-bottom: 1px dashed @gray-8;
 }

-.nested-content__content .umb-control-group {
+.umb-nested-content__content .umb-control-group {
    padding-bottom: 0;
 }

-.nested-content__item.ui-sortable-helper .nested-content__content
-{
+.umb-nested-content__item.ui-sortable-helper .umb-nested-content__content {
    display: none !important;
 }

-.nested-content__help-text
-{
+.umb-nested-content__help-text {
    display: inline-block;
    padding: 10px 20px 10px 20px;
    clear: both;
    font-size: 14px;
-    color: #555;
-    background: #f8f8f8;
+    color: @gray-3;
+    background: @gray-10;
    border-radius: 15px;
 }

-.nested-content__doctypepicker table input, .nested-content__doctypepicker table select {
+.umb-nested-content__doctypepicker table input, 
+.umb-nested-content__doctypepicker table select {
    width: 100%;
    padding-right: 0;
 }

-.nested-content__doctypepicker table td.icon-navigation, .nested-content__doctypepicker i.nested-content__help-icon {
+.umb-nested-content__doctypepicker table td.icon-navigation, 
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
    vertical-align: middle;
-    color: #CCC;
+    color: @gray-7;
 }

-.nested-content__doctypepicker table td.icon-navigation:hover, .nested-content__doctypepicker i.nested-content__help-icon:hover {
-    color: #343434;
+.umb-nested-content__doctypepicker table td.icon-navigation:hover, 
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon:hover {
+    color: @gray-2;
 }

-.nested-content__doctypepicker i.nested-content__help-icon {
+.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
    margin-left: 10px;
 }

-.form-horizontal .nested-content--narrow .controls-row
+.form-horizontal .umb-nested-content--narrow .controls-row
 {
    margin-left: 40% !important;
 }

-.form-horizontal .nested-content--narrow .controls-row .umb-textstring,
-.form-horizontal .nested-content--narrow .controls-row .umb-textarea
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-textstring,
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-textarea
 {
    width: 95%;
 }

-.form-horizontal .nested-content--narrow .controls-row .umb-dropdown {
+.form-horizontal .umb-nested-content--narrow .controls-row .umb-dropdown {
    width: 99%;
 }

-.usky-grid.nested-content__node-type-picker .cell-tools-menu {
+.usky-grid.umb-nested-content__node-type-picker .cell-tools-menu {
    position: relative;
    transform: translate(-50%, -25%);
 }
+
+
+// this resolves the layout issue introduced in nested content in 7.12 with the addition of the input for link anchors
+// the attribute selector ensures the change only applies to the linkpicker overlay
+.form-horizontal .umb-nested-content--narrow [ng-controller*="Umbraco.Overlays.LinkPickerController"] .controls-row {
+    margin-left:0!important;
+    
+    .umb-textarea, .umb-textstring {
+        width:100%;
+    }
+}
@@ -5,7 +5,7 @@
    width: 100%;
    height: 100%;
    position: absolute;
-    z-index: 10000;
+    z-index: 65537;
    top: 0;
    left: 0;
    margin: 0 !important;
@@ -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];
 					});
 				}

@@ -7,7 +7,7 @@
 	           placeholder="@general_url"
 	           class="umb-editor umb-textstring"
 	           ng-model="target.url"
-	           ng-disabled="target.id" />
+	           ng-disabled="target.id || target.udi" />
 	</umb-control-group>

 	<umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">
@@ -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">
@@ -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;
@@ -6,7 +6,7 @@
               placeholder="@general_url"
               class="umb-editor umb-textstring"
               ng-model="model.target.url"
-               ng-disabled="model.target.id" />
+               ng-disabled="model.target.id || model.target.udi" />
    </umb-control-group>

    <umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">
@@ -28,6 +28,7 @@
                            label-key="general_upload"
                            action="upload()"
                            disabled="lockedFolder"
+                            button-style="info"
                            ng-if="acceptedMediatypes.length > 0">
                </umb-button>
            </div>
@@ -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 */
@@ -162,7 +162,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",

            tree = args.tree;

-            if (node && node.path) {
+            var nodeHasPath = typeof node !== "undefined" && typeof node.path !== "undefined";
+            var startNodeNotDefined = typeof dialogOptions.startNodeId === "undefined" || dialogOptions.startNodeId === "" || dialogOptions.startNodeId === "-1";
+            if (startNodeNotDefined && nodeHasPath) {
                $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false });
            }

@@ -1,4 +1,4 @@
-<button ng-click="click()" class="umb-toggle dib" ng-class="{'umb-toggle--checked': checked}">
+<button ng-click="click()" type="button" class="umb-toggle dib" ng-class="{'umb-toggle--checked': checked}">

    <span ng-if="!labelPosition && showLabels === 'true' || labelPosition === 'left' && showLabels === 'true'">
        <span ng-if="!checked" class="umb-toggle__label umb-toggle__label--left">{{ displayLabelOff }}</span>
@@ -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>
@@ -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>
@@ -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>
@@ -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">

@@ -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"
@@ -229,10 +229,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
        $scope.sortableOptions = {
            axis: 'y',
            cursor: "move",
-            handle: ".nested-content__icon--move",
+            handle: ".umb-nested-content__icon--move",
            start: function (ev, ui) {
                // Yea, yea, we shouldn't modify the dom, sue me
-                $("#nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
+                $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
                    tinymce.execCommand('mceRemoveEditor', false, $(this).attr('id'));
                    $(this).css("visibility", "hidden");
                });
@@ -244,7 +244,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                $scope.setDirty();
            },
            stop: function (ev, ui) {
-                $("#nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
+                $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () {
                    tinymce.execCommand('mceAddEditor', true, $(this).attr('id'));
                    $(this).css("visibility", "visible");
                });
@@ -1,4 +1,4 @@
-<div id="{{model.alias}}" class="nested-content__doctypepicker" ng-controller="Umbraco.PropertyEditors.NestedContent.DocTypePickerController">
+<div id="{{model.alias}}" class="umb-nested-content__doctypepicker" ng-controller="Umbraco.PropertyEditors.NestedContent.DocTypePickerController">
    <div>
        <table class="table table-striped">
            <thead>
@@ -45,11 +45,11 @@
            <a class="btn" ng-click="add()">
                <localize key="general_add">Add</localize>
            </a>
-            <i class="icon icon-help-alt medium nested-content__help-icon" ng-click="showHelpText = !showHelpText"></i>
+            <i class="icon icon-help-alt medium umb-nested-content__help-icon" ng-click="showHelpText = !showHelpText"></i>
        </div>
    </div>
    <br/>
-    <div class="nested-content__help-text" ng-show="showHelpText">
+    <div class="umb-nested-content__help-text" ng-show="showHelpText">
        <p>
            <b><localize key="editcontenttype_tab">Tab</localize>:</b><br/>
            Select the tab who's properties should be displayed. If left blank, the first tab on the doc type will be used.
@@ -1,11 +1,11 @@
 <div class="umb-pane">
  <div ng-repeat="property in tab.properties" style="position: relative;">

-    <umb-property property="property" ng-class="{'nested-content--not-supported': property.notSupported}">
+    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported}">
      <umb-editor model="property"></umb-editor>
    </umb-property>

-    <div ng-if="property.notSupported" class="nested-content-overlay"></div>
+    <div ng-if="property.notSupported" class="umb-nested-content-overlay"></div>

    <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>

@@ -1,48 +1,48 @@
-<div id="nested-content--{{model.id}}" class="nested-content"
+<div id="umb-nested-content--{{model.id}}" class="umb-nested-content"
     ng-controller="Umbraco.PropertyEditors.NestedContent.PropertyEditorController"
-     ng-class="{'nested-content--narrow':!wideMode, 'nested-content--wide':wideMode}">
+     ng-class="{'umb-nested-content--narrow':!wideMode, 'umb-nested-content--wide':wideMode}">
    <ng-form>

-        <div class="nested-content__items" ng-hide="nodes.length == 0" ui-sortable="sortableOptions" ng-model="nodes">
+        <div class="umb-nested-content__items" ng-hide="nodes.length == 0" ui-sortable="sortableOptions" ng-model="nodes">

-            <div class="nested-content__item" ng-repeat="node in nodes" ng-class="{ 'nested-content__item--active' : $parent.realCurrentNode.key == node.key, 'nested-content__item--single' : $parent.singleMode }">
+            <div class="umb-nested-content__item" ng-repeat="node in nodes" ng-class="{ 'umb-nested-content__item--active' : $parent.realCurrentNode.key == node.key, 'umb-nested-content__item--single' : $parent.singleMode }">

-                <div class="nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">
+                <div class="umb-nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">

-                    <div class="nested-content__heading" ng-class="{'-with-icon': showIcons}"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>
+                    <div class="umb-nested-content__heading" ng-class="{'-with-icon': showIcons}"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-bind="$parent.getName($index)"></span></div>

-                    <div class="nested-content__icons">
-                        <a class="nested-content__icon nested-content__icon--edit" title="{{editIconTitle}}" ng-class="{ 'nested-content__icon--active' : $parent.realCurrentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" ng-show="$parent.maxItems > 1" prevent-default>
+                    <div class="umb-nested-content__icons">
+                        <a class="umb-nested-content__icon umb-nested-content__icon--edit" title="{{editIconTitle}}" ng-class="{ 'umb-nested-content__icon--active' : $parent.realCurrentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" ng-show="$parent.maxItems > 1" prevent-default>
                            <i class="icon icon-edit"></i>
                        </a>
-                        <a class="nested-content__icon nested-content__icon--move" title="{{moveIconTitle}}" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--move" title="{{moveIconTitle}}" ng-click="$event.stopPropagation();" ng-show="$parent.nodes.length > 1" prevent-default>
                            <i class="icon icon-navigation"></i>
                        </a>
-                        <a class="nested-content__icon nested-content__icon--delete" title="{{deleteIconTitle}}" ng-class="{ 'nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
+                        <a class="umb-nested-content__icon umb-nested-content__icon--delete" title="{{deleteIconTitle}}" ng-class="{ 'umb-nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
                            <i class="icon icon-trash"></i>
                        </a>
                    </div>

                </div>

-                <div class="nested-content__content" ng-if="$parent.realCurrentNode.key == node.key && !$parent.sorting">
+                <div class="umb-nested-content__content" ng-if="$parent.realCurrentNode.key == node.key && !$parent.sorting">
                    <umb-nested-content-editor ng-model="node" tab-alias="ncTabAlias" />
                </div>
            </div>

        </div>

-        <div class="nested-content__help-text" ng-show="nodes.length == 0">
+        <div class="umb-nested-content__help-text" ng-show="nodes.length == 0">
            <localize key="grid_addElement"></localize>
        </div>

-        <div class="nested-content__footer-bar" ng-hide="nodes.length >= maxItems">
-            <a class="nested-content__icon" ng-click="openNodeTypePicker($event)" prevent-default>
+        <div class="umb-nested-content__footer-bar" ng-hide="nodes.length >= maxItems">
+            <a class="umb-nested-content__icon" ng-click="openNodeTypePicker($event)" prevent-default>
                <i class="icon icon-add"></i>
            </a>
        </div>

-        <div class="usky-grid nested-content__node-type-picker" ng-if="overlayMenu.show">
+        <div class="usky-grid umb-nested-content__node-type-picker" ng-if="overlayMenu.show">
            <div class="cell-tools-menu" ng-style="overlayMenu.style" style="margin: 0;" delayed-mouseleave="closeNodeTypePicker()" on-delayed-mouseleave="closeNodeTypePicker()">
                <h5>
                    <localize key="grid_insertControl" />
@@ -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>7120</DevelopmentServerPort>
+          <DevelopmentServerPort>7123</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7120</IISUrl>
+          <IISUrl>http://localhost:7123</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
@@ -1089,4 +1090,4 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
    <Exec WorkingDirectory="$(ProjectDir)\..\..\" Command="powershell -ExecutionPolicy RemoteSigned -Command &quot;&amp;{ $env:PSModulePath = \&quot;$pwd\build\Modules\;$env:PSModulePath\&quot; ; Import-Module Umbraco.Build -Force -DisableNameChecking ; build-umbraco compile-belle }&quot;" />
  </Target>
  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
-</Project>
+</Project>
@@ -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"
            },
            {
@@ -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" />
@@ -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>
@@ -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>
@@ -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>
@@ -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));

@@ -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
@@ -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),
@@ -17,11 +17,13 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
    {
        private readonly DatabaseContext _databaseContext;
        private readonly ILocalizedTextService _textService;
+        private readonly ILogger _logger;

        public DatabaseSchemaValidationHealthCheck(HealthCheckContext healthCheckContext) : base(healthCheckContext)
        {
            _databaseContext = HealthCheckContext.ApplicationContext.DatabaseContext;
            _textService = healthCheckContext.ApplicationContext.Services.TextService;
+            _logger = healthCheckContext.ApplicationContext.ProfilingLogger.Logger;
        }

        public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
@@ -39,10 +41,10 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
        {
            var results = _databaseContext.ValidateDatabaseSchema();

-            LogHelper.Warn(typeof(DatabaseSchemaValidationHealthCheck), _textService.Localize("databaseSchemaValidationCheckDatabaseLogMessage"));
+            _logger.Warn(typeof(DatabaseSchemaValidationHealthCheck), _textService.Localize("databaseSchemaValidationCheckDatabaseLogMessage"));
            foreach(var error in results.Errors)
            {
-                LogHelper.Warn(typeof(DatabaseSchemaValidationHealthCheck), error.Item1 + ": " + error.Item2);
+                _logger.Warn(typeof(DatabaseSchemaValidationHealthCheck), error.Item1 + ": " + error.Item2);
            }

            if(results.Errors.Count > 0)
@@ -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);
        }
    }
-}
+}
@@ -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;
        }
    }
-}
+}
@@ -13,12 +13,15 @@ namespace Umbraco.Web.Scheduling
    internal class KeepAlive : RecurringTaskBase
    {
        private readonly ApplicationContext _appContext;
+        private static HttpClient _httpClient;

-        public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds, 
+        public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
            ApplicationContext appContext)
            : base(runner, delayMilliseconds, periodMilliseconds)
        {
            _appContext = appContext;
+            if (_httpClient == null)
+                _httpClient = new HttpClient();
        }

        private ILogger Logger { get { return _appContext.ProfilingLogger.Logger; } }
@@ -26,7 +29,7 @@ namespace Umbraco.Web.Scheduling
        public override async Task<bool> PerformRunAsync(CancellationToken token)
        {
            if (_appContext == null) return true; // repeat...
-            
+
            switch (_appContext.GetCurrentServerRole())
            {
                case ServerRole.Slave:
@@ -58,11 +61,9 @@ namespace Umbraco.Web.Scheduling
                    }

                    var url = umbracoAppUrl + "/ping.aspx";
-                    using (var wc = new HttpClient())
-                    {
-                        var request = new HttpRequestMessage(HttpMethod.Get, url);
-                        var result = await wc.SendAsync(request, token);
-                    }
+
+                    var request = new HttpRequestMessage(HttpMethod.Get, url);
+                    var result = await _httpClient.SendAsync(request, token);
                }
                catch (Exception e)
                {
@@ -78,4 +79,4 @@ namespace Umbraco.Web.Scheduling
            get { return true; }
        }
    }
-}
+}
@@ -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;
                }

@@ -51,17 +51,24 @@ namespace Umbraco.Web.Trees

        internal static string GetRootNodeDisplayName(this TreeAttribute attribute, ILocalizedTextService textService)
        {
+            var label = $"[{attribute.Alias}]";
+
            // try to look up a the localized tree header matching the tree alias
            var localizedLabel = textService.Localize("treeHeaders/" + attribute.Alias);
-            if (string.IsNullOrEmpty(localizedLabel) == false)
-                return localizedLabel;
-
-            // otherwise return the header if it's defined
-            if (string.IsNullOrEmpty(attribute.Title) == false)
-                return attribute.Title;
            
-            // if all fails, return this to signal that a label was not found
-            return "[" + attribute.Alias + "]";
+            // if the localizedLabel returns [alias] then return the title attribute from the trees.config file, if it's defined
+            if (localizedLabel != null && localizedLabel.Equals(label, StringComparison.InvariantCultureIgnoreCase))
+            {
+                if (string.IsNullOrEmpty(attribute.Title) == false)
+                    label = attribute.Title;
+            }
+            else
+            {
+                // the localizedLabel translated into something that's not just [alias], so use the translation
+                label = localizedLabel;
+            }
+
+            return label;
        }

        internal static Attempt<Type> TryGetControllerTree(this ApplicationTree appTree)
@@ -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>
@@ -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));
        }
    }
-}
+}
@@ -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" />
@@ -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" />
@@ -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>
@@ -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>
@@ -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" />
@@ -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>
@@ -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>
@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-1
 		..\apidocs\docfx.json = ..\apidocs\docfx.json
 		..\apidocs\index.md = ..\apidocs\index.md
 		..\LICENSE.md = ..\LICENSE.md
-		..\README.md = ..\README.md
 		..\apidocs\toc.yml = ..\apidocs\toc.yml
 	EndProjectSection
 EndProject
@@ -21,9 +20,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{227C3B55-80E5-4E7E-A802-BE16C5128B9D}"
 	ProjectSection(SolutionItems) = preProject
 		..\build\build.ps1 = ..\build\build.ps1
-		..\build\InstallGit.cmd = ..\build\InstallGit.cmd
-		..\build\RevertToCleanInstall.bat = ..\build\RevertToCleanInstall.bat
-		..\build\RevertToEmptyInstall.bat = ..\build\RevertToEmptyInstall.bat
 		..\build\setversion.ps1 = ..\build\setversion.ps1
 		..\build\NuSpecs\UmbracoCms.Core.nuspec = ..\build\NuSpecs\UmbracoCms.Core.nuspec
 		..\build\NuSpecs\UmbracoCms.nuspec = ..\build\NuSpecs\UmbracoCms.nuspec
Author	SHA1	Message	Date
Sebastiaan Janssen	4d4630915b	Bumps version to 7.12.3 and updates CDF	2018-09-20 08:42:13 +02:00
Sebastiaan Janssen	0f7de97558	Whoops, fixes previous commit for #2896 (cherry picked from commit `b2b9b53af1`)	2018-09-02 10:06:24 +02:00
Sebastiaan Janssen	588493e811	Seems there is no need to hide the .small class, fixes #2896 (cherry picked from commit `2dd5010d2c`)	2018-09-02 09:58:34 +02:00
Ali.Taheri	87af9b2089	u4-8310 - Added error message to the xml file. (cherry picked from commit `541e546f7b`)	2018-08-31 20:07:10 +02:00
Ali.Taheri	ba3cf056fb	u4-8310 - Fixed rename content type with the same alias but with different casing. (cherry picked from commit `26a8d680d4`)	2018-08-31 20:07:05 +02:00
Marcel van Helmont	619acb552b	added val-email to corrrectly validate emails supporting new TLD (cherry picked from commit `74ca315197`)	2018-08-31 19:53:52 +02:00
Sebastiaan Janssen	50b636e1c6	Add issue templates and updated PR template	2018-08-30 09:55:03 +02:00
Stephan	cedf433bb0	U4-11599 - do not abort inst processing on error (cherry picked from commit `f2090e9fc7`)	2018-08-27 08:47:11 +02:00
Sebastiaan Janssen	00c19e3830	Fixes U4-11598 Scheduling the content does not reload the page at the same time (cherry picked from commit `46b0063921`)	2018-08-27 06:56:50 +02:00
Steve Fawcett	a5742dcd9a	Fix: TinyMCE overlay was showing in front of login overlay (cherry picked from commit `71d3c1112e`)	2018-08-26 21:09:54 +02:00
Sebastiaan Janssen	63ee3c72c3	Merge branch 'dev-v7' into patch-v7	2018-08-26 17:53:13 +02:00
Sebastiaan Janssen	16155ea416	Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7	2018-08-26 17:25:18 +02:00
Sebastiaan Janssen	f183e27cae	Merge branch 'jamescoxhead-U4-11166' into dev-v7	2018-08-26 17:24:18 +02:00
Sebastiaan Janssen	a411c9c300	Make sure inactive users get the correct state attached to them	2018-08-26 17:23:52 +02:00
Sebastiaan Janssen	342ac7b1b2	Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166	2018-08-26 16:52:58 +02:00
Sebastiaan Janssen	f5ac5f20a8	Merge pull request #2869 from Bazmech/temp-U4-11594 U4-11594 HasFocalPoint in ImageCropDataSet does not return correct value	2018-08-26 16:44:19 +02:00
Chris Houston	56de9ff4ae	Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851 )	2018-08-26 14:52:14 +02:00
Arbie Sarkissian	e4d8fcf019	U4-11506 - Fix Gregorian DateTime.MinValue is out of range for some calendars (like PersianCalendar) (#2821 )	2018-08-24 11:15:53 +02:00
Sebastiaan Janssen	e1f7e835ea	Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field	2018-08-24 11:08:27 +02:00
Sebastiaan Janssen	d83bb6aa49	Whoops, committed the wrong file! Revert "Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field" This reverts commit `612138f0e1`.	2018-08-24 11:07:55 +02:00
Sebastiaan Janssen	612138f0e1	Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field	2018-08-24 10:49:39 +02:00
Sebastiaan Janssen	bfc627857d	Merge pull request #2840 from WebCentrum/temp-U4-11527 U4-11527 Fix concurrency issue	2018-08-24 00:02:30 +02:00
BatJan	7d439566cd	U4-11526 - Member Group Picker doesn't remove group after unselecting it during selection. (#2835 )	2018-08-23 23:56:32 +02:00
Sebastiaan Janssen	d224a93ce1	Merge branch 'BatJan-feature/temp-U4-11577' into dev-v7	2018-08-23 23:44:23 +02:00
Sebastiaan Janssen	3454db6ee8	No need to do an extra userService request, if the contentType is null we can't access the settings section, that's a good enough test Also fixed the bug where editors would see the node name instead of the content type name	2018-08-23 23:36:50 +02:00
Sebastiaan Janssen	b67c06a85a	Remove console.log that was left behind	2018-08-23 22:23:41 +02:00
Sebastiaan Janssen	44bd3dec9a	Merge branch 'dev-v7' into feature/temp-U4-11577	2018-08-23 22:22:57 +02:00
Thomas Nielsen	68ac84aa1d	Sort the Umbraco.UserPicker list alphabetically by name (#2872 )	2018-08-23 22:15:28 +02:00
Sebastiaan Janssen	c1bf8259ef	Merge branch 'rasmusjp-fix/linkpicker-url-empty' into dev-v7	2018-08-23 21:34:06 +02:00
Sebastiaan Janssen	1b1df84863	Populates the anchor when found Also fixes one of the JS files where .model was seemingly used randomly, but the view doesn't want a .model in there	2018-08-23 21:31:31 +02:00
Sebastiaan Janssen	05fdfc6b34	Merge branch 'fix/linkpicker-url-empty' of https://github.com/rasmusjp/Umbraco-CMS into rasmusjp-fix/linkpicker-url-empty	2018-08-23 20:52:14 +02:00
Sebastiaan Janssen	18b690f11a	Bump the version to 7.12.2	2018-08-23 20:45:49 +02:00
Sebastiaan Janssen	d3b577fe37	Merge pull request #2867 from BatJan/features/temp-U4-11587 U4-11587 Media link does not update when the file is swapped	2018-08-23 20:37:45 +02:00
Sebastiaan Janssen	720409ef54	Merge pull request #2871 from leekelleher/U4-11595 umb-node-preview directive - corrected the title of the "Edit" button	2018-08-23 19:21:30 +02:00
Sebastiaan Janssen	919a63d0ea	Merge pull request #2848 from readingdancer/U4-11569 Small tweaks to the Getting Started tour text.	2018-08-23 18:53:40 +02:00
Mads Rasmussen	ef6822e15b	Merge pull request #2873 from kjac/media-picker-update Media picker: Minor style update + add help text.	2018-08-23 09:29:05 +02:00
Jan Skovgaard	015e89b927	Make sure the "open" action is only visible when logged in as an administrator	2018-08-22 11:31:07 +02:00
Jan Skovgaard	05e48376c7	Use the node object to get the name and icon so it's also displayed for non-admin users	2018-08-22 11:30:39 +02:00
Jan Skovgaard	a2cc0ec411	Shorten comments	2018-08-22 11:30:07 +02:00
Jan Skovgaard	d4fff97814	Move the setModePublishStatus function above the scope.previewOpenUrl...not sure why but this makes the status be visible when logged in as something other than an administrator. When logged in as an admin it worked fine before. Can't quite make sense of this. But now it works.	2018-08-22 11:23:51 +02:00
Lee Kelleher	06e99c3b33	Corrected the title of the "Edit" button umb-node-preview directive - corrected the title of the "Edit" button	2018-08-22 09:13:43 +01:00
Jan Skovgaard	ad3d27be76	Reference the node object instead of the documentType object, which returns null if the user is not logged in as an admin.	2018-08-22 10:00:54 +02:00
Jan Skovgaard	2e2fc6ad84	Make sure to check whether the open anchor for the template should be displayed or not	2018-08-22 09:31:44 +02:00
Jan Skovgaard	9f396e4b15	By default set the "allowOpen" to be false and only set it to true if the current user is an admin. This ensures that the "Open" anchors are never displayed for other than admin users.	2018-08-22 09:13:46 +02:00
Barry Bell	f42862c42a	Update ImageCropDataSet.cs If only one of the Left or Right values changed the HasFocalPoint function would return false but this should now return true if only one is altered	2018-08-21 21:07:54 +01:00
Mads Rasmussen	f7201a70bd	add colored border	2018-08-21 21:20:38 +02:00
Mads Rasmussen	ec67ab83af	Merge branch 'patch-1' of git://github.com/jannikanker/Umbraco-CMS into jannikanker-patch-1	2018-08-21 21:10:01 +02:00
Rasmus John Pedersen	a725ddae5a	Only remove ? or # if it's part of the url	2018-08-21 17:10:46 +02:00
Jan Skovgaard	8f2c253138	Refactort the scope.nodeUrl to be updated whenever save is hit in the existing update watcher	2018-08-21 14:52:00 +02:00
Sebastiaan Janssen	e6597d47e3	Fixes U4-11574 - return an empty string if the datatype is in "single" mode and nothing is selected	2018-08-20 16:12:23 +02:00
Nathan Woulfe	89f69bd2a8	U4 4732 - fix regressions in 7.12 (#2862 )	2018-08-20 16:10:36 +02:00
Sebastiaan Janssen	8087fc4c9a	Merge pull request #2858 from umbraco/temp-U4-11579 U4-11579 Take startNodeId into account before picking the current nod…	2018-08-20 12:06:45 +02:00
Radu Orleanu	f665f8af89	fixing U4-11570 (#2860 )	2018-08-17 14:04:35 +02:00
Kenn Jacobsen	de8a24c691	Add "info" style to upload button + add help text when the dropzone is hidden.	2018-08-17 12:22:54 +02:00
Sebastiaan Janssen	c4163e94c0	Merge pull request #2856 from dawoe/remove-deleted-scripts-from-solution Removed files from solution that are not longer present in repo	2018-08-17 08:25:50 +02:00
Sebastiaan Janssen	62855d021f	Merge pull request #2857 from umbraco/temp-U4-11581 U4-11581 In rare cases the umbracoLanguage table has a constraint ins…	2018-08-17 08:24:43 +02:00
Shannon	49430ca0a5	fixes logic order of dropping indexes	2018-08-17 16:07:53 +10:00
Shannon	9d75e36eb4	Ensures that checking for constraints/indexes is done within the transaction before dropping anything instead of before the transaction.	2018-08-17 15:20:12 +10:00
Shannon	5068b8ae9f	Fixes DB schema validation	2018-08-17 11:16:10 +10:00
Shannon	cdf3581721	code simplification	2018-08-17 10:53:45 +10:00
Shannon	0c6cca44d8	Fixes SQL providers for returning the correct results for constraints	2018-08-17 10:53:21 +10:00
Sebastiaan Janssen	f18b0aa774	U4-11579 Take startNodeId into account before picking the current node to sync to	2018-08-16 13:53:42 +02:00
Sebastiaan Janssen	b9e8dd8b86	Removes unused import statement	2018-08-16 13:47:20 +02:00
Sebastiaan Janssen	45d8d302c9	U4-11581 In rare cases the umbracoLanguage table has a constraint instead of an index, making the migration fail	2018-08-16 12:10:21 +02:00
Dave Woestenborghs	e0ce9f1a77	Removed files from solution that are not longer present in repo	2018-08-16 10:35:08 +02:00
Sebastiaan Janssen	d7a0886097	Fixes problem where we try to query a table that hasn't been updated with the new column yet, so we can't use the DTO	2018-08-16 10:32:10 +02:00
Sebastiaan Janssen	39e8a9fa67	Bump version to 7.12.1	2018-08-15 15:47:21 +02:00
Warren Buckley	1dbf509020	Merge pull request #2855 from umbraco/temp7-156 fixes: 156: Update nested content css/markup so it doesn't collide with the old package	2018-08-15 14:03:47 +01:00
Mads Rasmussen	8ce93055ef	update colors to use variables and match the new color scheme	2018-08-15 13:00:40 +02:00
Mads Rasmussen	ee4b2adbd4	prefix all nested content css classes with "umb"	2018-08-15 11:59:06 +02:00
Jannik Anker	de73080e14	U4-11572 Add border to selected icon in document type icon picker dialog	2018-08-14 13:37:54 +02:00
Mads Rasmussen	6c0d14e0f4	add type="button" to toggle so it doesn't auto-submits a form	2018-08-14 13:14:49 +02:00
Chris Houston	ba682d95dc	Small tweaks to the Getting Started tour text.	2018-08-12 01:16:57 -04:00
Sebastiaan Janssen	fd888cab4b	Fixes U4-9095 - the textService.Localize always returns some string, either the translation or [alias] - so we need to make sure it actually translated something	2018-08-09 14:36:08 +02:00
Pavel Budik	3efbb47aed	U4-11527 Fix concurrency issue	2018-08-08 10:38:53 +02:00
James Coxhead	9a774c8f9e	Added inactive state for users who haven't logged in	2018-08-02 22:01:45 +01:00
James Coxhead	f81dc16210	Specify which user states we want to include when getting all users	2018-08-02 21:55:04 +01:00
James Coxhead	c4a787331f	Reverted previous commit to show disabled users in the status filter	2018-08-02 21:54:00 +01:00
James Coxhead	3078be93b6	Remove disabled users option from users list view filter	2018-07-05 21:07:12 +01:00
James Coxhead	0a2fd277a6	U4-11166 Hide disabled users from the users list view	2018-06-28 20:19:02 +01:00
Simon Dingley	fd2550cfe9	U4-11312 Provides a fallback AuditType value of AuditType.Custom for any legacy logHeader column values that cannot be parsed	2018-06-26 13:31:22 +02:00
Shannon	78c01801f8	fixes U4-11463 MembershipHelper is not working with basic auth on the initial request	2018-06-26 10:52:42 +10:00
Anders Bjerner	ad99d164c9	U4-11477 Here we go again https://github.com/umbraco/Umbraco-CMS/pull/2720#issuecomment-400106496	2018-06-25 23:58:25 +02:00