From 0f4b1752e0885eeac24cfbdd002e2fe8aba4144d Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 15:25:46 +0200 Subject: [PATCH 1/7] U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run --- .../templates/cshtml/ListChildPagesOrderedByProperty.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml index 2f5ebb543b..8383d9077e 100644 --- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml +++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml @@ -10,7 +10,7 @@ @* Get the property alias we want to filter on from the macro parameter *@ var propertyAlias = Parameter.propertyAlias; - var selection = Model.Children.Where("Visible").OrderBy(propertyAlias) + var selection = Model.Children.Where("Visible").OrderBy(propertyAlias); } From 96cec0b407a35392cadbc9d3ae109b7d21d64a30 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 16:30:44 +0200 Subject: [PATCH 2/7] U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 --- .../umbraco/developer/RelationTypes/EditRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/NewRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/EditRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/NewRelationType.aspx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> From 23ec07276a4cd1cd353f7a1a8287771f1dab02a1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 16:56:59 +0200 Subject: [PATCH 3/7] U4-2369 Wrong path for Umbraco/Config/Lang/xx.xml for publish notification mail --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 ++-- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 14 +++++++------- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 14 +++++++------- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 12 ++++++------ src/Umbraco.Web.UI/umbraco/config/lang/no.xml | 14 +++++++------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index e3aa533783..d800f72a6b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -432,13 +432,13 @@ Dette er en automatisk mail for at fortælle at handlingen '%1%' er blevet udført på siden '%2%' af brugeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for at redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for at redigere. Ha' en dejlig dag! Mange hilsner fra umbraco robotten ]]> - Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> + Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> [%0%] Notificering om %1% udført på %2% Notificeringer diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 707648950f..c721c7e227 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -463,7 +463,7 @@ Hallo %0%, die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt. -Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/umbraco/actions/editContent.aspx?id=%5% +Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/actions/editContent.aspx?id=%5% Einen schönen Tag wünscht Ihr freundlicher Umbraco-Robot @@ -474,9 +474,9 @@ Ihr freundlicher Umbraco-Robot

die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt.

@@ -487,9 +487,9 @@ Ihr freundlicher Umbraco-Robot

Einen schönen Tag wünscht
Ihr freundlicher Umbraco-Robot

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 58396680cd..0e646278f8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -534,7 +534,7 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri Ceci est un email automatique pour vous informer que la tâche '%1%' a été activée sur la page '%2%' par l'utilisateur '%3%' - Allez à http://%4%/umbraco/actions/editContent.aspx?id=%5% pour éditer. + Allez à http://%4%/actions/editContent.aspx?id=%5% pour éditer. Bonne journée! @@ -550,9 +550,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    

@@ -564,9 +564,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 729883cf4e..7e8fbd8e3a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -452,9 +452,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    

@@ -466,9 +466,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index 8dcc4dcdb7..ce5d23a286 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -433,7 +433,7 @@ Dette er en automatisk mail for å informere om at handlingen '%1%' er utført på siden '%2%' av brukeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for å redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for å redigere. Ha en fin dag! @@ -447,9 +447,9 @@ Vennlig hilsen umbraco roboten

@@ -461,9 +461,9 @@ Vennlig hilsen umbraco roboten

From a2da27121e053eddf24da3771d8abc74aacc7272 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:00:40 +0200 Subject: [PATCH 4/7] U4-2335 [Regression] YSOD when editing stylesheet property on 6.0.6 --- .../stylesheet/property/EditStyleSheetProperty.aspx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx index c554ab88b9..1d0166285d 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx @@ -10,25 +10,25 @@
- <%=umbraco.ui.Text("name", UmbracoUser)%>: + <%=umbraco.ui.Text("name", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "nameHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "nameHelp", base.getUser())%>
- <%=umbraco.ui.Text("alias", UmbracoUser)%>: + <%=umbraco.ui.Text("alias", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "aliasHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "aliasHelp", base.getUser())%>
- <%=umbraco.ui.Text("styles", UmbracoUser)%>: + <%=umbraco.ui.Text("styles", base.getUser())%>: @@ -38,7 +38,7 @@
- <%=umbraco.ui.Text("preview", UmbracoUser)%>: + <%=umbraco.ui.Text("preview", base.getUser())%>:
From 7fad8ca98b20081a2a9040a84ddcbc0142d95098 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:15:42 +0200 Subject: [PATCH 5/7] U4-2378 Mono port to do: TypeFinder needs exclusions for Monodevelop Nunit --- src/Umbraco.Tests/TypeFinderTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/TypeFinderTests.cs b/src/Umbraco.Tests/TypeFinderTests.cs index 7d052d7cbc..ca3f80936d 100644 --- a/src/Umbraco.Tests/TypeFinderTests.cs +++ b/src/Umbraco.Tests/TypeFinderTests.cs @@ -447,7 +447,9 @@ namespace Umbraco.Tests "HtmlAgilityPack.", "TidyNet.", "ICSharpCode.", - "CookComputing." + "CookComputing.", + /* Mono */ + "MonoDevelop.NUnit" }; public static IEnumerable FindClassesOfTypeWithAttribute() From 35c0eb3b0c441e4ba30078771a64d95351b01e32 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:22:13 +0200 Subject: [PATCH 6/7] U4-2377 Mono port to do: Universal currency character does not work as split character unless given in unicode. --- .../umbraco.presentation/umbraco/create/ScriptTasks.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs index 46ee8f3f80..5e3f16ca0c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs @@ -42,7 +42,7 @@ namespace umbraco public bool Save() { - string[] scriptFileAr = _alias.Split('¤'); + string[] scriptFileAr = _alias.Split('\u00A4'); From 76358e3e133a502692412929d99ba71292abb26a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:29:55 +0200 Subject: [PATCH 7/7] U4-2374 Mono port to do: dealing with empty string --- .../umbraco/controls/GenericProperties/GenericProperty.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index fba88a0d67..2eac5b2f41 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -223,7 +223,7 @@ namespace umbraco.controls.GenericProperties checkMandatory.Checked = true; // validation - if (_pt != null && _pt.ValidationRegExp != "") + if (_pt != null && string.IsNullOrEmpty(_pt.ValidationRegExp) == false) tbValidation.Text = _pt.ValidationRegExp; // description