From 793c9470c242e09d6bd7f638293236df9a24228b Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Fri, 6 Apr 2018 14:46:23 +1000 Subject: [PATCH 1/5] Manually applies merge pull request #2556 from dawoe/temp-U4-11167 U4-11167 Fixes rare syncTree error --- .../src/common/services/navigation.service.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index 20e73f9e06..f775e35934 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -288,9 +288,12 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo throw "args.tree cannot be null"; } - if (mainTreeEventHandler) { - //returns a promise - return mainTreeEventHandler.syncTree(args); + if (mainTreeEventHandler) { + + if (mainTreeEventHandler.syncTree) { + //returns a promise, + return mainTreeEventHandler.syncTree(args); + } } //couldn't sync From fe44494936353abddf5cbf07f9db052ba0622965 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 5 Apr 2018 10:15:39 +0100 Subject: [PATCH 2/5] Merge pull request #2550 from dawoe/temp-U4-11161 U4-11161 fix for adding multiple items in a single content picker --- .../propertyeditors/contentpicker/contentpicker.controller.js | 2 ++ .../src/views/propertyeditors/contentpicker/contentpicker.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 229ec614de..161f989d10 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -66,6 +66,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper showOpenButton: false, showEditButton: false, showPathOnHover: false, + maxNumber: 1, + minNumber : 0, startNode: { query: "", type: "content", diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 0ed8657c59..0a2f82e2a2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -28,7 +28,7 @@ Add -
+
From 967178cb926fa743592f806c7e939ac838ce5cb6 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 9 Apr 2018 11:43:48 +0200 Subject: [PATCH 3/5] Manually applies U4-11155 fixed error when creating member groups #2545 --- src/Umbraco.Tests/UI/LegacyDialogTests.cs | 1 - .../umbraco.presentation/umbraco/create/MemberGroupTasks.cs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs index 304f8256b8..f256d9a349 100644 --- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs +++ b/src/Umbraco.Tests/UI/LegacyDialogTests.cs @@ -5,7 +5,6 @@ using Umbraco.Web.UI; using umbraco; using umbraco.BusinessLogic; using umbraco.interfaces; -using Umbraco.Web.umbraco.presentation.umbraco.create; namespace Umbraco.Tests.UI { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs index 905aa42ca3..8525170d18 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs @@ -2,9 +2,10 @@ using System.Linq; using System.Web.Security; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.member; +using Umbraco.Web; using Umbraco.Web.UI; -namespace Umbraco.Web.umbraco.presentation.umbraco.create +namespace umbraco { public class MemberGroupTasks : LegacyDialogTask { From 9b33c8a0e254d4cf6eb7f344433674c48cd52aaf Mon Sep 17 00:00:00 2001 From: Dave Woestenborghs Date: Mon, 9 Apr 2018 14:04:02 +0200 Subject: [PATCH 4/5] U4-11149 fixed error when creating new xslt file (#2540) * U4-10659 added create task back for xslt files * Add fix to UI.Release.xml as well --- src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml | 1 + src/Umbraco.Web.UI/umbraco/config/create/UI.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml index ab2b89c0fb..44f2758de5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml +++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml @@ -19,6 +19,7 @@
Macro
/create/xslt.ascx + diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml index b0fac8393b..c1fc5c06b9 100644 --- a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml +++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml @@ -19,6 +19,7 @@
Macro
/create/xslt.ascx + From 6d052aeeac472328de0f1a4ff374c9bd59faea82 Mon Sep 17 00:00:00 2001 From: mikkelhm Date: Tue, 10 Apr 2018 08:56:50 +0200 Subject: [PATCH 5/5] Bump version to 7.9.4 --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index dd901ab1d1..d4f4d5f7b8 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.9.3")] -[assembly: AssemblyInformationalVersion("7.9.3")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.9.4")] +[assembly: AssemblyInformationalVersion("7.9.4")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 4a81e95c26..9cfe8c7d14 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/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.9.3"); + private static readonly Version Version = new Version("7.9.4"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 9a0122ad83..01273388e9 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7930 + 7940 / - http://localhost:7930 + http://localhost:7940 False False