lly/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,329 Commits 1 Branch 0 Tags
dfc6161a53a2c4b71e959e2a5047c231afcd6f2d
Commit Graph
384 Commits
Author SHA1 Message Date
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 9d49eaebac fix cohort query for retention report, add filters to weekly traffic route 2025-09-24 10:06:34 -07:00
Mike Cao 04c06443a8 Merge branch 'master' into dev 
# Conflicts:
#	.github/workflows/ci.yml
#	src/lang/es-ES.json
#	src/lang/sl-SI.json
#	src/lib/constants.ts
#	src/lib/detect.ts
#	src/queries/sql/reports/getRevenue.ts
 2025-09-16 21:11:12 -07:00
Mike Cao 433ce98719 Allow getting team websites. 2025-09-12 08:21:29 -07:00
Mike Cao e610de383a Fix for schema selection in pg adapter. 2025-09-11 12:37:24 -07:00
Francis Cao f3125c2add clean up funnel migration and report errors 2025-09-10 16:38:51 -07:00
Mike Cao f40e1b44f3 Updates for cloud mode. 2025-09-04 20:27:42 -07:00
Mike Cao 56af91950a Updated components build. 2025-09-01 15:59:06 -07:00
Mike Cao bab4f8ebcc Cohort selection. 2025-08-28 23:29:42 -07:00
Mike Cao 08f9adaddf Updated expanded view. Some style fixes. 2025-08-23 03:05:21 -07:00
Mike Cao c8fe93dd9d Refactored tables. 2025-08-23 01:12:37 -07:00
Francis Cao 65024d4bf7 fix search for segments, fix hooks endpoint for cohorts 2025-08-19 16:20:21 -07:00
Francis Cao 2f1f704728 implement filtering and cohorts to all relevant queries 2025-08-19 15:26:41 -07:00
Mike Cao 0ac8bd41b6 Pixel route. 2025-08-18 15:49:10 -07:00
Mike Cao 3c5c1e48e9 Refactored settings. Updated sidebar. 2025-08-15 22:16:28 -07:00
Mike Cao d130242a0a Pixel editing. 2025-08-15 13:04:13 -07:00
Mike Cao 0558563d35 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-08-15 10:08:41 -07:00
Mike Cao 247e14646b Pixel/links development. New validations folder. More refactoring. 2025-08-14 23:48:11 -07:00
Mike Cao 88639dfe83 New schema for pixels and links. 2025-08-13 20:27:54 -07:00
Francis Cao 69aa4ca035 cleanup cohort/filtering for some queries 2025-08-12 16:13:44 -07:00
Francis Cao 6829d96862 update UTM report to use new UTM columns 2025-08-12 11:30:46 -07:00
Mike Cao 274d654833 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	src/components/metrics/ReferrersTable.tsx
 2025-08-07 10:08:14 -07:00
Francis Cao 38f251ead5 finish expanded queries and ui. 2025-08-07 09:47:18 -07:00
Mike Cao 2e67e27b2f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/app/(main)/App.tsx
 2025-08-07 05:16:07 -07:00
Francis Cao 0a0c1f27c6 implement pageviews, events, and channels queries 2025-08-05 00:37:44 -07:00
Francis Cao c1cad16cb9 implement sessions metric expanded queries 2025-08-04 18:27:31 -07:00
Mike Cao 2dbcf63eeb Segment editing. 2025-07-31 21:32:22 -07:00
Francis Cao c8b4ee8ca5 update psql getChannelMetrics 2025-07-31 09:45:19 -07:00
Mike Cao fba7e12c36 Updated segment handling. 2025-07-31 02:33:35 -07:00
Mike Cao 554c627a58 Merge branch 'dev' into jajaja 
# Conflicts:
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/queries/sql/getChannelMetrics.ts
 2025-07-29 19:15:55 -07:00
Francis Cao 86e0fc2262 convert clickhouse getChannels to SQL query 2025-07-28 17:13:13 -07:00
Mike Cao 45c9ea9c22 Merge branch 'dev' into jajaja 
# Conflicts:
#	db/mysql/schema.prisma
#	package.json
#	pnpm-lock.yaml
#	src/app/(main)/reports/[reportId]/ReportBody.tsx
#	src/app/(main)/reports/[reportId]/ReportPage.tsx
#	src/app/(main)/reports/utm/UTMView.tsx
#	src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
#	src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
#	src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
#	src/app/api/reports/[reportId]/route.ts
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/components/hooks/queries/useReport.ts
#	src/components/icons.ts
#	src/components/messages.ts
#	src/components/metrics/MetricsTable.module.css
#	src/components/metrics/MetricsTable.tsx
#	src/queries/sql/events/getEventMetrics.ts
#	src/queries/sql/reports/getUTM.ts
 2025-07-23 23:39:28 -07:00
Francis Cao e8ff32b063 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-23 09:38:59 -07:00
Francis Cao 2203ba1fe7 move parseParameters to UTMView 2025-07-23 09:38:39 -07:00
Francis Cao 4dd4d66a3b Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-21 10:56:08 -07:00
Francis Cao a81b144cd6 fix get event metrics card and create it's own query 2025-07-21 10:49:48 -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
Francis Cao 90682b79d2 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2025-07-17 11:22:21 -07:00
Mike Cao 01bfd7f52e New properties screens. New website nav. 2025-07-17 01:18:31 -07:00
Francis Cao 954404f8df route to view or raw table based on filters 2025-07-15 16:26:03 -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 5e6799a715 Fixed properties queries. 2025-07-15 01:31:08 -07:00
Francis Cao 2dcb9e21bd change pagestable to visitors and update clickhouse hostname column to array 2025-07-13 22:44:09 -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 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