Bump version to 7.7.7

U4-10610 Cannot restore content templates

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -33,13 +33,13 @@
       <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)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
+      <dependency id="Examine" version="[0.1.88, 1.0.0)" />
       <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
       <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

src/SolutionInfo.cs

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

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

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <encoding value="utf-8" />
+    ///  </appender>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Models/UmbracoObjectTypes.cs

@@ -188,7 +188,7 @@ namespace Umbraco.Core.Models
         Language,
 
         /// <summary>
-        /// Document
+        /// Document Blueprint
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]

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

@@ -191,11 +191,11 @@ ORDER BY colName";
 
             return new Dictionary<UserState, int>
             {
-                {UserState.All, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
+                {UserState.All, (int)result[0].num},
+                {UserState.Active, (int)result[1].num},
+                {UserState.Disabled, (int)result[2].num},
+                {UserState.LockedOut, (int)result[3].num},
+                {UserState.Invited, (int)result[4].num}
             };
         }
 

src/Umbraco.Core/Services/ContentService.cs

@@ -2006,6 +2006,96 @@ namespace Umbraco.Core.Services
                 }
             }
 
+            return true;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                var items = ids.Select(x => allContent[x]);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
             return true;
         }
 

src/Umbraco.Core/Services/IContentService.cs

@@ -642,7 +642,21 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the parent of the current content as an <see cref="IContent"/> item.

src/Umbraco.Core/Services/MemberService.cs

@@ -986,7 +986,11 @@ namespace Umbraco.Core.Services
         /// <param name="raiseEvents">Optional parameter to raise events.
         /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
         public void Save(IMember entity, bool raiseEvents = true)
-        {
+        {
+            //trimming username and email to make sure we have no trailing space
+            entity.Username = entity.Username.Trim();
+            entity.Email = entity.Email.Trim();
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(entity);

src/Umbraco.Core/UdiEntityType.cs

@@ -117,6 +117,8 @@ namespace Umbraco.Core
                 {
                     case UmbracoObjectTypes.Document:
                         return Document;
+                    case UmbracoObjectTypes.DocumentBlueprint:
+                        return DocumentBluePrint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -161,6 +163,8 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
+                    case DocumentBluePrint:
+                        return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;
                     case Member:

src/Umbraco.Core/Umbraco.Core.csproj

@@ -366,6 +366,7 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="IEmailSender.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IUserControl.cs" />

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/Umbraco.Tests/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />

src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less

@@ -31,15 +31,17 @@
   display: block;
   padding: 4px;
   line-height: @baseLineHeight;
-  border: 1px solid #ddd;
+  border: 1px solid @gray-8;
   .border-radius(@baseBorderRadius);
   .box-shadow(0 1px 3px rgba(0,0,0,.055));
   .transition(all .2s ease-in-out);
 }
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: @linkColor;
+// Add a hover/focus state for linked versions only.
+a.thumbnail:hover, 
+a.thumbnail:focus,
+a div.thumbnail:hover,
+a div.thumbnail:focus {
+  border-color: @turquoise;
   .box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
 

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

@@ -242,8 +242,8 @@
                 var propGroups = _.find(genericTab.properties, function (item) {
                     return item.alias === "_umb_membergroup";
                 });
-                saveModel.email = propEmail.value;
-                saveModel.username = propLogin.value;
+                saveModel.email = propEmail.value.trim();
+                saveModel.username = propLogin.value.trim();
                 
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 

src/Umbraco.Web.UI.Client/src/less/healthcheck.less

@@ -29,12 +29,12 @@
 	padding: 15px 10px;
 	box-sizing: border-box;
 	text-align: center;
-	border: 2px solid transparent;
+	border: 1px solid @gray-8;
 	height: 100%;
 }
 
 .umb-healthcheck-group:hover {
-	border: 2px solid @turquoise;
+	border: 1px solid @turquoise;
 	cursor: pointer;
 }
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html

@@ -2,7 +2,7 @@
 
    <umb-control-group label="@general_url">
        <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
-       <input type="button" ng-click="vm.showPreview()" class="btn" localize="value" value="@general_retrieve" />
+       <input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
    </umb-control-group>
 
    <umb-control-group>
@@ -12,15 +12,15 @@
 
    <div ng-show="model.embed.supportsDimensions">
        <umb-control-group label="@general_width">
-           <input type="text" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
        </umb-control-group>
 
        <umb-control-group label="@general_height">
-          <input type="text" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
        </umb-control-group>
 
        <umb-control-group label="@general_constrain">
-          <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
+           <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
        </umb-control-group>
    </div>
 

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html

@@ -1,5 +1,5 @@
 <h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos.</p>
 
 <div class="row-fluid"
 	ng-init="init('http://umbraco.tv/videos/developer/chapterrss?sort=no')"
@@ -7,14 +7,12 @@
 
 	<ul class="thumbnails" >
 		<li class="span2" ng-repeat="video in videos">
-	    	<div class="thumbnail" style="margin-right: 20px; padding: 20px;">
-		    	<a class="btn-link -underline"  target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-		    	</a>
-		    	<a target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
-		    	</a>
-	    	</div>
+            <a class="btn-link" target="_blank" href="{{video.link}}" title="{{video.title}}">
+                <div class="thumbnail" style="margin-right: 20px; padding: 20px;">
+                    <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
+                    <div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
+                </div>
+            </a>
 	    </li>
 	</ul>
 </div>

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

@@ -36,7 +36,7 @@
             <umb-overlay
                ng-if="vm.childNodeSelectorOverlay.show"
                model="vm.childNodeSelectorOverlay"
-               position="center"
+               position="target"
                view="vm.childNodeSelectorOverlay.view">
             </umb-overlay>
 

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

@@ -299,7 +299,7 @@
       ng-if="editorOverlay.show"
       model="editorOverlay"
       view="editorOverlay.view"
-      position="center">
+      position="target">
     </umb-overlay>
 
     <umb-overlay

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

@@ -127,8 +127,8 @@
     <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>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -1026,9 +1026,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7740</DevelopmentServerPort>
+          <DevelopmentServerPort>7770</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7740</IISUrl>
+          <IISUrl>http://localhost:7770</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml

@@ -422,7 +422,7 @@
     <key alias="showPageOnSend">Hvilken side skal vises etter at skjemaet er sendt</key>
     <key alias="size">Størrelse</key>
     <key alias="sort">Sorter</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Send</key>
     <key alias="type">Type</key>
     <key alias="typeToSearch">Søk...</key>
     <key alias="up">Opp</key>
@@ -439,6 +439,17 @@
     <key alias="yes">Ja</key>
     <key alias="folder">Mappe</key>
     <key alias="searchResults">Søkeresultater</key>
+    <key alias="reorder">Sorter</key>
+    <key alias="reorderDone">Avslutt sortering</key>
+    <key alias="preview">Eksempel</key>
+    <key alias="changePassword">Bytt passord</key>
+    <key alias="to">til</key>
+    <key alias="listView">Listevisning</key>
+    <key alias="saving">Lagrer...</key>
+    <key alias="current">nåværende</key>
+    <key alias="embed">Innbygging</key>
+    <key alias="retrieve">Hent</key>
+    <key alias="selected">valgt</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Bakgrunnsfarge</key>

src/Umbraco.Web.UI/packages.config

@@ -4,7 +4,7 @@
   <package id="ClientDependency" version="1.9.2" 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.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
   <package id="ImageProcessor.Web" version="4.8.7" targetFramework="net45" />
   <package id="ImageProcessor.Web.Config" version="2.3.1" targetFramework="net45" />

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

@@ -586,7 +586,6 @@
     <key alias="sort">Sortér</key>
     <key alias="status">Status</key>
     <key alias="submit">Indsend</key>
-    <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Skriv for at søge...</key>
     <key alias="up">Op</key>
@@ -612,6 +611,7 @@
     <key alias="saving">Gemmer...</key>
     <key alias="current">nuværende</key>
     <key alias="embed">Indlejring</key>
+    <key alias="retrieve">Hent</key>
     <key alias="selected">valgt</key>
   </area>
 

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

@@ -637,6 +637,7 @@
         <key alias="saving">Saving...</key>
         <key alias="current">current</key>
         <key alias="embed">Embed</key>
+    <key alias="retrieve">Retrieve</key>
         <key alias="selected">selected</key>
     </area>
 

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

@@ -637,6 +637,7 @@
         <key alias="saving">Saving...</key>
         <key alias="current">current</key>
         <key alias="embed">Embed</key>
+    <key alias="retrieve">Retrieve</key>
         <key alias="selected">selected</key>
     </area>
     <area alias="colors">

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

@@ -411,7 +411,7 @@
     <key alias="showPageOnSend">Vilken sida skall visas när formuläret är skickat</key>
     <key alias="size">Storlek</key>
     <key alias="sort">Sortera</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Skicka</key>
     <key alias="type">Skriv</key>
     <key alias="typeToSearch">Skriv för att söka...</key>
     <key alias="up">Upp</key>
@@ -426,8 +426,17 @@
     <key alias="width">Bredd</key>
     <key alias="view">Titta på</key>
     <key alias="yes">Ja</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
+    <key alias="reorder">Sortera</key>
+    <key alias="reorderDone">Avsluta sortering</key>
+    <key alias="preview">Förhandsvisning</key>
+    <key alias="changePassword">Ändra lösenord</key>
+    <key alias="to">till</key>
+    <key alias="listView">Listvy</key>
+    <key alias="saving">Sparar...</key>
+    <key alias="current">nuvarande</key>
+    <key alias="embed">Inbäddning</key>
+    <key alias="retrieve">Hämta</key>
+    <key alias="selected">valgt</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Bakgrundsfärg</key>

src/Umbraco.Web/Editors/ContentController.cs

@@ -792,11 +792,8 @@ namespace Umbraco.Web.Editors
             {
                 var contentService = Services.ContentService;
 
-                // content service GetByIds does order the content items based on the order of Ids passed in
-                var content = contentService.GetByIds(sorted.IdSortOrder);
-
                 // Save content with new sort order and update content xml in db accordingly
-                if (contentService.Sort(content) == false)
+                if (contentService.Sort(sorted.IdSortOrder) == false)
                 {
                     LogHelper.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
                     return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");

src/Umbraco.Web/Editors/MemberController.cs

@@ -393,7 +393,7 @@ namespace Umbraco.Web.Editors
             UpdateName(contentItem);
 
             //map the custom properties - this will already be set for new entities in our member binder
-            contentItem.PersistedContent.Email = contentItem.Email;
+            contentItem.PersistedContent.Email = contentItem.Email;
             contentItem.PersistedContent.Username = contentItem.Username;
 
             //use the base method to map the rest of the properties

src/Umbraco.Web/Scheduling/ScheduledPublishing.cs

@@ -86,7 +86,16 @@ namespace Umbraco.Web.Scheduling
             finally
             {
                 if (tempContext != null)
+                {
+                    // because we created an http context and assigned it to UmbracoContext,
+                    // the batched messenger does batch instructions, but since there is no
+                    // request, we need to explicitely tell it to flush the batch of instrs.
+                    var batchedMessenger = ServerMessengerResolver.Current.Messenger as BatchedDatabaseServerMessenger;
+                    if (batchedMessenger != null)
+                        batchedMessenger.FlushBatch();
+
                     tempContext.Dispose(); // nulls the ThreadStatic context
+                }
             }
 
             return true; // repeat

src/Umbraco.Web/Umbraco.Web.csproj

@@ -112,8 +112,8 @@
     <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>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>

src/Umbraco.Web/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Markdown" version="1.14.7" targetFramework="net45" />

src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs

@@ -175,13 +175,16 @@ namespace umbraco.presentation.webservices
         {
             var contentService = ApplicationContext.Services.ContentService;
             try
-            {
-                var intIds = ids.Select(int.Parse).ToArray();
-                var allContent = contentService.GetByIds(intIds).ToDictionary(x => x.Id, x => x);
-                var sortedContent = intIds.Select(x => allContent[x]);
-
+            {
                 // Save content with new sort order and update db+cache accordingly
-                var sorted = contentService.Sort(sortedContent);
+                var intIds = new List<int>();
+                foreach (var stringId in ids)
+                {
+                    int intId;
+                    if (int.TryParse(stringId, out intId))
+                        intIds.Add(intId);
+                }
+                var sorted = contentService.Sort(intIds.ToArray());
 
                 // refresh sort order on cached xml
                 // but no... this is not distributed - solely relying on content service & events should be enough

src/UmbracoExamine/UmbracoExamine.csproj

@@ -82,8 +82,8 @@
     <AssemblyOriginatorKeyFile>..\Solution Items\TheFARM-Public.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/UmbracoExamine/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>

src/umbraco.MacroEngines/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />

src/umbraco.MacroEngines/umbraco.MacroEngines.csproj

@@ -45,8 +45,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.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>