Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
This commit is contained in:
Shannon
2015-10-22 12:12:03 +02:00
4 changed files with 16 additions and 2 deletions

View File

@@ -33,6 +33,13 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "relateToOriginal", IsRequired = true)]
[Required]
public bool RelateToOriginal { get; set; }
/// <summary>
/// Boolean indicating whether copying the object should be recursive
/// </summary>
[DataMember(Name = "recursive", IsRequired = true)]
[Required]
public bool Recursive { get; set; }
}
}