yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.0.7

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Sebastiaan Janssen
2013-06-19 14:22:57 +02:00
parent a4098b5d25 9ac4c7aef5
commit baa0069262
5 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@@ -6,18 +6,27 @@ 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**
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 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 ##
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).

5
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -952,7 +952,10 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
content.WriterId = userId;
// Update the create author and last edit author
copy.CreatorId = userId;
copy.WriterId = userId;
repository.AddOrUpdate(copy);
uow.Commit();

1
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -31,6 +31,7 @@ using umbraco.NodeFactory;
using umbraco.presentation.templateControls;
using Content = umbraco.cms.businesslogic.Content;
using Macro = umbraco.cms.businesslogic.macro.Macro;
using MacroErrorEventArgs = Umbraco.Core.Events.MacroErrorEventArgs;
namespace umbraco
{

33
src/umbraco.cms/businesslogic/events/EventArgs.cs
View File

@@ -63,5 +63,36 @@ namespace umbraco.cms.businesslogic {
public bool CancelChildren { get; set; }
}
// Provides information on the macro that caused an error
public class MacroErrorEventArgs : System.EventArgs
{
/// <summary>
/// Name of the faulting macro.
/// </summary>
public string Name { get; set; }
/// <summary>
/// Alias of the faulting macro.
/// </summary>
public string Alias { get; set; }
/// <summary>
/// Filename of the faulting macro.
/// </summary>
public string File { get; set; }
/// <summary>
/// Exception raised.
/// </summary>
public Exception Exception { get; set; }
/// <summary>
/// Gets or sets the desired behaviour when a matching macro causes an error. See
/// <see cref="MacroErrorBehaviour"/> for definitions. By setting this in your event
/// you can override the default behaviour defined in UmbracoSettings.config.
/// </summary>
/// <value>Macro error behaviour enum.</value>
public MacroErrorBehaviour Behaviour { get; set; }
}
}

24
src/umbraco.cms/businesslogic/member/Member.cs
View File

@@ -91,7 +91,7 @@ namespace umbraco.cms.businesslogic.member
///
/// Note: is ressource intensive, use with care.
/// </summary>
[Obsolete("Use System.Web.Security.Membership.GetAllUsers()")]
public static Member[] GetAll
{
get
@@ -146,13 +146,13 @@ namespace umbraco.cms.businesslogic.member
/// </summary>
/// <param name="letter">The first letter</param>
/// <returns></returns>
[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
/// <param name="mbt">Member type</param>
/// <param name="u">The umbraco usercontext</param>
/// <returns>The new member</returns>
[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
/// <param name="u">The umbraco usercontext</param>
/// <param name="Email">The email of the user</param>
/// <returns>The new member</returns>
[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
/// <param name="u">The umbraco usercontext</param>
/// <param name="Email">The email of the user</param>
/// <returns>The new member</returns>
[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
/// </summary>
/// <param name="loginName">The unique Loginname</param>
/// <returns>The member with the specified loginname - null if no Member with the login exists</returns>
[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
/// </summary>
/// <param name="email">The email of the member</param>
/// <returns>The member with the specified email - null if no Member with the email exists</returns>
[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
/// <param name="loginName">Member login</param>
/// <param name="password">Member password</param>
/// <returns>The member with the credentials - null if none exists</returns>
[Obsolete("Log members in via the standard Forms Authentiaction login")]
public static Member GetMemberFromLoginNameAndPassword(string loginName, string password)
{
if (IsMember(loginName))
@@ -668,7 +668,7 @@ namespace umbraco.cms.businesslogic.member
/// <summary>
/// Deltes the current member
/// </summary>
[Obsolete("Use System.Web.Security.Membership.DeleteUser")]
public override void delete()
{
DeleteEventArgs e = new DeleteEventArgs();
@@ -712,7 +712,7 @@ namespace umbraco.cms.businesslogic.member
/// </summary>
/// <param name="GroupId">The id of the group which the member is being added to</param>
[MethodImpl(MethodImplOptions.Synchronized)]
[Obsolete("Use System.Web.Security.Roles.AddUserToRole")]
public void AddGroup(int GroupId)
{
AddGroupEventArgs e = new AddGroupEventArgs();
@@ -738,7 +738,7 @@ namespace umbraco.cms.businesslogic.member
/// Removes the member from the MemberGroup specified
/// </summary>
/// <param name="GroupId">The MemberGroup from which the Member is removed</param>
[Obsolete("Use System.Web.Security.Roles.RemoveUserFromRole")]
public void RemoveGroup(int GroupId)
{
RemoveGroupEventArgs e = new RemoveGroupEventArgs();