Commit Graph
5334 Commits
Author SHA1 Message Date
Mike Cao 554054d3a1 Merged nav menus. 2025-09-25 20:46:00 -07:00
Mike Cao 2f5e69229c Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 15:58:34 -07:00
Mike Cao 805b3ec853 WIP: Nav merge 2025-09-25 15:58:25 -07:00
Francis Cao 5bbc1a94b3 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-09-25 11:31:26 -07:00
Francis Cao c28c022366 update FilterEditForm for pixels/links, update attribution action dropdown 2025-09-25 11:31:16 -07:00
Mike Cao dfc6161a53 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/share/[...shareId]/Header.tsx
2025-09-25 11:23:36 -07:00
Mike Cao 1b400da7b2 Fixed share page. Updated device detect. Updated teams fetch. 2025-09-25 11:21:44 -07:00
Francis Cao f11773ad3f fix user delete and Logo import 2025-09-24 16:44:58 -07:00
Francis Cao ce1120c3ff fix comparison for d in generateTimeSeries 2025-09-24 11:07:13 -07:00
Francis Cao b777441788 correct date labeling for previous pageviews/sessions 2025-09-24 11:04:22 -07:00
Francis Cao 9d49eaebac fix cohort query for retention report, add filters to weekly traffic route 2025-09-24 10:06:34 -07:00
Mike Cao 27c342811e Added label to PageHeader. Style fixes. 2025-09-24 00:07:17 -07:00
Mike Cao 8115709a8b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
2025-09-23 23:10:05 -07:00
Mike Cao 83a014e884 Use FormattedMessage. Updated icons. Fixed bugs. 2025-09-23 23:08:40 -07:00
Mike Cao 3afe843461 Fixed ISO countries. 2025-09-23 17:49:36 -07:00
Mike Cao c51dd7e606 Merge branch 'master' into dev
# Conflicts:
#	.github/workflows/cd-manual.yml
#	.github/workflows/cd.yml
#	.github/workflows/ci.yml
#	src/lib/detect.ts
2025-09-23 17:43:24 -07:00
Mike CaoandGitHub 050df528a6 Merge pull request #3629 from kronthto/patch-1
Incomplete ISO Countries Constants
2025-09-23 17:39:41 -07:00
Francis Cao 8c703eff93 resolve bug. reset queryparams when selecting segment/cohort from screens. add cohort prefix to event and path 2025-09-23 15:00:07 -07:00
Francis Cao 1a5c7df671 Fix broken icons, remove showActions from TeamsTable, fix margins for pixel/link overview 2025-09-23 13:55:27 -07:00
Mike Cao ee70baaeb7 Fixed admin link. 2025-09-23 09:56:38 -07:00
Mike Cao b115131f4c Fixed async issues. 2025-09-23 09:20:51 -07:00
Mike Cao f639bb07f4 Added menu options for cloud mode. Async fixes. 2025-09-23 09:14:01 -07:00
Tobias KronthalerandGitHub cb209eee81 Fix map display for DACH 2025-09-23 10:09:58 +02:00
Mike Cao 4df6f06485 Added scrolling menu. 2025-09-22 22:45:37 -07:00
Mike Cao 6faf16e9aa Convert all mutate to mutateAsync. 2025-09-22 22:39:25 -07:00
Mike CaoandGitHub 6497cd0cd4 Merge pull request #3611 from halkeye/migrate-docker-gha
Migrate to docker actions
2025-09-22 22:29:46 -07:00
Mike CaoandGitHub 3a4f4c1e27 Merge pull request #3627 from malwarepad/master
URGENT! Resolve IPv6 address destruction on GeoIP query
2025-09-22 22:26:33 -07:00
Mike Cao 980e4e6b41 Fixed funnel report saving invalid data. 2025-09-22 22:03:26 -07:00
Mike Cao bf16ade184 Updated icons. 2025-09-22 20:11:31 -07:00
Mike Cao d8b3c8d13c Pass headers for links and pixels. 2025-09-22 14:19:57 -07:00
Mike Cao 656fb8a3d1 Removed duplicate saved messages. 2025-09-22 14:10:35 -07:00
Mike Cao 5c9f97182e Removed grant checks. 2025-09-22 13:57:42 -07:00
Mike Cao 48c7028a3a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pnpm-lock.yaml
2025-09-22 13:11:04 -07:00
Mike Cao 9897c725de Updated cloud mode checks. 2025-09-22 13:09:07 -07:00
Francis Cao 26bd498a05 add margin to website layout. remove from overview 2025-09-22 11:01:58 -07:00
Panagiotis 7d9fe30626 Resolve IPv6 address destruction 2025-09-21 22:56:59 +03:00
Mike Cao d8075764e2 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
2025-09-19 18:01:42 -07:00
Mike Cao 7effa16f00 Updated edit permissions on settings components. 2025-09-19 17:58:52 -07:00
Francis Cao c66553c023 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-09-19 11:32:39 -07:00
Francis Cao 5767208d8c push to websites on login, css fix for teams screens 2025-09-19 11:32:20 -07:00
Mike Cao ffc8f6faae Fixed config fetch. 2025-09-18 15:38:55 -07:00
Mike Cao 2a559aa661 Replaced server action with api route. 2025-09-18 11:32:21 -07:00
Mike Cao 93e71d900f Updated settings button. 2025-09-18 10:37:42 -07:00
Mike Cao 1c7f9da320 Updated redirect config. 2025-09-17 22:41:54 -07:00
Mike Cao a84b890b23 Merge remote-tracking branch 'origin/dev' into dev 2025-09-17 22:04:24 -07:00
Mike Cao 0ae5c28da7 Export preference components. Updates for cloud. 2025-09-17 22:03:58 -07:00
Mike CaoandGitHub 9c36f76e1b Merge pull request #3623 from nickcmaynard/fix-ci
Add setup-pnpm to hopefully fix CI tests etc.
2025-09-17 21:43:28 -07:00
Nick Maynard b2c829a077 Add setup-pnpm to hopefully fix CI tests etc. 2025-09-17 21:37:57 +01:00
Francis Cao 6d9d8b353f update property names for list table to label, count, percent 2025-09-17 11:43:58 -07:00
Mike Cao 23838c57fb Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-09-17 08:38:19 -07:00