Commit Graph

2228 Commits

Author SHA1 Message Date
Brian Cao
d5437c895e Add Role to TeamUser. 2022-11-28 13:08:48 -08:00
Mike Cao
fe01574b16 Updated login form. 2022-11-28 11:14:24 -08:00
Brian Cao
502facd426 Allow user to be added to team with role. 2022-11-22 22:17:49 -08:00
Brian Cao
d85b2be5f8 Add event type to event. 2022-11-22 15:06:52 -08:00
Brian Cao
c90194dad4 Merge remote-tracking branch 'origin/dev' into dev 2022-11-21 23:23:20 -08:00
Brian Cao
9172098fa7 Fix login secure token creation. 2022-11-21 23:23:16 -08:00
Francis Cao
9e6dae2e55 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 22:51:28 -08:00
Francis Cao
5da7a208a8 delete website in relational query 2022-11-21 22:51:23 -08:00
Mike Cao
f98a97ef83 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 22:33:13 -08:00
Brian Cao
3efd2a5b10 Remove user/team transfer from website update. 2022-11-21 22:32:59 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Brian Cao
d60ad1c782 Fix isAdmin check. Fix Schema. 2022-11-21 16:44:42 -08:00
Brian Cao
371425ab60 Fix error when updating website. 2022-11-21 11:39:59 -08:00
Mike Cao
c0a18e13fa Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 10:08:14 -08:00
Brian Cao
82d1f1ba2c Merge branch 'feat/um-23-new-schema' into dev 2022-11-20 22:24:51 -08:00
Brian Cao
6719f5b37c Merge branch 'dev' into feat/um-23-new-schema 2022-11-20 22:24:48 -08:00
Brian Cao
8fc6e99aa8 Add user role api. 2022-11-20 22:24:31 -08:00
Mike Cao
1e5174c211 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:09:40 -08:00
Mike Cao
8bc3b288db
Merge pull request #1668 from umami-software/feat/um-23-new-schema
Feat/um 23 new schema
2022-11-20 21:09:32 -08:00
Mike Cao
df50d9cefc Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:04:53 -08:00
Brian Cao
78225691df Add permission checks. 2022-11-20 00:48:13 -08:00
Mike Cao
817880b511 Updated lint-staged config. 2022-11-19 18:28:46 -08:00
Brian Cao
51e2331315 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 18:50:19 -08:00
Brian Cao
2e01226b46 Merge branch 'feat/um-23-new-schema' into dev 2022-11-18 18:50:11 -08:00
Brian Cao
e28ee6597a Fix Website auth. 2022-11-18 18:49:58 -08:00
Francis Cao
3eb1d783de Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-18 12:08:23 -08:00
Francis Cao
eaa208652d add clickhouse route to deleteWebsite 2022-11-18 12:08:13 -08:00
Brian Cao
1af93a17a3 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 11:22:22 -08:00
Brian Cao
90fbe9abee Merge branch 'feat/um-23-new-schema' into dev 2022-11-18 11:22:10 -08:00
Brian Cao
ce02958bc2 Fix enum issue. 2022-11-18 11:22:03 -08:00
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