Bump version to 7.5.14

debug logging when there is a distributed calls config issue

README.md

@@ -1,3 +1,5 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/ikpgqxiw9v8opltv/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-hs8dx/branch/dev-v7)
+
 Umbraco CMS
 ===========
 The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.13
+7.5.14

src/SolutionInfo.cs

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

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

src/Umbraco.Core/Services/MediaService.cs

@@ -891,7 +891,12 @@ namespace Umbraco.Core.Services
             var uow = UowProvider.GetUnitOfWork();
             using (var repository = RepositoryFactory.CreateMediaRepository(uow))
             {
-                media.CreatorId = userId;
+                //set the creator id if it's new
+                if (media.HasIdentity == false)
+                {
+                    media.CreatorId = userId;
+                }
+
                 repository.AddOrUpdate(media);
                 repository.AddOrUpdateContentXml(media, m => _entitySerializer.Serialize(this, _dataTypeService, _userService, m));
                 // generate preview for blame history?

src/Umbraco.Core/Sync/ConfigServerRegistrar.cs

@@ -4,6 +4,7 @@ using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Sync
 {
@@ -40,8 +41,9 @@ namespace Umbraco.Core.Sync
                 .ToList();
 
             if (serversA.Length == 0)
-            {
+            {               
                 _serverRole = ServerRole.Unknown; // config error, actually
+                LogHelper.Debug<ConfigServerRegistrar>(string.Format("Server Role Unknown: DistributedCalls are enabled but no servers are listed"));
             }
             else
             {
@@ -50,7 +52,10 @@ namespace Umbraco.Core.Sync
                 var serverName = master.ServerName;
 
                 if (appId.IsNullOrWhiteSpace() && serverName.IsNullOrWhiteSpace())
+                {
                     _serverRole = ServerRole.Unknown; // config error, actually
+                    LogHelper.Debug<ConfigServerRegistrar>(string.Format("Server Role Unknown: Server Name or AppId missing from Server configuration in DistributedCalls settings"));
+                }
                 else
                     _serverRole = IsCurrentServer(appId, serverName)
                         ? ServerRole.Master

src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html

@@ -1,5 +1,5 @@
 <div class="umb-media-grid">
-    <div class="umb-media-grid__item" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy" ng-style="item.flexStyle" ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-svg': item.extension == 'svg'}">
+    <div class="umb-media-grid__item" title="{{item.name}}" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy" ng-style="item.flexStyle" ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-svg': item.extension == 'svg'}">
         <div>
             <i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>
 
@@ -12,10 +12,10 @@
             <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension == 'svg'"></div>
 
             <!-- Image thumbnail -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" title="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" ng-src="{{item.thumbnail}}" alt="{{item.name}}" draggable="false" />
 
             <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.file}}" alt="{{item.name}}" title="{{item.name}}" draggable="false" />
+            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension == 'svg'" ng-src="{{item.file}}" alt="{{item.name}}" draggable="false" />
 
             <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
             <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension != 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />

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

@@ -2423,9 +2423,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7513</DevelopmentServerPort>
+          <DevelopmentServerPort>7514</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7513</IISUrl>
+          <IISUrl>http://localhost:7514</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

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

@@ -1252,6 +1252,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templates">Templates</key>
     <key alias="xslt">XSLT Files</key>
     <key alias="analytics">Analytics</key>
+	<key alias="partialViews">Partial Views</key>
+    <key alias="partialViewMacros">Partial View Macro Files</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">New update ready</key>

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

@@ -1252,6 +1252,8 @@
     <key alias="templates">模板</key>
     <key alias="xslt">XSLT文件</key>
     <key alias="analytics">分析</key>
+	<key alias="partialViews">分部视图</key>
+    <key alias="partialViewMacros">分部视图宏文件</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">有可用更新</key>

src/Umbraco.Web.UI/umbraco/translation/default.aspx

@@ -16,7 +16,7 @@
     
     <cc1:Pane ID="pane_uploadFile" runat="server" Text="Upload translation file">
       <p>
-        When you have completed the translation. Upload the edited XML file here. The related translation tasks will automaticly be closed when a file is uploaded.
+        When you have completed the translation. Upload the edited XML file here. The related translation tasks will automatically be closed when a file is uploaded.
       </p>
       
       <cc1:PropertyPanel runat="server">

src/Umbraco.Web/Models/ValidatePasswordResetCodeModel.cs

@@ -1,8 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Web.Models
 {
+    [Serializable]
     [DataContract(Name = "validatePasswordReset", Namespace = "")]
     public class ValidatePasswordResetCodeModel
     {

src/Umbraco.Web/Trees/PartialViewMacrosTree.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Web.Trees
 	/// <summary>
 	/// Tree for displaying partial view macros in the developer app
 	/// </summary>
-	[Tree(Constants.Applications.Developer, "partialViewMacros", "Partial View Macro Files", sortOrder: 6)]
+	[Tree(Constants.Applications.Developer, "partialViewMacros", null, sortOrder: 6)]
 	public class PartialViewMacrosTree : PartialViewsTree
 	{
 		public PartialViewMacrosTree(string application) : base(application)

src/Umbraco.Web/Trees/PartialViewsTree.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Web.Trees
 	/// <summary>
 	/// Tree for displaying partial views in the settings app
 	/// </summary>
-	[Tree(Constants.Applications.Settings, "partialViews", "Partial Views", sortOrder: 2)]
+	[Tree(Constants.Applications.Settings, "partialViews", null, sortOrder: 2)]
 	public class PartialViewsTree : FileSystemTree
 	{
 		public PartialViewsTree(string application) : base(application) { }

src/Umbraco.Web/Trees/TemplatesTreeController.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Templates)]
     [LegacyBaseTree(typeof (loadTemplates))]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Templates, "Templates", sortOrder:1)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Templates, null, sortOrder:1)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class TemplatesTreeController : TreeController

src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs

@@ -89,7 +89,7 @@ namespace umbraco
 		/// <param name="rootNode">the 'Relation Types' root node</param>
 		protected override void CreateRootNode(ref XmlTreeNode rootNode)
 		{
-			rootNode.Text = "Relation Types";
+			//rootNode.Text = "Relation Types";
 			rootNode.Icon = BaseTree.FolderIcon;
 			rootNode.OpenIcon = BaseTree.FolderIconOpen;
 			rootNode.NodeType = this.TreeAlias; // (Was prefixed with init)

src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx

@@ -118,7 +118,7 @@
             <tr>
                 <td>
                     <strong style="color: Red;">Remember:</strong> .xslt and .ascx files for your macros
-                    will be added automaticly, but you will still need to add <strong>assemblies</strong>,
+                    will be added automatically, but you will still need to add <strong>assemblies</strong>,
                     <strong>images</strong> and <strong>script files</strong> manually to the list below.
                 </td>
             </tr>