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

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	package.json
#	src/components/hooks/useTimezone.ts
#	yarn.lock
This commit is contained in:
Mike Cao 2025-02-19 22:55:40 -08:00
commit edb7022c55
13 changed files with 117 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
View file

@ -52,7 +52,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
},
];
const getTime = ({ createdAt, firstAt }) => formatTimezoneDate(firstAt || createdAt, 'h:mm:ss');
const getTime = ({ createdAt, firstAt }) => formatTimezoneDate(firstAt || createdAt, 'pp');
const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);