watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
# Conflicts:
#	components/pages/login/LoginForm.js
This commit is contained in:
Mike Cao 2023-01-11 14:48:17 -08:00
commit 53ec66e820
11 changed files with 67 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/pages/settings/users/UsersTable.js
View file

@ -57,13 +57,11 @@ export default function UsersTable({ columns = defaultColumns, onLoading, onAddK
row.action = (
<div className={styles.actions}>
<Link href={`/users/${row.id}`} shallow>
<a>
<Button>
<Icon icon="arrow-right" />
Settings
</Button>
</a>
<Link href={`/settings/users/${row.id}`}>
<Button>
<Icon icon="arrow-right" />
Settings
</Button>
</Link>
</div>
);