Merge remote-tracking branch 'origin/temp8' into temp8

src/Umbraco.Core/Runtime/CoreRuntime.cs

@@ -307,9 +307,9 @@ namespace Umbraco.Core.Runtime
                 throw new BootFailedException("A connection string is configured but Umbraco could not connect to the database.");
             }
 
-            // if we already know we want to upgrade, no need to look for migrations...
-            if (_state.Level == RuntimeLevel.Upgrade)
-                return;
+            // if we already know we want to upgrade,
+            // still run EnsureUmbracoUpgradeState to get the states
+            // (v7 will just get a null state, that's ok)
 
             // else
             // look for a matching migration entry - bypassing services entirely - they are not 'up' yet

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

@@ -188,7 +188,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
                             hotKey: "ctrl+u",
                             hotKeyWhenHidden: true,
                             alias: "unpublish",
-                            addEllipsis: args.content.variants && args.content.variants.length > 1 ? "true" : "false"
+                            addEllipsis: "true"
                         };
                     case "SCHEDULE":
                         //schedule publish - schedule doesn't have a permission letter so

src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html

@@ -25,7 +25,7 @@
                             <span>{{ variant.language.name }}</span>
                         </label>
 
-                        <div ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                        <div class="umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                             <umb-variant-state variant="variant"></umb-variant-state>
                             <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                         </div>

src/Umbraco.Web.UI.Client/src/views/languages/overview.html

@@ -31,6 +31,7 @@
                 <thead>
                     <tr>
                         <th>Language</th>
+                        <th>ISO</th>
                         <th>Default</th>
                         <th>Mandatory</th>
                         <th>Fallback</th>
@@ -42,6 +43,9 @@
                             <i class="icon-globe" style="color: #BBBABF; margin-right: 5px;"></i>
                             <span class="bold">{{ language.name }}</span>
                         </td>
+                        <td>
+                            <span>{{ language.culture }}</span>
+                        </td>
                         <td>
                             <umb-checkmark
                                 ng-if="language.isDefault"

src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs

@@ -19,13 +19,12 @@ namespace Umbraco.Web.Install.InstallSteps
         {
             get
             {
-                var currentVersion = UmbracoVersion.Local;
-
-                //fixme - in this case there's a db but the version is cleared which is fine and a normal way to force the upgrader
-                // to execute, but before we would detect the current version via the DB like DatabaseSchemaResult.DetermineInstalledVersion
-                // what now, do we need to?
-                if (currentVersion == null)
-                    currentVersion = new Semver.SemVersion(0); 
+                // fixme - if UmbracoVersion.Local is null?
+                // it means that there is a database but the web.config version is cleared
+                // that was a "normal" way to force the upgrader to execute, and we would detect the current
+                // version via the DB like DatabaseSchemaResult.DetermineInstalledVersion - magic, do we really
+                // need this now?
+                var currentVersion = (UmbracoVersion.Local ?? new Semver.SemVersion(0)).ToString();
 
                 var newVersion = UmbracoVersion.SemanticVersion.ToString();