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

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -243,7 +243,7 @@ ul.color-picker li a  {
 
 .umb-mediapicker .umb-sortable-thumbnails li {
     flex-direction: column;
-    margin: 0 5px 0 0;
+    margin: 0 5px 5px 0;
     padding: 5px;
 }
 
@@ -282,8 +282,8 @@ ul.color-picker li a  {
 }
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
-    width: 120px;
-    height: 114px;
+    width: 124px;
+    height: 124px;
     overflow: hidden;
 }
 
@@ -298,6 +298,12 @@ ul.color-picker li a  {
     visibility: hidden;
 }
 
+.umb-sortable-thumbnails.ui-sortable:not(.ui-sortable-disabled) {
+    > li:not(.unsortable) {
+        cursor: move;
+    }
+} 
+
 .umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions  {
     opacity: 1;
     visibility: visible;

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

@@ -136,10 +136,13 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
        };
 
        $scope.sortableOptions = {
+           disabled: !$scope.isMultiPicker,
+           items: "li:not(.add-wrapper)",
+           cancel: ".unsortable",
            update: function(e, ui) {
                var r = [];
-               //TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
-               // content picker. THen we don't have to worry about setting ids, render models, models, we just set one and let the
+               // TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
+               // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
                // watch do all the rest.
                 $timeout(function(){
                     angular.forEach($scope.images, function(value, key) {

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

@@ -3,7 +3,7 @@
     <p ng-if="(images|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(images|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>
     
-    <div data-element="sortable-thumbnails" class="flex error">
+    <div data-element="sortable-thumbnails" class="flex flex-wrap error">
         <ul ui-sortable="sortableOptions" ng-model="images" class="umb-sortable-thumbnails">
             <li data-element="sortable-thumbnail-{{$index}}" class="umb-sortable-thumbnails__wrapper" ng-repeat="image in images track by $index">
 
@@ -29,8 +29,8 @@
                     </a>
                 </div>
             </li>
-            <li style="border: none;">
-                <a data-element="sortable-thumbnails-add" href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': (images.length === 0 || isMultiPicker)}" ng-if="showAdd()" prevent-default>
+            <li style="border: none;" class="add-wrapper unsortable" ng-if="showAdd()">
+                <a data-element="sortable-thumbnails-add" href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': (images.length === 0 || isMultiPicker)}" prevent-default>
                     <i class="icon icon-add large"></i>
                 </a>
             </li>

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

@@ -1190,8 +1190,7 @@
         <key alias="deleteUserGroupsSuccess">%0% grupos de usuario borrados</key>
         <key alias="deleteUserGroupSuccess">%0% fue borrado</key>
         <key alias="unlockUsersSuccess">%0% usuarios desbloquedaos</key>
-        <key alias="unlockUsersError">
-            Error desbloqueando usuarios/key>
+        <key alias="unlockUsersError">Error desbloqueando usuarios</key>
             <key alias="unlockUserSuccess">%0% está desbloqueado</key>
             <key alias="unlockUserError">Error desbloqueando usuario</key>
         </area>