Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice
# Conflicts: # src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs # src/Umbraco.Core/Models/Member.cs # src/Umbraco.Core/Models/Membership/User.cs # src/Umbraco.Core/Services/MemberService.cs # src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs # src/Umbraco.Infrastructure/Security/MemberUserStore.cs
This commit is contained in:
@@ -24,6 +24,12 @@ namespace Umbraco.Cms.Core.Models.ContentEditing
|
||||
[DataMember(Name = "email")]
|
||||
public string? Email { get; set; }
|
||||
|
||||
[DataMember(Name = "isLockedOut")]
|
||||
public bool IsLockedOut { get; set; }
|
||||
|
||||
[DataMember(Name = "isApproved")]
|
||||
public bool IsApproved { get; set; }
|
||||
|
||||
//[DataMember(Name = "membershipScenario")]
|
||||
//public MembershipScenario MembershipScenario { get; set; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user