Commit graph

406 commits

Author SHA1 Message Date
Mike Cao
5c9f97182e Removed grant checks. 2025-09-22 13:57:42 -07:00
Mike Cao
9897c725de Updated cloud mode checks. 2025-09-22 13:09:07 -07:00
Mike Cao
a4a9d6c227 Added stripPort function. Reorganized constants.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
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
2826daad1a
Merge branch 'master' into fix-ip-header-ordering 2025-09-16 20:57:12 -07:00
Mike Cao
fc01ee9f56 Get localized error messages. 2025-09-14 23:43:22 -07:00
Andrey Nering
bfcc822b40 fix(geo): parse netlify ip header by default: x-nf-client-connection-ip
This header is not clearly documented, but it is mentioned in
semi-official sources, and I have tested it to ensure it's working
properly.

Without this, Umami is unable to detect geolocation by default if
deployed on Netlify.

* https://answers.netlify.com/t/is-the-client-ip-header-going-to-be-supported-long-term/11203/2
* https://httptoolkit.com/blog/what-is-x-forwarded-for/#and-others
2025-09-14 22:10:21 -03:00
Mike Cao
baba06c692 Added lib/password. Small tweaks.
Some checks failed
Node.js CI / build (postgresql, 18.18) (push) Has been cancelled
2025-09-13 09:40:20 -07:00
Mike Cao
e610de383a Fix for schema selection in pg adapter.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-11 12:37:24 -07:00
Mike Cao
aa7d3cd1aa New components build.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-08 22:52:43 -07:00
Mike Cao
303947fe9b Fixed uuid references in schemas.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-08 15:28:01 -07:00
Nick Maynard
2177256a2c Fix ordering to allow X-Forwarded-For to be correctly managed by Cloudflare 2025-09-08 23:05:22 +01: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.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-01 20:18:38 -07:00
Mike Cao
0d19e9a247 Fixed outputs.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-09-01 16:17:55 -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
0xflotus
de3e9d0be3
fix: put Google in the right order of grouped domains 2025-08-28 08:29:30 +02:00
Mike Cao
19a87388cd
Merge pull request #3594 from 0xflotus/patch-2
chore: sort properties alphabetically
2025-08-27 20:41:27 -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.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
2025-08-27 14:05:46 -07:00
Michael Wallner
58c2d068e7
refactor getLocation to use lookup array for cleaner header extraction 2025-08-27 17:47:24 +02:00
Mike Cao
8c8e36c63b Cohorts editing. 2025-08-26 23:55:57 -07:00
Francis Cao
984f426cfe update getQueryFilters to support new segment/cohort data structure 2025-08-26 09:02:55 -07:00
Michael Wallner
8df72c55e5
add support for CloudFront headers in getLocation 2025-08-26 17:28:13 +02:00
0xflotus
ea2206f2e9
chore: sort properties alphabetically
I have sorted some of the properties alphabetically so that you can see more quickly in the future which ones may still be missing. I think it's easier to add some new ones this way.

I also fixed the `alibaba.com` domain from the typo `alibab.com`.
2025-08-25 21:02:13 +02:00
Francis Cao
6c832bd0db Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-08-25 07:40:32 -07:00
Francis Cao
b2e03390da translate dateRange and cohort prefix for filtering 2025-08-25 07:39:51 -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
0ac8bd41b6 Pixel route. 2025-08-18 15:49:10 -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
5f4b83b09c Link editing. 2025-08-15 11:11:24 -07:00
Mike Cao
247e14646b Pixel/links development. New validations folder. More refactoring. 2025-08-14 23:48: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
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
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
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