Merge branch 'master' into dev
This commit is contained in:
commit
372f709f95
17 files changed
+641
-1455
No files matched your search
@@ -38,7 +38,9 @@ export default function ProfileSettings() {
|
||||
<dd>{user.username}</dd>
|
||||
</dl>
|
||||
{changePassword && (
|
||||
<Modal title="Change password">
|
||||
<Modal
|
||||
title={<FormattedMessage id="title.change-password" defaultMessage="Change password" />}
|
||||
>
|
||||
<ChangePasswordForm
|
||||
values={{ user_id }}
|
||||
onSave={handleSave}
|
||||
|
||||
Reference in new issue
Block a user