Commit Graph
100 Commits
Author SHA1 Message Date
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 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
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 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
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 Cao 23838c57fb Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-09-17 08:38:19 -07:00
Mike Cao 3acb34d599 Merge branch 'master' into dev 2025-09-16 22:45:10 -07:00
Mike Cao a4a9d6c227 Added stripPort function. Reorganized constants. 2025-09-16 21:23:08 -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 460200dfef useApi should return an actual Error. 2025-09-14 23:57:15 -07:00
Mike Cao fc01ee9f56 Get localized error messages. 2025-09-14 23:43:22 -07:00
Mike Cao baba06c692 Added lib/password. Small tweaks. 2025-09-13 09:40:20 -07:00
Mike Cao 9ccafc390a Add includeTeams param for fetching websites. 2025-09-12 10:15:13 -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
Mike Cao 366c52d703 Merge remote-tracking branch 'origin/dev' into dev 2025-09-10 17:16:15 -07:00
Mike Cao 67105f2cff Updated packages. 2025-09-10 17:16:04 -07:00
Mike Cao 6799bd113a Allow async beforeSend function. Closes #3584 2025-09-09 15:23:49 -07:00
Mike Cao 303947fe9b Fixed uuid references in schemas. 2025-09-08 15:28:01 -07:00
Mike Cao f40e1b44f3 Updates for cloud mode. 2025-09-04 20:27:42 -07:00
Mike Cao dc1736458b Export metrics components. 2025-09-03 17:16:03 -07:00
Mike Cao c4114f4349 Fixed build. 2025-09-02 09:27:37 -07:00
Mike Cao c916e4ff9c Fixed components build. Renamed validations to permissions. 2025-09-02 09:23:35 -07:00
Mike Cao f0ec24e8f5 Updated funnel edit form. 2025-09-01 20:18:38 -07:00
Mike Cao d534c0b221 Bump components version. 2025-09-01 16:21:04 -07:00
Mike Cao 0d19e9a247 Fixed outputs. 2025-09-01 16:17:55 -07:00
Mike Cao 56af91950a Updated components build. 2025-09-01 15:59:06 -07:00
Mike Cao 5f27ba149b New overview layout. 2025-08-29 00:17:59 -07:00
Mike Cao bab4f8ebcc Cohort selection. 2025-08-28 23:29:42 -07:00
Mike Cao 05f9a67727 Merge remote-tracking branch 'origin/dev' into dev 2025-08-27 17:24:28 -07:00
Mike Cao dfaebcd1b7 Updated Next, Prisma, react-zen. 2025-08-27 17:23:58 -07:00
Mike Cao 8d5e8b072d Updated WebsiteSelect behavior. Fixed date select. 2025-08-27 16:59:44 -07:00
Mike Cao f9442001e4 Updated cohort processing. 2025-08-27 14:05:46 -07:00
Mike Cao c3b62e3a74 Merge remote-tracking branch 'origin/dev' into dev 2025-08-26 23:57:02 -07:00
Mike Cao 8c8e36c63b Cohorts editing. 2025-08-26 23:55:57 -07:00
Mike Cao 07665f4824 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-08-26 10:26:11 -07:00
Mike Cao 0f9669f886 Converted mutation queries. 2025-08-24 15:20:19 -07:00
Mike Cao 3f167e05ba New compare page. 2025-08-23 22:21:25 -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
Mike Cao 600a3d28c3 Use context hooks. 2025-08-21 03:15:47 -07:00
Mike Cao 00adb00d2d Fix build. 2025-08-21 03:06:41 -07:00
Mike Cao f7ca583410 Redesigned overview page. 2025-08-21 03:01:37 -07:00
Mike Cao 5d1f2a6f2d Updated Next. 2025-08-21 01:43:51 -07:00
Mike Cao 3a332b5947 Merge remote-tracking branch 'origin/dev' into dev 2025-08-21 01:33:43 -07:00
Mike Cao 8e766e2db7 Pixel/link metrics pages. 2025-08-21 01:33:20 -07:00
Mike Cao 789b8b36d8 Link route. 2025-08-18 22:30:22 -07:00
Mike Cao 2631fa51da Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-08-18 21:37:57 -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 eabdd18604 Updated Prisma build. 2025-08-15 12:29:33 -07:00
Mike Cao 7abfa1cb5b Fixed build. 2025-08-15 11:38:37 -07:00
Mike Cao b96b4941f4 Missing lock file. 2025-08-15 11:34:00 -07:00
Mike Cao 7838204186 Fixed imports. 2025-08-15 11:31:53 -07:00
Mike Cao 5f4b83b09c Link editing. 2025-08-15 11:11:24 -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
Mike Cao a97445fb82 Fixed sidenav rendering. 2025-08-09 02:06:54 -07:00
Mike Cao 8897c2508d Fixed scrolling on expanded view. 2025-08-08 17:39:17 -07:00
Mike Cao 4e25c07160 Implemented expanded view in dialog. 2025-08-07 22:10:02 -07:00
Mike Cao 0b4851125d Updated next and prisma. 2025-08-07 12:36:11 -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
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
Mike Cao eb7b6978d3 New settings layouts. Segment management screen. 2025-08-07 05:14:35 -07:00
Mike Cao 2dbcf63eeb Segment editing. 2025-07-31 21:32:22 -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
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 784677e180 Moved env checks to server pages. 2025-07-24 23:05:51 -07:00
Mike Cao 5b6292dd11 Converted variables to be runtime. 2025-07-24 22:41:23 -07:00
Mike Cao b6862de2be Made FAVICON_URL a runtime variable. Closes #3412 2025-07-24 21:54:10 -07:00
Mike Cao 6e6c1df858 Made FAVICON_URL a runtime variable. Closes #3412 2025-07-24 21:47:40 -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
Mike Cao a025fc9552 Updated nav. 2025-07-23 17:47:56 -07:00
Mike Cao 7670ec4136 Added download functionality. 2025-07-22 00:24:37 -07:00
Mike Cao 0debe89d05 Merge remote-tracking branch 'origin/dev' into dev 2025-07-21 10:59:31 -07:00
Mike Cao 5828445313 Updated packages. 2025-07-21 10:58:58 -07:00
Mike Caoandgreptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> 60c310fd77 Apply suggestion from @greptile-apps[bot]
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
2025-07-21 00:46:12 -07:00
Mike Cao b78ff3b477 New admin section. 2025-07-06 08:22:29 -07:00