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

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Brian Cao 2024-03-24 11:36:13 -07:00
commit 03eeb6a022
27 changed files with 430 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/input/DateFilter.tsx
View file

@ -59,7 +59,15 @@ export function DateFilter({
label: formatMessage(labels.lastDays, { x: 90 }),
value: '90day',
},
{ label: formatMessage(labels.thisYear), value: '0year' },
{ label: formatMessage(labels.thisYear), value: '0year', divider: true },
{
label: formatMessage(labels.lastMonths, { x: 6 }),
value: '6month',
},
{
label: formatMessage(labels.lastMonths, { x: 12 }),
value: '12month',
},
showAllTime && {
label: formatMessage(labels.allTime),
value: 'all',