watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-13 00:55:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
This commit is contained in:
Mike Cao 2025-09-23 23:10:05 -07:00
commit 8115709a8b
10 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx
View file

@ -19,7 +19,7 @@ export function CohortsTable({ data = [] }) {
<DataTable data={data}>
<DataColumn id="name" label={formatMessage(labels.name)}>
{(row: any) => (
<Link href={renderUrl(`/websites/${websiteId}?cohort=${row.id}`)}>{row.name}</Link>
<Link href={renderUrl(`/websites/${websiteId}?cohort=${row.id}`, false)}>{row.name}</Link>
)}
</DataColumn>
<DataColumn id="created" label={formatMessage(labels.created)}>

4
src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx
View file

@ -18,7 +18,9 @@ export function SegmentsTable({ data = [] }) {
<DataTable data={data}>
<DataColumn id="name" label={formatMessage(labels.name)}>
{(row: any) => (
<Link href={renderUrl(`/websites/${websiteId}?segment=${row.id}`)}>{row.name}</Link>
<Link href={renderUrl(`/websites/${websiteId}?segment=${row.id}`, false)}>
{row.name}
</Link>
)}
</DataColumn>
<DataColumn id="created" label={formatMessage(labels.created)}>