From 53b31a5c1b4f0bfc7048db5b4994f03e15cb8702 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 12 Jun 2013 10:04:31 +0200 Subject: [PATCH 1/8] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5e7cb63499..c898c77de7 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ Umbraco CMS For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 110,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales. [More info at http://umbraco.org](http://umbraco.org) +## Downloading ## +The downloadable Umbraco releases live at [http://our.umbraco.org/contribute/releases](Our Umbraco). + ## Forums ## We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org). From 0815842640f59b20438551693669e40a9108d104 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 12 Jun 2013 11:10:18 +0300 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c898c77de7..399792bcef 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute). -## Submitting Issues ## +## Found a bug? ## Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature). From 458e61e049dc732dbaeaaeea76d02e07f03d0323 Mon Sep 17 00:00:00 2001 From: dpen2000 Date: Wed, 12 Jun 2013 14:45:41 +0200 Subject: [PATCH 3/8] Update README.md Fix link to Umbraco releases page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 399792bcef..54393e6baf 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ For the first time on the Microsoft platform a free user and developer friendly [More info at http://umbraco.org](http://umbraco.org) ## Downloading ## -The downloadable Umbraco releases live at [http://our.umbraco.org/contribute/releases](Our Umbraco). +The downloadable Umbraco releases live at [http://our.umbraco.org/contribute/releases](http://our.umbraco.org/contribute/releases). ## Forums ## We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org). From 73ac2c03092e24de0e84802d2def6b70881cf84b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Wed, 12 Jun 2013 15:34:26 +0200 Subject: [PATCH 4/8] Update README.md Readme.md corrections and updates --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 54393e6baf..b1dc21ee7e 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,16 @@ Umbraco CMS ## Umbraco - the simple, flexible and friendly ASP.NET CMS ## -**More than 155,000 sites trust Umbraco** -For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 110,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales. -[More info at http://umbraco.org](http://umbraco.org) +**More than 177,000 sites trust Umbraco** +More than 177,000 sites trust Umbraco +For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales. +[More info at http://umbraco.com](http://umbraco.com) ## Downloading ## The downloadable Umbraco releases live at [http://our.umbraco.org/contribute/releases](http://our.umbraco.org/contribute/releases). ## Forums ## -We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org). +We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org). ## Contribute to Umbraco ## From 95eb00a81cfaa1fb23da946467255a9d06168306 Mon Sep 17 00:00:00 2001 From: Thomas Morris Date: Wed, 12 Jun 2013 18:24:54 +0200 Subject: [PATCH 5/8] Update README.md Updating link and formatting --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b1dc21ee7e..f842afd3c2 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,20 @@ Umbraco CMS ## Umbraco - the simple, flexible and friendly ASP.NET CMS ## -**More than 177,000 sites trust Umbraco** -More than 177,000 sites trust Umbraco -For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales. -[More info at http://umbraco.com](http://umbraco.com) +**More than 177,000 sites trust Umbraco** + +For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. + +Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales. + +To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies) ## Downloading ## + The downloadable Umbraco releases live at [http://our.umbraco.org/contribute/releases](http://our.umbraco.org/contribute/releases). ## Forums ## + We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org). ## Contribute to Umbraco ## From f5121bd183b3a852782eb7f7d252dead80c17f51 Mon Sep 17 00:00:00 2001 From: Jeremy Pyne Date: Tue, 18 Jun 2013 09:35:33 -0400 Subject: [PATCH 6/8] Fix for U4-2384. Author not changed to current user when a node is copied. --- src/Umbraco.Core/Services/ContentService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 1254bb295c..0236be227c 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -862,7 +862,8 @@ namespace Umbraco.Core.Services var uow = _uowProvider.GetUnitOfWork(); using (var repository = _repositoryFactory.CreateContentRepository(uow)) { - content.WriterId = userId; + copy.CreatorId = userId; + content.WriterId = userId; // Typo? repository.AddOrUpdate(copy); uow.Commit(); From 5e2c3a0a8b32ba6cb8667154d8d47ed20be90b2a Mon Sep 17 00:00:00 2001 From: Jeremy Pyne Date: Tue, 18 Jun 2013 10:38:08 -0400 Subject: [PATCH 7/8] Fixed a type on content copy. --- src/Umbraco.Core/Services/ContentService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 0236be227c..fda3d71d31 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -862,8 +862,10 @@ namespace Umbraco.Core.Services var uow = _uowProvider.GetUnitOfWork(); using (var repository = _repositoryFactory.CreateContentRepository(uow)) { + // Update the create author and last edit author copy.CreatorId = userId; - content.WriterId = userId; // Typo? + copy.WriterId = userId; + repository.AddOrUpdate(copy); uow.Commit(); From 7c6aee17e90d4b59a29cbcabf915475510c072c7 Mon Sep 17 00:00:00 2001 From: Darren Ferguson Date: Wed, 19 Jun 2013 13:02:58 +0100 Subject: [PATCH 8/8] Remove obsolete messages from member class I've removed the obsolete methods from the member class because many of the suggested alternatives don't work. and some require a lot of configuration to get working. Also, the member methods return Members - so they are not obsolete if you want a reference to a member, you can choose to use System membership if you want, but for custom properties and groups you need to fallback to the Umbraco API, so these shouldn't be obsolete! :) --- .../businesslogic/member/Member.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index 3738890789..fba3c5510b 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -91,7 +91,7 @@ namespace umbraco.cms.businesslogic.member /// /// Note: is ressource intensive, use with care. /// - [Obsolete("Use System.Web.Security.Membership.GetAllUsers()")] + public static Member[] GetAll { get @@ -146,13 +146,13 @@ namespace umbraco.cms.businesslogic.member /// /// The first letter /// - [Obsolete("Use System.Web.Security.Membership.FindUsersByName(string letter)")] + public static Member[] getMemberFromFirstLetter(char letter) { return GetMemberByName(letter.ToString(), true); } - [Obsolete("Use System.Web.Security.Membership.FindUsersByName(string letter)")] + public static Member[] GetMemberByName(string usernameToMatch, bool matchByNameInsteadOfLogin) { string field = matchByNameInsteadOfLogin ? "umbracoNode.text" : "cmsMember.loginName"; @@ -184,7 +184,7 @@ namespace umbraco.cms.businesslogic.member /// Member type /// The umbraco usercontext /// The new member - [Obsolete("Use System.Web.Security.Membership.CreateUser")] + public static Member MakeNew(string Name, MemberType mbt, User u) { return MakeNew(Name, "", "", mbt, u); @@ -199,7 +199,7 @@ namespace umbraco.cms.businesslogic.member /// The umbraco usercontext /// The email of the user /// The new member - [Obsolete("Use System.Web.Security.Membership.CreateUser")] + public static Member MakeNew(string Name, string Email, MemberType mbt, User u) { return MakeNew(Name, "", Email, mbt, u); @@ -213,7 +213,7 @@ namespace umbraco.cms.businesslogic.member /// The umbraco usercontext /// The email of the user /// The new member - [Obsolete("Use System.Web.Security.Membership.CreateUser")] + public static Member MakeNew(string Name, string LoginName, string Email, MemberType mbt, User u) { var loginName = (!String.IsNullOrEmpty(LoginName)) ? LoginName : Name; @@ -265,7 +265,7 @@ namespace umbraco.cms.businesslogic.member /// /// The unique Loginname /// The member with the specified loginname - null if no Member with the login exists - [Obsolete("Use System.Web.Security.Membership.GetUser")] + public static Member GetMemberFromLoginName(string loginName) { if (String.IsNullOrEmpty(loginName)) @@ -298,7 +298,7 @@ namespace umbraco.cms.businesslogic.member /// /// The email of the member /// The member with the specified email - null if no Member with the email exists - [Obsolete("Use System.Web.Security.Membership.GetUserNameByEmail")] + public static Member GetMemberFromEmail(string email) { if (string.IsNullOrEmpty(email)) @@ -326,7 +326,7 @@ namespace umbraco.cms.businesslogic.member /// Member login /// Member password /// The member with the credentials - null if none exists - [Obsolete("Log members in via the standard Forms Authentiaction login")] + public static Member GetMemberFromLoginNameAndPassword(string loginName, string password) { if (IsMember(loginName)) @@ -677,7 +677,7 @@ namespace umbraco.cms.businesslogic.member /// /// Deltes the current member /// - [Obsolete("Use System.Web.Security.Membership.DeleteUser")] + public override void delete() { DeleteEventArgs e = new DeleteEventArgs(); @@ -721,7 +721,7 @@ namespace umbraco.cms.businesslogic.member /// /// The id of the group which the member is being added to [MethodImpl(MethodImplOptions.Synchronized)] - [Obsolete("Use System.Web.Security.Roles.AddUserToRole")] + public void AddGroup(int GroupId) { AddGroupEventArgs e = new AddGroupEventArgs(); @@ -747,7 +747,7 @@ namespace umbraco.cms.businesslogic.member /// Removes the member from the MemberGroup specified /// /// The MemberGroup from which the Member is removed - [Obsolete("Use System.Web.Security.Roles.RemoveUserFromRole")] + public void RemoveGroup(int GroupId) { RemoveGroupEventArgs e = new RemoveGroupEventArgs();