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 branch 'dev' of https://github.com/umami-software/umami into dev

Browse source 
# Conflicts:
#	src/components/metrics/ReferrersTable.tsx
This commit is contained in:
Mike Cao 2025-08-07 10:08:14 -07:00
commit 274d654833
17 changed files with 137 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx
View file

@ -25,7 +25,7 @@ export function FieldSelectForm({
};
return (
<Column width="300px" gap="6">
<Column gap="6">
<List value={selected} onChange={handleChange} selectionMode="multiple">
{fields.map(({ name, label }) => {
return (

19
src/app/(main)/websites/[websiteId]/WebsiteNav.tsx
View file

@ -11,8 +11,6 @@ import {
Tag,
Money,
Network,
UserPlus,
ChartPie,
} from '@/components/icons';
import { useMessages, useNavigation } from '@/components/hooks';
import { SideMenu } from '@/components/common/SideMenu';
@ -89,23 +87,6 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {
},
],
},
{
label: formatMessage(labels.segments),
items: [
{
id: 'segments',
label: formatMessage(labels.segments),
icon: <ChartPie />,
path: renderPath('/segments'),
},
{
id: 'cohorts',
label: formatMessage(labels.cohorts),
icon: <UserPlus />,
path: renderPath('/cohorts'),
},
],
},
{
label: formatMessage(labels.growth),
items: [