Merge branch 'dev-v7' into master-v7

(cherry picked from commit 2281cd8291)

src/SolutionInfo.cs

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

src/Umbraco.Core/Configuration/UmbracoVersion.cs

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

src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs

@@ -34,6 +34,15 @@ namespace Umbraco.Core.Models.Identity
                 .ForMember(user => user.CalculatedContentStartNodeIds, expression => expression.MapFrom(user => user.CalculateContentStartNodeIds(applicationContext.Services.EntityService)))
                 .ForMember(user => user.CalculatedMediaStartNodeIds, expression => expression.MapFrom(user => user.CalculateMediaStartNodeIds(applicationContext.Services.EntityService)))
                 .ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()))
+
+                .ForMember(user => user.LockoutEnabled, expression => expression.Ignore())
+                .ForMember(user => user.Logins, expression => expression.Ignore())
+                .ForMember(user => user.Roles, expression => expression.Ignore())
+                .ForMember(user => user.PhoneNumber, expression => expression.Ignore())
+                .ForMember(user => user.PhoneNumberConfirmed, expression => expression.Ignore())
+                .ForMember(user => user.TwoFactorEnabled, expression => expression.Ignore())
+                .ForMember(user => user.Claims, expression => expression.Ignore())
+
                 .AfterMap((user, identityUser) =>
                 {
                     identityUser.ResetDirtyProperties(true);
@@ -60,4 +69,4 @@ namespace Umbraco.Core.Models.Identity
             return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass;
         }
     }
-}
+}

src/Umbraco.Core/Models/PublishedContent/PublishedContentModelFactory.cs

@@ -42,7 +42,7 @@ namespace Umbraco.Core.Models.PublishedContent
                 var typeName = attribute == null ? type.Name : attribute.ContentTypeAlias;
 
                 if (constructors.ContainsKey(typeName))
-                    throw new InvalidOperationException(string.Format("More that one type want to be a model for content type {0}.", typeName));
+                    throw new InvalidOperationException(string.Format("More than one type wants to be a model for content type {0}.", typeName));
 
                 // should work everywhere, but slow
                 //_constructors[typeName] = constructor;

src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs

@@ -108,8 +108,9 @@ namespace Umbraco.Tests.TestHelpers
                 var mappers = PluginManager.Current.FindAndCreateInstances<IMapperConfiguration>(
                     specificAssemblies: new[]
                     {
-                        typeof(ContentModelMapper).Assembly,
-                        typeof(ApplicationRegistrar).Assembly
+                        typeof(ApplicationContext).Assembly,    //Umbraco.Core
+                        typeof(ContentModelMapper).Assembly,    //Umbraco.Web
+                        typeof(ApplicationRegistrar).Assembly   //umbraco.businesslogic
                     });
                 foreach (var mapper in mappers)
                 {
@@ -218,4 +219,4 @@ namespace Umbraco.Tests.TestHelpers
 
         protected CacheHelper CacheHelper { get; private set; }
     }
-}
+}

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

@@ -493,7 +493,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * @methodOf umbraco.resources.mediaResource
           *
           * @description
-          * Empties the media recycle bin
+          * Paginated search for media items starting on the supplied nodeId
           *
           * ##usage
           * <pre>
@@ -506,7 +506,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
           * @param {string} query The search query
           * @param {int} pageNumber The page number
           * @param {int} pageSize The number of media items on a page
-          * @param {int} searchFrom Id to search from
+          * @param {int} searchFrom NodeId to search from (-1 for root)
           * @returns {Promise} resourcePromise object.
           *
           */

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/dashboard/developer/examinemanagement.html

@@ -215,7 +215,7 @@
                                             <div class="row form-search">
                                                 <div class="span8 input-append">
                                                     <input type="text" class="search-query" ng-model="searcher.searchText" no-dirty-check />
-                                                    <button type="button" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
+                                                    <button type="submit" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
                                                 </div>
                                             </div>
                                             <div class="row">

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 class="flex error">
+    <div class="flex flex-wrap error">
         <ul ui-sortable="sortableOptions" ng-model="images" class="umb-sortable-thumbnails">
             <li class="umb-sortable-thumbnails__wrapper" ng-repeat="image in images track by $index">
 
@@ -30,8 +30,8 @@
                 </div>
 
             </li>
-            <li style="border: none;">
-                <a href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': (images.length === 0 || isMultiPicker)}" ng-if="showAdd()" prevent-default>
+            <li class="add-wrapper unsortable" ng-if="showAdd()">
+                <a 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.Web.UI.csproj

@@ -973,7 +973,6 @@
     <Content Include="Umbraco\Masterpages\default.Master" />
     <Content Include="Umbraco\Webservices\TreeDataService.ashx" />
     <Content Include="Umbraco\Webservices\TagsAutoCompleteHandler.ashx" />
-    <Content Include="Umbraco\Webservices\MediaUploader.ashx" />
     <None Include="web.Template.config">
       <SubType>Designer</SubType>
     </None>
@@ -1023,9 +1022,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7712</DevelopmentServerPort>
+          <DevelopmentServerPort>7713</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7712</IISUrl>
+          <IISUrl>http://localhost:7713</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/umbraco/webservices/MediaUploader.ashx

@@ -1 +0,0 @@
-<%@ WebHandler Language="C#" CodeBehind="MediaUploader.ashx.cs" Class="umbraco.presentation.umbraco.webservices.MediaUploader" %>

src/Umbraco.Web/Mvc/RenderRouteHandler.cs

@@ -69,12 +69,12 @@ namespace Umbraco.Web.Mvc
         {
             if (UmbracoContext == null)
             {
-                throw new NullReferenceException("There is not current UmbracoContext, it must be initialized before the RenderRouteHandler executes");
+                throw new NullReferenceException("There is no current UmbracoContext, it must be initialized before the RenderRouteHandler executes");
             }
             var docRequest = UmbracoContext.PublishedContentRequest;
             if (docRequest == null)
             {
-                throw new NullReferenceException("There is not current PublishedContentRequest, it must be initialized before the RenderRouteHandler executes");
+                throw new NullReferenceException("There is no current PublishedContentRequest, it must be initialized before the RenderRouteHandler executes");
             }
 
             SetupRouteDataForRequest(
@@ -177,9 +177,9 @@ namespace Umbraco.Web.Mvc
             if (decodedParts.All(x => x.Key != ReservedAdditionalKeys.Area))
                 return null;
 
-            foreach (var item in decodedParts.Where(x => new[] { 
-			    ReservedAdditionalKeys.Controller, 
-			    ReservedAdditionalKeys.Action, 
+            foreach (var item in decodedParts.Where(x => new[] {
+			    ReservedAdditionalKeys.Controller,
+			    ReservedAdditionalKeys.Action,
 			    ReservedAdditionalKeys.Area }.Contains(x.Key) == false))
             {
                 // Populate route with additional values which aren't reserved values so they eventually to action parameters
@@ -360,9 +360,9 @@ namespace Umbraco.Web.Mvc
                 return new PublishedContentNotFoundHandler("In addition, no template exists to render the custom 404.");
 
             // so we have a template, so we should have a rendering engine
-            if (pcr.RenderingEngine == RenderingEngine.WebForms) // back to webforms ?                
+            if (pcr.RenderingEngine == RenderingEngine.WebForms) // back to webforms ?
                 return GetWebFormsHandler();
-            
+
             if (pcr.RenderingEngine != RenderingEngine.Mvc) // else ?
                 return new PublishedContentNotFoundHandler("In addition, no rendering engine exists to render the custom 404.");
 
@@ -389,8 +389,8 @@ namespace Umbraco.Web.Mvc
             }
 
             //Now we can check if we are supposed to render WebForms when the route has not been hijacked
-            if (publishedContentRequest.RenderingEngine == RenderingEngine.WebForms 
-                && publishedContentRequest.HasTemplate 
+            if (publishedContentRequest.RenderingEngine == RenderingEngine.WebForms
+                && publishedContentRequest.HasTemplate
                 && routeDef.HasHijackedRoute == false)
             {
                 return GetWebFormsHandler();
@@ -410,7 +410,7 @@ namespace Umbraco.Web.Mvc
                 var handler = GetHandlerOnMissingTemplate(publishedContentRequest);
 
                 // if it's not null it can be either the PublishedContentNotFoundHandler (no document was
-                // found to handle 404, or document with no template was found) or the WebForms handler 
+                // found to handle 404, or document with no template was found) or the WebForms handler
                 // (a document was found and its template is WebForms)
 
                 // if it's null it means that a document was found and its template is Mvc
@@ -460,6 +460,6 @@ namespace Umbraco.Web.Mvc
             return _controllerFactory.GetControllerSessionBehavior(requestContext, controllerName);
         }
 
-        
+
     }
-}
+}

src/Umbraco.Web/UmbracoHelper.cs

@@ -537,8 +537,16 @@ namespace Umbraco.Web
 
         public IPublishedContent TypedMember(object id)
         {
-            var asInt = id.TryConvertTo<int>();
-            return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
+            int intId;
+            if (ConvertIdObjectToInt(id, out intId))
+                return MembershipHelper.GetById(intId);
+            Guid guidId;
+            if (ConvertIdObjectToGuid(id, out guidId))
+                return TypedMember(guidId);
+            Udi udiId;
+            if (ConvertIdObjectToUdi(id, out udiId))
+                return TypedMember(udiId);
+            return null;
         }
 
         public IPublishedContent TypedMember(int id)