From 16a46a4ea44adc9ec76fa0598b7deeeee5c3b7dd Mon Sep 17 00:00:00 2001 From: Michiel van Oosterhout Date: Thu, 20 Jun 2013 16:01:03 +0200 Subject: [PATCH 1/5] Changed default user email address to use the example domain, instead of domain.com --- src/Umbraco.Web.UI/install/steps/defaultUser.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/install/steps/defaultUser.ascx b/src/Umbraco.Web.UI/install/steps/defaultUser.ascx index 5ada28686d..4d8f90faa9 100644 --- a/src/Umbraco.Web.UI/install/steps/defaultUser.ascx +++ b/src/Umbraco.Web.UI/install/steps/defaultUser.ascx @@ -33,7 +33,7 @@
Email: - +
From 22cf59345cc1d1231ee133a37b7802e9cc30173c Mon Sep 17 00:00:00 2001 From: Stefan Kip Date: Thu, 20 Jun 2013 14:56:39 +0200 Subject: [PATCH 2/5] Removed space before UmbracoModule Removed space before UmbracoModule Conflicts: src/Umbraco.Web.UI/web.Template.config --- src/Umbraco.Web.UI/web.Template.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index e7a036fc40..aba1eed90e 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -183,7 +183,7 @@ - + @@ -283,4 +283,4 @@ - + From 49a699c858391a3cd50612f1c5d4d029985cf03a Mon Sep 17 00:00:00 2001 From: Stefan Kip Date: Sun, 23 Jun 2013 16:38:11 +0200 Subject: [PATCH 3/5] Added RemovePropertyGroup method Signed-off-by: Sebastiaan Janssen --- src/Umbraco.Core/Models/ContentTypeBase.cs | 9 +++++++++ src/Umbraco.Core/Models/IContentTypeBase.cs | 6 ++++++ src/Umbraco.Core/Models/PropertyGroupCollection.cs | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs index 35bc9bee3c..a266c55e22 100644 --- a/src/Umbraco.Core/Models/ContentTypeBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeBase.cs @@ -408,6 +408,15 @@ namespace Umbraco.Core.Models } /// + /// Removes a PropertyGroup from the current ContentType + /// + /// Name of the to remove + public void RemovePropertyGroup(string propertyGroupName) + { + PropertyGroups.RemoveItem(propertyGroupName); + } + + /// /// Sets the ParentId from the lazy integer id /// /// Id of the Parent diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs index b0a671eff8..e68c9884d8 100644 --- a/src/Umbraco.Core/Models/IContentTypeBase.cs +++ b/src/Umbraco.Core/Models/IContentTypeBase.cs @@ -65,6 +65,12 @@ namespace Umbraco.Core.Models void RemovePropertyType(string propertyTypeAlias); /// + /// Removes a PropertyGroup from the current ContentType + /// + /// Name of the to remove + void RemovePropertyGroup(string propertyGroupName); + + /// /// Sets the ParentId from the lazy integer id /// /// Id of the Parent diff --git a/src/Umbraco.Core/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs index ee73c3c7ea..abebbfc504 100644 --- a/src/Umbraco.Core/Models/PropertyGroupCollection.cs +++ b/src/Umbraco.Core/Models/PropertyGroupCollection.cs @@ -97,6 +97,14 @@ namespace Umbraco.Core.Models return this.Any(x => x.Name == groupName); } + public void RemoveItem(string propertyGroupName) + { + var key = IndexOfKey(propertyGroupName); + //Only removes an item if the key was found + if (key != -1) + RemoveItem(key); + } + public int IndexOfKey(string key) { for (var i = 0; i < this.Count; i++) From b01b4f7aa7d0c96ac2d6ce8186a1378beb73a921 Mon Sep 17 00:00:00 2001 From: Stefan Kip Date: Sun, 23 Jun 2013 20:24:22 +0200 Subject: [PATCH 4/5] Forgot to update XML comments Signed-off-by: Sebastiaan Janssen --- src/Umbraco.Core/Models/ContentTypeBase.cs | 2 +- src/Umbraco.Core/Models/IContentTypeBase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs index a266c55e22..f92e562536 100644 --- a/src/Umbraco.Core/Models/ContentTypeBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeBase.cs @@ -410,7 +410,7 @@ namespace Umbraco.Core.Models /// /// Removes a PropertyGroup from the current ContentType /// - /// Name of the to remove + /// Name of the to remove public void RemovePropertyGroup(string propertyGroupName) { PropertyGroups.RemoveItem(propertyGroupName); diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs index e68c9884d8..33effce2d9 100644 --- a/src/Umbraco.Core/Models/IContentTypeBase.cs +++ b/src/Umbraco.Core/Models/IContentTypeBase.cs @@ -67,7 +67,7 @@ namespace Umbraco.Core.Models /// /// Removes a PropertyGroup from the current ContentType /// - /// Name of the to remove + /// Name of the to remove void RemovePropertyGroup(string propertyGroupName); /// From 368954226ac76c162a0d924b5deabb4a60f9efd7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Jun 2013 12:05:22 +0200 Subject: [PATCH 5/5] Update to not require specific version of MVC4, just 4.0.20710.0 and higher --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 93d26b9ef8..83029a6173 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -15,7 +15,7 @@ en-US umbraco - +