Commit Graph
100 Commits
Author SHA1 Message Date
Mike Cao 2993db14f0 Updated README. 2025-12-03 19:37:51 -08:00
Mike Cao 1483241494 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-12-03 18:39:45 -08:00
Mike Cao 3379cc6e89 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pnpm-lock.yaml
2025-11-28 00:34:12 -08:00
Mike Cao d7fd22645c Fixed nav menus. 2025-11-28 00:33:53 -08:00
Mike Cao aaa1f9dc58 Merge branch 'dev' 2025-11-18 10:27:02 -08:00
Mike Cao d23ad5f272 Merge branch 'master' into dev
# Conflicts:
#	.github/workflows/cd.yml
#	package.json
#	pnpm-lock.yaml
#	src/lib/date.ts
#	src/lib/schema.ts
2025-10-04 13:38:58 -07:00
Mike Cao 35c27589b7 Updated workflow to only run on tag publish. 2025-10-04 13:32:40 -07:00
Mike Cao aaf92058d4 Merge remote-tracking branch 'origin/master' 2025-10-04 12:36:49 -07:00
Mike Cao b152cfe480 Added workflow to delete untagged images. 2025-10-04 12:36:39 -07:00
Mike Cao 82813f312a Added workflow to delete untagged images. 2025-10-04 12:12:39 -07:00
Mike Cao 2d0104382c Don't build Docker images for dev. 2025-10-04 11:44:37 -07:00
Mike Cao 5c0dacf58d Fix build. 2025-10-04 11:29:34 -07:00
Mike Cao 03adb6b7e1 Added website check for cloud. 2025-10-04 00:38:10 -07:00
Mike Cao ed013d5d58 Fixed spacing issue in confirmation form. 2025-10-04 00:04:11 -07:00
Mike Cao 8e05921227 Try to fix avatar. 2025-10-01 00:23:09 -07:00
Mike Cao 25e8e18b73 Fix Avatar for Vercel. 2025-10-01 00:00:40 -07:00
Mike Cao 257050f749 Updated edit forms and icons. 2025-09-26 01:46:36 -07:00
Mike Cao 554054d3a1 Merged nav menus. 2025-09-25 20:46:00 -07: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
Mike Cao ffc8f6faae Fixed config fetch. 2025-09-18 15:38:55 -07:00
Mike Cao 03933bea7a Merge remote-tracking branch 'origin/dev' into dev 2025-09-17 08:38:13 -07:00
Mike Cao 8150b86a9c Fixed websites lookup. 2025-09-17 08:37:41 -07:00
Mike Cao aa7d3cd1aa New components build. 2025-09-08 22:52:43 -07:00
Mike Cao c60e8b3d23 Moved panel button. 2025-08-09 17:46:27 -07:00
Mike Cao 827c1074b6 Merge branch 'dev' into analytics 2025-07-24 23:38:09 -07:00
Mike Cao 25f96f6b6b Fixed nav display. 2025-07-20 00:38:15 -07:00
Mike Cao 2f7f8911cd Merge branch 'dev' into jajaja
# Conflicts:
#	pnpm-lock.yaml
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
#	src/queries/sql/sessions/getWebsiteSessionsWeekly.ts
2025-07-18 10:13:21 -07:00
Mike Cao 876f4c883e Updated layout. Fixed properties rendering. 2025-07-18 00:22:06 -07:00
Mike Cao 01bfd7f52e New properties screens. New website nav. 2025-07-17 01:18:31 -07:00
Mike Cao a9a9b57f80 Merge branch 'dev' into jajaja
# Conflicts:
#	pnpm-lock.yaml
#	src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
#	src/components/messages.ts
#	src/lib/constants.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
2025-07-15 13:01:50 -07:00
Mike Cao a534c51b5e New website nav. 2025-07-15 03:35:18 -07:00
Mike Cao 5e6799a715 Fixed properties queries. 2025-07-15 01:31:08 -07:00
Mike Cao 465a03f987 Fixed paging in events/sessions. 2025-07-13 21:10:59 -07:00
Mike Cao 8c26e310f7 Fixed editing and navigation issues. 2025-07-13 00:37:43 -07:00
Mike Cao bf6c9395c6 Revert Prisma build. 2025-07-12 15:18:01 -07:00
Mike Cao 77131158f7 Updated build config for Vercel. 2025-07-12 14:41:10 -07:00
Mike Cao 514ea70d2a Removed queryCompiler. 2025-07-12 14:24:51 -07:00
Mike Cao b255b4738f Fixed imports. 2025-07-12 14:12:59 -07:00
Mike Cao 2a8c707519 Updated db build again. 2025-07-12 14:08:15 -07:00
Mike Cao 2dbe80b7ca Updated db build. 2025-07-12 13:56:45 -07:00
Mike Cao 3650204519 Styling for all forms. 2025-07-12 13:20:32 -07:00
Mike Cao c98f324c22 Settings refactor. 2025-07-11 22:55:30 -07:00
Mike Cao 1b81074752 Admin section updates. 2025-07-10 20:04:17 -07:00
Mike Cao 87449ece9e Merge branch 'dev' into jajaja
# Conflicts:
#	db/postgresql/schema.prisma
#	pnpm-lock.yaml
#	src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
#	src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
#	src/app/api/reports/route.ts
#	src/app/api/websites/[websiteId]/events/series/route.ts
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/app/api/websites/[websiteId]/pageviews/route.ts
#	src/app/api/websites/[websiteId]/sessions/stats/route.ts
#	src/app/api/websites/[websiteId]/stats/route.ts
#	src/app/api/websites/[websiteId]/values/route.ts
#	src/components/hooks/useFields.ts
#	src/components/hooks/useFilterParams.ts
#	src/lang/vi-VN.json
#	src/lib/clickhouse.ts
#	src/lib/detect.ts
#	src/lib/prisma.ts
#	src/lib/request.ts
#	src/lib/schema.ts
#	src/lib/types.ts
#	src/queries/sql/events/getEventDataFields.ts
#	src/queries/sql/events/getEventDataProperties.ts
#	src/queries/sql/events/getEventDataStats.ts
#	src/queries/sql/events/getEventDataValues.ts
#	src/queries/sql/events/getEventMetrics.ts
#	src/queries/sql/events/getWebsiteEvents.ts
#	src/queries/sql/getChannelMetrics.ts
#	src/queries/sql/getRealtimeActivity.ts
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/pageviews/getPageviewStats.ts
#	src/queries/sql/reports/getBreakdown.ts
#	src/queries/sql/sessions/getSessionDataProperties.ts
#	src/queries/sql/sessions/getSessionDataValues.ts
#	src/queries/sql/sessions/getSessionMetrics.ts
#	src/queries/sql/sessions/getSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
2025-07-08 22:03:55 -07:00
Mike Cao 5ed1d710cb Merge branch 'master' into jajaja
# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/lib/detect.ts
2025-07-08 18:45:02 -07:00
Mike Cao ce1f6c3618 New admin section. 2025-07-08 18:40:47 -07:00
Mike Cao 6d1603fa28 New share URL form. 2025-06-21 01:45:36 -07:00
Mike Cao 543674c7f2 Updated hooks. Changed url, host to path, hostname. 2025-06-20 22:35:02 -07:00
Mike Cao 25a9c011b3 Removed check-lang script. 2025-06-20 09:42:37 -07:00
Mike Cao bc1bd35efc Updated packages. 2025-06-20 09:26:48 -07:00
Mike Cao 0a43ef7b1b Filtering via FilterBar. 2025-06-19 16:47:18 -07:00
Mike Cao da173779e0 Website compare fix. Updated date functions. 2025-06-19 00:40:21 -07:00
Mike Cao 5a85433e63 Fix CI. 2025-06-18 22:48:03 -07:00
Mike Cao a1654e88af Update CI. 2025-06-18 22:46:05 -07:00
Mike Cao fb7f671b32 Upgraded Prisma v6.10.1. 2025-06-18 22:13:51 -07:00
Mike Cao 8abb470234 Merge branch 'dev' into jajaja 2025-06-18 21:43:58 -07:00
Mike Cao c61f089729 Pass original date in dataset. 2025-06-18 21:43:38 -07:00
Mike Cao 3a737e7e25 Fixed bar chart rendering. 2025-06-18 21:31:42 -07:00
Mike Cao 96fcdefeed Updated Goal loading. 2025-06-18 20:12:42 -07:00
Mike Cao f444c6373d Updated packages. Fixed loading errors. 2025-06-18 01:39:12 -07:00
Mike Cao 883fd2580f Merge branch 'master' into dev 2025-06-08 22:10:42 -07:00
Mike Cao 99330a1a4d Refactored icons. 2025-05-27 00:50:28 -07:00
Mike Cao 18eceee4c4 Updated SVG generation. 2025-05-26 23:13:15 -07:00
Mike Cao 6235aaf1c7 Merge branch 'dev' into analytics 2025-05-09 23:03:40 -07:00
Mike Cao 42be91b736 Bump version v2.18.1. 2025-05-09 23:03:16 -07:00
Mike Cao f91dc8e73d Merge branch 'dev' into analytics 2025-05-09 21:48:42 -07:00
Mike Cao d18b0271c9 Merge branch 'analytics' of https://github.com/umami-software/umami into analytics 2025-05-09 20:05:14 -07:00
Mike Cao 0cdb374130 Merge branch 'dev' into analytics 2025-05-09 20:04:28 -07:00
Mike Cao 1552a3f2f1 Merge branch 'dev' 2025-05-08 00:13:59 -07:00
Mike Cao 1ed74d5769 Merge branch 'dev' into analytics 2025-05-07 16:17:16 -07:00
Mike Cao 36b3233d4e Merge branch 'dev' into analytics 2025-05-07 14:40:47 -07:00
Mike Cao aa5fa0a07e Merge branch 'dev' into analytics 2025-05-01 00:49:34 -07:00
Mike Cao 64d4418d94 Merge branch 'dev' into analytics 2025-05-01 00:14:18 -07:00
Mike Cao 54dbb43b5c Merge branch 'dev' into analytics 2025-04-30 10:09:05 -07:00
Mike Cao 9d3c926d69 Removed prisma config. 2025-04-28 21:24:57 -07:00
Mike Cao fe2fcf2082 Removed files. 2025-04-28 20:52:22 -07:00
Mike Cao 79b4c1312e Merge branch 'dev' into analytics 2025-04-25 21:59:57 -07:00
Mike Cao dcd04e8572 Merge branch 'analytics' into dev 2025-04-25 10:25:05 -07:00
Mike Cao caae77c576 Merge branch 'dev' into analytics 2025-04-15 10:05:47 -07:00
Mike Cao 2f77e15bbc Bump version v2.18.0. 2025-04-08 08:47:50 -07:00
Mike Cao 1d24e23a34 Updated grid layouts. Fixed chart tooltip. 2025-04-06 08:13:55 -07:00
Mike Cao 96c2c32d14 Website header updates. 2025-04-04 23:26:52 -07:00
Mike Cao 2b99274895 Updated filter bar. 2025-04-02 23:18:03 -05:00
Mike Cao 34a8fa100c Updated theme handling. 2025-04-01 22:58:38 -05:00
Mike Cao c71e9b5707 Merge branch 'dev' into jajaja
# Conflicts:
#	package.json
#	yarn.lock
2025-03-31 23:31:09 -05:00
Mike Cao 97b7a14a29 Fix test. 2025-03-31 22:49:34 -05:00
Mike Cao 16f1b15dee Added search to settings. 2025-03-16 22:12:13 -07:00
Mike Cao e1e6493dec Lint fixes. 2025-03-08 08:40:41 -08:00
Mike Cao c948bbca12 Merge branch 'jajaja' of https://github.com/umami-software/umami into jajaja 2025-03-08 08:09:18 -08:00
Mike Cao 38ab685143 Merge branch 'dev' 2025-03-07 21:46:44 -08:00
Mike Cao 1205fc8c01 Merge branch 'jajaja' of https://github.com/umami-software/umami into jajaja 2025-03-05 16:31:00 -08:00
Mike Cao cfc3662c29 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-03-01 20:28:08 -08:00
Mike Cao c52774c787 Bump version 2.17.0. 2025-03-01 20:27:31 -08:00
Mike Cao 14077167ea Merge branch 'dev' into jajaja 2025-02-22 23:36:33 -05:00
Mike Cao 75b0b2e677 Make user id optional. 2025-02-22 08:09:01 -08:00
Mike Cao a7ded80fb2 Fixed channels query. Closes #3245 2025-02-21 18:33:42 -08:00
Mike Cao 0aad3d8e05 Lookup location for payload IPs. Removed hostname from session id. 2025-02-21 18:11:52 -08:00
Mike Cao e060f2b240 Merge branch 'master' into dev 2025-02-21 17:50:03 -08:00
Mike Cao dc084b78a8 Fixed user create. 2025-02-21 17:47:59 -08:00