Mike Cao
b552868e0a
Merge branch 'dev' into jajaja
...
# Conflicts:
# next.config.ts
# src/app/(main)/settings/preferences/LanguageSetting.tsx
# src/components/hooks/useConfig.ts
2025-07-27 02:11:32 -07:00
Mike Cao
2ad624ccc8
Added segment filtering to filter form.
2025-07-27 02:08:19 -07:00
Mike Cao
827c1074b6
Merge branch 'dev' into analytics
2025-07-24 23:38:09 -07:00
Mike Cao
5b6292dd11
Converted variables to be runtime.
2025-07-24 22:41:23 -07:00
Mike Cao
2e69e57445
Support event type filtering.
2025-07-24 16:09:49 -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
90682b79d2
Merge branch 'dev' of https://github.com/umami-software/umami into analytics
2025-07-17 11:22:21 -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
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
b2a6e3f842
Merge pull request #3505 from eoussama/master
...
Added optional website ID for creation
2025-07-07 22:58:16 -07:00
Mike Cao
b78ff3b477
New admin section.
2025-07-06 08:22:29 -07:00
Mike Cao
cdf391d5c2
Refactor part 2: Electric Boogaloo. Standardize way of passing filter parameters.
2025-07-04 01:23:11 -07:00
Francis Cao
e75d009df3
implement cohorts to clickhouse/pg library and all relevant queries
2025-07-03 12:06:49 -07:00
Mike Cao
ee6c68d27c
Refactor filter handling for queries.
2025-07-02 01:44:12 -07:00
Mike Cao
5b300f1ff5
Updated events/sessions pages. Added DateDistance component.
2025-06-30 21:34:56 -07:00
Alex Escalante
26ddfd5a80
Sanitize IP to remove port for geolocation lookup
...
Sanitize IP address to remove port number before geolocation lookup. This ensures proper MaxMind database resolution in setups where IP:PORT is passed by the proxy.
2025-06-30 18:40:21 -06:00
Mike Cao
8b64029409
Made filters work for all reports.
2025-06-29 23:57:11 -07:00
Mike Cao
ea83afbc13
Fixed retention report showing wrong dates. Changed Breakdown field select to modal.
2025-06-29 15:36:43 -07:00
Mike Cao
ee8750d9df
Update Retention report.
2025-06-28 21:16:50 -07:00
Francis Cao
a753809a74
Merge branch 'dev' of https://github.com/umami-software/umami into feat/add-segments
2025-06-26 09:12:51 -07:00
Mike Cao
5171bdaf47
Use getRequestDateRange in all routes.
2025-06-25 22:53:07 -07:00
Mike Cao
5ca51b3e8f
Updated date range handling.
2025-06-25 14:27:17 -07:00
Francis Cao
657ae8ebdb
udpate constants and references to filter groups
2025-06-24 11:09:36 -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
Francis Cao
5ffafc71fc
finish segments, update migration from filters to parameters
2025-06-20 10:27:57 -07:00
Mike Cao
da173779e0
Website compare fix. Updated date functions.
2025-06-19 00:40:21 -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
3a737e7e25
Fixed bar chart rendering.
2025-06-18 21:31:42 -07:00
Mike Cao
f41c9a635f
Merge pull request #3456 from vedantbhavsar26/feat-1
...
fix: decode location fields in user detection
2025-06-18 14:30:24 -07:00
Francis Cao
8408bbd25c
add api routes for segments
2025-06-17 10:08:08 -07:00
Mike Cao
da8c7e99c5
Unified loading states.
2025-06-13 21:13:11 -07:00
Francis Cao
f61421b742
segments implementation and migration update. update getRequestFilters to include filter groups.
2025-06-13 07:34:54 -07:00
Mike Cao
095d1f2070
Updates to Revenue report.
2025-06-11 23:12:10 -07:00
Francis Cao
1ccc8a1a86
Merge branch 'dev' of https://github.com/umami-software/umami into feat/add-segments
2025-06-11 06:46:31 -07:00
Mike Cao
4995a0e1e4
Fixed attribution report. New metric cards. Converted ListTable.
2025-06-11 00:05:34 -07:00
Mike Cao
e3cc19638c
Breakdown report.
2025-06-10 20:59:27 -07:00
Mike Cao
79ea9974b7
Added attribution report page.
2025-06-09 00:42:09 -07:00
Mike Cao
0027502707
Merge branch 'dev' into jajaja
...
# Conflicts:
# src/lib/detect.ts
# src/queries/sql/reports/getRevenue.ts
2025-06-08 22:26:26 -07:00
Mike Cao
01bd21c5b4
Updated reports.
2025-06-08 22:21:28 -07:00
Mike Cao
2af95b5802
Upgraded Prisma, use new query compiler. Removed old reports.
2025-06-07 00:15:30 -07:00