watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' into dev

Browse source
This commit is contained in:
Mike Cao 2020-09-12 04:37:02 -07:00
commit 372f709f95
17 changed files with 641 additions and 1455 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/settings/ProfileSettings.js
View file

@ -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}