From 6c0fb765f02fa6d934040bada6acd8f920744b7b Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Fri, 11 Oct 2013 10:25:01 +0200 Subject: [PATCH 1/2] Related links prop editor: fixes issue in view --- .../src/views/propertyeditors/relatedlinks/relatedlinks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html index c067f8f38b..522e0097d0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html @@ -10,7 +10,7 @@ - + {{link.caption}} From a54b2297c78bf9f25755a5151640934cc6026b43 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 11 Oct 2013 10:51:12 +0200 Subject: [PATCH 2/2] Changed version to beta --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index 27af8026d9..9d6c661cd2 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,6 +1,6 @@ @ECHO OFF SET release=7.0.0 -SET comment=alpha +SET comment=beta SET version=%release% IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%) diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 3e3564f38f..17a2c25766 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Reflection; namespace Umbraco.Core.Configuration @@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). /// /// The version comment. - public static string CurrentComment { get { return "alpha"; } } + public static string CurrentComment { get { return "beta"; } } // Get the version of the umbraco.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx