Commit Graph

340 Commits

Author SHA1 Message Date
Mike Cao
4cc22fcc95 Fix event data check. 2022-12-12 20:46:43 -08:00
Mike Cao
0a6ecfe3d2 Implement react-basics styles. Fix queries. 2022-12-08 23:43:43 -08:00
Mike Cao
b57ecf33e6 Updated roles and permissions logic. 2022-12-06 18:36:41 -08:00
Mike Cao
4781a0cc8c Added lib/types. 2022-12-02 14:15:24 -08:00
Brian Cao
06bebadbb9
Feat/um 114 roles and permissions (#1683)
* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions
2022-12-01 20:53:37 -08:00
Mike Cao
a4e80ca3e5 Refactored permissions check. Updated redis lib. 2022-12-01 10:58:50 -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
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
Brian Cao
8fc6e99aa8 Add user role api. 2022-11-20 22:24:31 -08:00
Brian Cao
78225691df Add permission checks. 2022-11-20 00:48:13 -08:00
Brian Cao
e28ee6597a Fix Website auth. 2022-11-18 18:49:58 -08:00
Mike Cao
2b10802e07 Fix getWebsites call. 2022-11-18 09:47:06 -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
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -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
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
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Brian Cao
e9c8d16d5b pass in correct arguments to save pageview/event 2022-11-08 16:45:23 -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
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao
3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Mike Cao
05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Brian Cao
075d77abac change const 2022-11-01 09:56:43 -07:00
Brian Cao
689b732829 Merge branch 'dev' into feat/um-23-v2-schema-init 2022-10-31 23:48:12 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
5d73a9c4b4 Merge remote-tracking branch 'origin/app' into dev 2022-10-31 20:21:19 -07:00
Brian Cao
3a617b7bfa fix account delete bug 2022-10-31 18:50:05 -07:00
Mike Cao
c58e037a7e Updated useConfig. Added SSO page. 2022-10-31 11:02:37 -07:00
Brian Cao
572df48667 assign backup 2022-10-31 10:38:37 -07:00
Brian Cao
d32d5e75e9 change owner by id 2022-10-29 15:50:29 -07:00
Mike Cao
246e4e5f4f Fix disable checks. 2022-10-28 10:34:50 -07:00
Mike Cao
98835bbc78 Define uiDisabled at build time. 2022-10-27 17:02:54 -07:00
Mike Cao
fc9584eb44 Refactor env check. 2022-10-27 16:42:57 -07:00
Brian Cao
08ec801fdc remove GSS from 404 2022-10-27 14:48:21 -07:00
Brian Cao
99c975c329 add DISABLE_UI, DISABLE_ADMIN 2022-10-27 12:14:34 -07:00
Mike Cao
d05fd2bd3d Refactor redis calls. 2022-10-25 20:17:13 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Mike Cao
2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -07:00
Mike Cao
59fdaf580f Fixed share page. 2022-10-24 16:28:20 -07:00
Brian Cao
ba31f48f1a
Feat/um 49 query builder api (#1573)
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
2022-10-21 21:33:23 -07:00
Mike Cao
6147c3502a
Merge pull request #1567 from umami-software/feat/um-69-nice
add cloud_mode
2022-10-12 17:33:54 -07:00
Brian Cao
9e8748e2f3 checkpoint 2022-10-12 16:29:44 -07:00
Mike Cao
e429abc08e Added error conditions for website updates. 2022-10-12 15:52:31 -07:00
Brian Cao
db1ae3f2c7 add cloud_mode 2022-10-12 15:35:33 -07:00
Mike Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Mike Cao
c33729e185 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-10-11 23:48:05 -07:00
Brian Cao
07d003e858 fix collect 2022-10-11 23:09:06 -07:00
Mike Cao
8627782137 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/settings/WebsiteSettings.js
#	pages/api/websites/[id]/index.js
2022-10-11 21:51:47 -07:00
Mike Cao
5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -07:00
Brian Cao
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
78338205a3
Feat/um 62 prisma property names (#1562)
* checkpoint

* fix pg schema

* fix mysql schema

* change property names
2022-10-10 13:42:18 -07:00
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Mike Cao
f3135ee867 Get account by uuid for cloud operations. 2022-10-04 20:16:09 -07:00
Mike Cao
d784b2a8db Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	pages/api/account/index.js
2022-10-03 17:17:53 -07:00
Brian Cao
adb0a06006 add uuid to account 2022-09-30 22:27:47 -07:00
Mike Cao
5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -07:00
Brian Cao
b3d7d49448
Fix timezone bug (#1543) 2022-09-27 17:18:16 -07:00
Brian Cao
78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Mike Cao
13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Mike Cao
9f6834925b
Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning
Admins can assign websites to non-admins
2022-09-03 23:17:06 -07:00
Mike Cao
efb52f5ff1 Fix crypto errors. 2022-08-29 08:31:16 -07:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Brian Cao
54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao
818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07:00
Aidan Marshall
b388961b8b Features:
- Removes spellcheck for domain entry field
- Adds the ability to assign websites to other users if you are an admin
2022-08-26 17:22:46 +02:00
Brian Cao
10cc6616c5 add redis placeholder 2022-08-25 23:12:47 -07:00
Brian Cao
bb50753704 split db files 2022-08-25 22:04:32 -07:00
Brian Cao
46b4b98d40 update kafka messaging 2022-08-25 11:07:47 -07:00
Brian Cao
537ddde189 remove allow_agent 2022-08-22 23:21:44 -07:00
Francis Cao
e522293130 fixed event_uuid logic 2022-08-22 12:24:57 -07:00
Brian Cao
41d4b4c402 allow agent 2022-08-18 23:25:45 -07:00
Francis Cao
295ce2487d Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-18 16:54:57 -07:00
Francis Cao
34e9ab811b add session_uuid to token 2022-08-09 23:32:02 -07:00
Mike Cao
bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -07:00
Mike Cao
9b7e472410 Added CURRENT_VERSION constant. 2022-08-08 11:31:36 -07:00
Francis Cao
fc3c39be3c Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-08 08:36:21 -07:00
Mike Cao
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Francis Cao
1a84608e2b add Clickhouse migration files. update saveEvent to include event_uuid 2022-08-04 20:15:21 -07:00
Mike Cao
1662b66fbb Cleaned up script. 2022-08-02 00:52:08 -07:00
Mike Cao
9969c9b6b1 Forgot the actual check. 2022-08-02 00:32:28 -07:00
Mike Cao
a4a6888248 Moved telemetry code to script. 2022-08-02 00:24:17 -07:00