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

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/queries/sql/getChannelMetrics.ts
This commit is contained in:
Mike Cao 2025-07-29 19:15:55 -07:00
commit 554c627a58
5 changed files with 828 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/metrics/EventsChart.tsx
View file

@ -55,7 +55,7 @@ export function EventsChart({ websiteId, focusLabel }: EventsChartProps) {
}, [focusLabel]);
return (
<LoadingPanel isLoading={isLoading} error={error}>
<LoadingPanel isLoading={isLoading} error={error} minHeight="400px">
{chartData && (
<BarChart
chartData={chartData}