Commit Graph

523 Commits

Author SHA1 Message Date
Mike Cao
f450fc35fb Fixed city showing undefined. 2023-04-25 16:56:31 -07:00
Mike Cao
4c544361fd Fixed vercel again. 2023-04-25 16:51:42 -07:00
Mike Cao
4ea3eec98c Fixed vercel region issues. 2023-04-25 16:29:47 -07:00
Mike Cao
5864aee043 Fixed vercel issues. 2023-04-25 15:58:52 -07:00
Mike Cao
c49e2c6974 Fixed Vercel geolocation. 2023-04-25 14:52:29 -07:00
Mike Cao
3f1ed750f0 Added error boundary. Fixed #1976. 2023-04-25 14:41:54 -07:00
Mike Cao
92ab391ef8 Use Vercel headers for location. 2023-04-24 19:29:31 -07:00
Mike Cao
c5bffb97cc Improved error handling for useSession middleware. 2023-04-22 14:17:57 -07:00
Mike Cao
987e3aabbd Fix tracking code form. 2023-04-21 17:21:44 -07:00
Mike Cao
3b6c6846b1 Fixed lang references. 2023-04-19 18:42:29 -07:00
Mike Cao
afde1377dc
Merge branch 'dev' into master 2023-04-19 17:06:46 -07:00
Mike Cao
dfae0c150d Merge branch 'dev'
# Conflicts:
#	components/common/Calendar.js
#	components/common/EventDataButton.js
#	components/forms/EventDataForm.js
#	components/layout/Header.js
#	db/mysql/migrations/02_add_event_data/migration.sql
#	lang/be-BY.json
#	lang/de-CH.json
#	lang/es-MX.json
#	lang/fa-IR.json
#	lang/km-KH.json
#	lang/lt-LT.json
#	lang/th-TH.json
#	lib/auth.js
#	lib/detect.ts
#	lib/lang.js
#	lib/middleware.js
#	lib/prisma.js
#	package.json
#	pages/_app.js
#	pages/api/accounts/[id]/password.js
#	pages/api/collect.js
#	pages/api/realtime/init.js
#	pages/api/websites/[id]/index.js
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/index.js
#	public/intl/messages/fa-IR.json
#	public/intl/messages/lt-LT.json
#	public/intl/messages/pt-BR.json
#	public/intl/messages/th-TH.json
#	queries/analytics/event/getEventData.js
#	queries/analytics/event/getEventMetrics.js
#	queries/analytics/pageview/getPageviewMetrics.js
#	queries/analytics/pageview/getPageviewParams.js
#	queries/analytics/pageview/getPageviewStats.js
#	queries/analytics/session/getSessionMetrics.js
#	queries/analytics/stats/getActiveVisitors.js
#	queries/analytics/stats/getWebsiteStats.js
#	sql/schema.mysql.sql
#	styles/index.css
#	yarn.lock
2023-04-17 11:08:17 -07:00
Mike Cao
d406564af3 Manually merge PR #1879. 2023-04-17 10:31:50 -07:00
Francis Cao
43499eb4fd fix region / city filters 2023-04-17 00:10:51 -07:00
Mike Cao
e286994397 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	public/iso-3166-2.json
2023-04-13 22:30:22 -07:00
Mike Cao
f2edd0d604 Added regions and cities support. 2023-04-13 22:28:29 -07:00
Brian Cao
0335fd3529 Remove webisite.teamId related code. Clean up queries. 2023-04-13 20:57:22 -07:00
Brian Cao
ef324fdf73 Fix update user. 2023-04-13 12:08:53 -07:00
Kai Steinke
0926a4c310
feat: add missing locales and sort alphabetically 2023-04-11 10:53:43 +02:00
Francis Cao
f5f6dc052e fix column name date bug 2023-04-10 09:44:25 -07:00
Brian Cao
9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Mike Cao
0dc6529cf1 Added new languages to lib/lang. 2023-04-08 15:51:49 -07:00
Mike Cao
b2bebaea3e Added km-KH, updated be-BY. 2023-04-08 13:58:58 -07:00
Mike Cao
e850fbd0bd Merge changes from master. 2023-04-08 13:55:52 -07:00
Brian Cao
7b07de7a98 Api work for remove user. 2023-04-07 22:45:46 -07:00
Mike Cao
6dd90ce9ca Refactored SSO process. 2023-04-04 23:29:54 -07:00
Brian Cao
dee58f8a55 Fix date function. 2023-04-04 00:24:03 -07:00
Brian Cao
76296bc2ee Fix realtime. 2023-04-03 23:22:20 -07:00
Mike Cao
ba71f5cafc Fix location lookup. 2023-04-02 22:36:52 -07:00
Mike Cao
7464bd2521 Fixed types. 2023-04-02 17:28:25 -07:00
Mike Cao
9001361e4c Fix session lookup. 2023-04-02 17:23:12 -07:00
Mike Cao
2713e3316a Fixed font. 2023-04-02 10:00:28 -07:00
Mike Cao
8397102bac Switch to next/font. 2023-04-01 20:03:38 -07:00
Mike Cao
728e4cff5b Updated queries to use cache. 2023-04-01 17:38:35 -07:00
Mike Cao
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Brian Cao
d2687b6580 Fix metrics. 2023-03-31 14:53:48 -07:00
Brian Cao
2172dddd1c Convert send to TS. 2023-03-30 11:18:57 -07:00
Mike Cao
64b040c865 Fixed query parameter filter. 2023-03-30 09:44:04 -07:00
Brian Cao
6d5aeb3bd1 Fix joining team dupe. Add loading to team member remove. Fix messages. 2023-03-29 16:02:14 -07:00
Mike Cao
05933ff1d2 Use new geo folder. 2023-03-28 19:24:36 -07:00
Mike Cao
23d02e5aac Try reverting to country database. 2023-03-28 19:10:11 -07:00
Francis Cao
14e4a090bb update schema and queries to implement reset_at 2023-03-27 11:25:16 -07:00
Brian Cao
9979672de5
Feat/um 202 event data new (#1841)
* Add event_data base.

* Add url_path.

* Add eventData back.

* Finish event_data relational.

* resolve comments.
2023-03-23 14:01:15 -07:00
Francis Cao
b0c5899569 update prisma / ch filters logic 2023-03-20 11:26:45 -07:00
Francis Cao
790e71cc14 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-15 16:40:13 -07:00
Francis Cao
f569f6ac91 fix null ip lookup error 2023-03-15 16:39:55 -07:00
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Mike Cao
9a3e8921a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-03-10 18:45:51 -08:00
Mike Cao
6ba00152c2 Updated filter tags. 2023-03-10 17:49:19 -08:00
Brian Cao
701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -08:00