-
- ![]()
+
-
+
+ ![]()
+ ![]()
-
+
-
-
-
- Reset
-
+
+
-
+
-
- + - + Required Invalid email {{userProfileForm.email.errorMsg}} @@ -37,7 +37,7 @@ umb-auto-focus name="username" required val-server-field="Username" /> - +Required {{userProfileForm.username.errorMsg}} @@ -50,7 +50,7 @@ name="culture" required val-server-field="Culture"> - +Required {{userProfileForm.username.errorMsg}} @@ -129,7 +129,7 @@ @@ -180,7 +180,7 @@- ++ ng-if="model.avatarFile.uploadStatus === 'uploading'" + progress="{{ model.avatarFile.uploadProgress }}" + size="s"> + class="umb-user-group-preview__action" + ngf-select ng-model="filesHolder" + ngf-change="model.changeAvatar($files, $event)" + ngf-multiple="false" + ngf-pattern="{{model.acceptedFileTypes}}" + ngf-max-size="{{ model.maxFileSize }}">-Change photo + ng-if="model.user.avatars" + class="umb-user-group-preview__action umb-user-group-preview__action--red" + ng-click="model.clearAvatar()" + prevent-default>Remove photo @@ -224,9 +224,9 @@+-+-+---+ --- --+- -+++ +++ ++ config="model.changePasswordModel.config"> - -++--Status :+-{{model.user.userDisplayState.name}} - -+- -+ +-++-Last login :+-{{ model.user.formattedLastLogin }} {{ model.user.name | umbWordLimit:1 }}has not logged in yet -++-Failed login attempts :+-{{ model.user.failedPasswordAttempts }}-++-Last lockout date :+-{{ model.user.name | umbWordLimit:1 }}hasn't been locked out @@ -364,11 +364,11 @@-++-Password is last changed :+-The password hasn't been changed @@ -376,43 +376,40 @@-++-User is created :+-{{ model.user.formattedCreateDate }}-+diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 891e04d3a2..6c2d663451 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -148,6 +148,7 @@+-User is last updated :+-{{ model.user.formattedUpdateDate }}-- - + ---Id : -- {{ model.user.id }} --- {{ model.user.key }} -++-++Id : ++ {{ model.user.id }} +++ {{ model.user.key }} +Content rollback performed by user Content Send To Publish performed by user Content Send To Translation performed by user +Sort child items performed by user Copy Publish Move @@ -157,6 +158,7 @@Rollback Send To Publish Send To Translation +Sort To change the document type for the selected content, first select from the list of valid types for this location. @@ -282,7 +284,7 @@Document Type without a template New folder New data type -New javascript file +New JavaScript file New empty partial view New partial view macro New partial view from snippet @@ -440,6 +442,8 @@Enter a message... Your username is usually your email #value or ?key=value +Enter alias... +Generating alias... Allowed child node types @@ -557,6 +561,7 @@Hide History Icon +Id Import Info Inner margin @@ -608,7 +613,7 @@Permissions Scheduled Publishing Search -Sorry, we can not find what you are looking for +Sorry, we cannot find what you are looking for No items have been added Server Settings @@ -1102,7 +1107,7 @@ To manage your website, simply open the Umbraco back office and start adding conRole based protection -using Umbraco's member groups.]]> +If you wish to control access to the page using role-based authentication, using Umbraco's member groups. You need to create a membergroup before you can use role-based authentication Error Page Used when people are logged on, but do not have access @@ -1166,11 +1171,13 @@ To manage your website, simply open the Umbraco back office and start adding conEnter the link -Reset +Reset crop Define crop Give the crop an alias and its default width and height Save crop Add new crop +Done +Undo edits Current version @@ -1259,6 +1266,7 @@ To manage your website, simply open the Umbraco back office and start adding conSent For Approval Changes have been sent for approval Media saved +Member group saved Media saved without any errors Member saved Stylesheet Property Saved diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index f9138f3baf..97f187938f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -153,6 +153,7 @@Content rollback performed by user Content Send To Publish performed by user Content Send To Translation performed by user +Sort child items performed by user Copy Publish Move @@ -162,6 +163,7 @@Rollback Send To Publish Send To Translation +Sort To change the document type for the selected content, first select from the list of valid types for this location. @@ -301,7 +303,7 @@Document Type without a template New folder New data type -New javascript file +New JavaScript file New empty partial view New partial view macro New partial view from snippet @@ -459,6 +461,8 @@Enter a message... Your username is usually your email #value or ?key=value +Enter alias... +Generating alias... Allowed child node types @@ -576,6 +580,7 @@Hide History Icon +Id Import Info Inner margin @@ -627,7 +632,7 @@Permissions Scheduled Publishing Search -Sorry, we can not find what you are looking for +Sorry, we cannot find what you are looking for No items have been added Server Settings @@ -1121,7 +1126,7 @@ To manage your website, simply open the Umbraco back office and start adding conRole based protection -using Umbraco's member groups.]]> +If you wish to control access to the page using role-based authentication, using Umbraco's member groups. You need to create a membergroup before you can use role-based authentication Error Page Used when people are logged on, but do not have access @@ -1184,11 +1189,13 @@ To manage your website, simply open the Umbraco back office and start adding conEnter the link -Reset +Reset crop Define crop Give the crop an alias and its default width and height Save crop Add new crop +Done +Undo edits Current version @@ -1277,6 +1284,7 @@ To manage your website, simply open the Umbraco back office and start adding conMedia saved Media saved without any errors Member saved +Member group saved Stylesheet Property Saved Stylesheet saved Template saved diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs index 9f6747ea95..cf791957db 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs @@ -71,7 +71,7 @@ namespace Umbraco.Web.Models.Mapping } else { - var umbracoProvider = (IUmbracoMemberTypeMembershipProvider) provider; + var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider; //This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier // if we just had all of the membeship provider fields on the member table :( @@ -112,11 +112,18 @@ namespace Umbraco.Web.Models.Mapping protected override IEnumerableGetCustomGenericProperties(IContentBase content) { - var member = (IMember) content; + var member = (IMember)content; var membersProvider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); var genericProperties = new List { + new ContentPropertyDisplay + { + Alias = string.Format("{0}id", Constants.PropertyEditors.InternalGenericPropertiesPrefix), + Label = _localizedTextService.Localize("general/id"), + Value = new List {member.Id.ToString(), member.Key.ToString()}, + View = "idwithguid" + }, new ContentPropertyDisplay { Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}doctype", diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs index cbd4e69a9e..943180bb20 100644 --- a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs @@ -124,14 +124,9 @@ namespace Umbraco.Web.PropertyEditors var id = item.Property("id")?.Value?.Value () ?? 0; if (id >= nextId) nextId = id + 1; - - // if using a label, replace color by json blob - // (a pity we have to serialize here!) - if (output.UseLabel) - { - var label = item.Property("label")?.Value?.Value (); - value = JsonConvert.SerializeObject(new { value, label }); - } + + var label = item.Property("label")?.Value?.Value (); + value = JsonConvert.SerializeObject(new { value, label }); output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value }); } diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs index bbf3ee1283..4979a59d45 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs @@ -93,7 +93,7 @@ namespace Umbraco.Web.Routing } if (string.IsNullOrWhiteSpace(v)) return false; v = "," + v.Replace(" ", "") + ","; - return v.Contains(a1) || v.Contains(a2); + return v.InvariantContains(a1) || v.InvariantContains(a2); } // fixme - even with Linq, what happens below has to be horribly slow