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

2024-03-24 11:36:13 -07:00
parent c4d0c433c0 5daad2726e
commit 03eeb6a022
27 changed files with 430 additions and 300 deletions
--- a/src/components/input/DateFilter.tsx
+++ b/src/components/input/DateFilter.tsx
@@ -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',