Commit Graph

2048 Commits

Author SHA1 Message Date
Brian Cao
ac5ec730d2 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 10:34:17 -08:00
Mike Cao
21072c712c Ignore typescript build errors. 2022-11-18 10:00:12 -08:00
Mike Cao
2b10802e07 Fix getWebsites call. 2022-11-18 09:47:06 -08:00
Mike Cao
4fd12c6c93
Merge pull request #1664 from umami-software/feat/um-23-new-schema
Feat/um 23 new schema
2022-11-18 03:22:59 -08:00
Mike Cao
4bc3d46efb Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 03:21:55 -08:00
Mike Cao
803ce54fef Merge remote-tracking branch 'origin/dev' into dev 2022-11-18 03:21:13 -08:00
Mike Cao
bba8876522 Fix destructure error. 2022-11-18 03:20:45 -08:00
Brian Cao
25279271ce Add some api/team endpoints. 2022-11-18 00:27:42 -08:00
Brian Cao
f5eb974d8d Fix Typo. 2022-11-17 22:46:05 -08:00
Brian Cao
5aa8187e42 Add queries for new schema. 2022-11-17 22:27:33 -08:00
Francis Cao
e3142e93f0 get distinct sessions for session metrics 2022-11-17 18:09:03 -08:00
Brian Cao
b0c7980a20 Merge branch 'dev' into feat/um-23-new-schema 2022-11-16 18:34:03 -08:00
Mike Cao
94848cc41b Merge branch 'dev' into analytics 2022-11-16 11:59:31 -08:00
Mike Cao
592c3fa6e6 Merge remote-tracking branch 'origin/dev' into dev 2022-11-16 11:45:04 -08:00
Mike Cao
8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Francis Cao
106dd25594 clickhosue: validate string being sent into event_data 2022-11-16 11:42:02 -08:00
Brian Cao
f3726e5abf Re-add realtime data 2022-11-16 10:32:02 -08:00
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Brian Cao
04e9f06e93 Merge branch 'dev' into feat/um-23-new-schema 2022-11-15 13:20:47 -08:00
Mike Cao
f0a072ca9b
Merge pull request #1653 from umami-software/dev
merge dev to analytics
2022-11-15 11:52:14 -08:00
Mike Cao
091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao
e9b1869eb8 Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 09:44:08 -08:00
Mike Cao
1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Brian Cao
7271951871 Merge branch 'dev' into analytics 2022-11-10 12:27:36 -08:00
Brian Cao
563589393a Update schema table names. 2022-11-10 11:58:43 -08:00
Brian Cao
73a57cd2cf fix casing 2022-11-10 11:08:40 -08:00
Mike Cao
cd9036adaf Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 04:47:24 -08:00
Mike Cao
c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Brian Cao
30743feb0e Add Reset / Delete functionality. 2022-11-09 22:46:50 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Brian Cao
6ee27a7e53 Fix typo on getMetrics. 2022-11-09 16:10:20 -08:00
Brian Cao
7bf12cc552 Assign user to userStore 2022-11-09 13:54:09 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Brian Cao
df84a16b95 Add external uuid to user create. 2022-11-09 10:59:03 -08:00
Mike Cao
d2100c33b7 Update auth logic. 2022-11-09 10:16:50 -08:00
Mike Cao
76cad96a24 Updated auth to check for uuid. 2022-11-09 10:15:21 -08:00
Mike Cao
8a74138e17 Fixed website create. 2022-11-09 07:40:17 -08:00
Mike Cao
3b705e6cb4 Fetch user inside useAuth. 2022-11-09 06:40:36 -08:00
Mike Cao
1bce4f2174 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 22:59:01 -08:00
Mike Cao
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Brian Cao
9067d51172 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 17:47:23 -08:00
Brian Cao
4fbcf68b22 fix save event/pageview for CH 2022-11-08 17:47:19 -08:00
Mike Cao
1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Brian Cao
e9c8d16d5b pass in correct arguments to save pageview/event 2022-11-08 16:45:23 -08:00
Brian Cao
c2df477374 skip session check if using clickhouse 2022-11-08 15:50:34 -08:00
Brian Cao
224e9b3718 fix session get 2022-11-08 15:42:46 -08:00
Brian Cao
648a5341e5 fix useAuth 2022-11-08 12:51:04 -08:00
Mike Cao
208fcb8418 Added redis check to verify. 2022-11-08 12:28:45 -08:00
Brian Cao
13fd3ccd16
api and lib fixes (#1643) 2022-11-08 11:55:02 -08:00
Mike Cao
168283bf11 Merge remote-tracking branch 'origin/dev' into dev 2022-11-07 22:35:59 -08:00