From aeff33d0a61b32c6a63879256b300ba9d4311b93 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:17:55 -0200 Subject: [PATCH 1/5] Bump version number --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/GlobalSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index 25cf8ba4c5..f79e2d82e7 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,5 +1,5 @@ @ECHO OFF -set version=4.11.8 +set version=4.11.9 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version% echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 2280289242..269cd11ca7 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -28,7 +28,7 @@ namespace Umbraco.Core.Configuration #region Private static fields // CURRENT UMBRACO VERSION ID - private const string CurrentUmbracoVersion = "4.11.8"; + private const string CurrentUmbracoVersion = "4.11.9"; private static readonly object Locker = new object(); //make this volatile so that we can ensure thread safety with a double check lock From f36ab37f6a0d90eb636c6573c38898578124678b Mon Sep 17 00:00:00 2001 From: dmilic Date: Mon, 13 May 2013 15:49:59 -1200 Subject: [PATCH 2/5] Fix for the U4-2229 issue - broken PublishWithSubs method --- src/umbraco.cms/businesslogic/web/Document.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index aea0d8153a..fb2fce38d7 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -1273,7 +1273,7 @@ and node.nodeObjectType=@nodeObjectType"; Guid newVersion = createNewVersion(versionDate); SqlHelper.ExecuteNonQuery("insert into cmsDocument (nodeId, published, documentUser, versionId, updateDate, Text) " - + "values (" + Id + ", 0, " + u.Id + ", @versionId, @text)", + + "values (" + Id + ", 0, " + u.Id + ", @versionId, @updateDate, @text)", SqlHelper.CreateParameter("@versionId", newVersion), SqlHelper.CreateParameter("@updateDate", versionDate), SqlHelper.CreateParameter("@text", Text)); From 2f61bc27c8b8c3c01c01480cbe207d81b5765471 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:15:32 -0200 Subject: [PATCH 3/5] Bump version number --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index f2849f0824..cca902903f 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,5 +1,5 @@ @ECHO OFF -SET release=6.0.5 +SET release=6.0.6 SET comment= SET version=%release% diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index c4c47524b3..df60984a54 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("6.0.5"); + private static readonly Version Version = new Version("6.0.6"); /// /// Gets the current version of Umbraco. From 13a86624ff234dd3b848fd92034b6f3eb4039b37 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:39:12 -0200 Subject: [PATCH 4/5] Fixes U4-2248 Spelling error in back office --- .../umbraco_client/FolderBrowser/Js/folderbrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index 802b160003..762d8ebdf2 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -173,7 +173,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var self = this; // Inject the upload overlay - var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to chose the items to upload

" : "

Click the browse button below to chose the items to upload

"; + var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to chose the items to upload

"; var overlay = $("
" + "
" + From 7ecbc3b3912875793d037632720e247b83348937 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:44:59 -0200 Subject: [PATCH 5/5] Fixes U4-2248 Spelling error in back office --- .../umbraco_client/FolderBrowser/Js/folderbrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index 762d8ebdf2..a8132ae7c7 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -173,7 +173,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var self = this; // Inject the upload overlay - var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to chose the items to upload

"; + var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to choose the items to upload

"; var overlay = $("
" + "
" +