Mike Cao
|
dff105c747
|
Updated prisma and redis clients.
|
2022-12-26 21:51:16 -08:00 |
|
Mike Cao
|
c05d116875
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2022-12-26 20:51:08 -08:00 |
|
Mike Cao
|
ad15466028
|
Updated packages.
|
2022-12-26 20:50:55 -08:00 |
|
Mike Cao
|
677566b5f3
|
Merge pull request #1714 from umami-software/feat/um-136-camel-case
Remove snake_case.
|
2022-12-26 20:49:38 -08:00 |
|
Brian Cao
|
a91386434d
|
Remove snake_case.
|
2022-12-26 17:36:48 -08:00 |
|
Brian Cao
|
e1f99a7d01
|
Rewrite admin. (#1713)
* Rewrite admin.
* Clean up password forms.
* Fix naming issues.
* CSS Naming.
|
2022-12-26 16:57:59 -08:00 |
|
mike
|
f4db04c3c6
|
Update to react-basics v0.40.
|
2022-12-20 23:01:47 -08:00 |
|
mike
|
1d36a8a46b
|
Update to react-basics v0.39.
|
2022-12-20 16:38:00 -08:00 |
|
Mike Cao
|
1fcaa1c9fc
|
Updated log messages.
|
2022-12-14 23:13:57 -08:00 |
|
Mike Cao
|
4c202741c2
|
Fixed share page.
|
2022-12-13 11:27:55 -08:00 |
|
Mike Cao
|
cb4c8accea
|
Fixed admin checks.
|
2022-12-13 08:41:13 -08:00 |
|
Mike Cao
|
da49543b91
|
Merge branch 'dev' into analytics
|
2022-12-12 20:51:12 -08:00 |
|
Mike Cao
|
4cc22fcc95
|
Fix event data check.
|
2022-12-12 20:46:43 -08:00 |
|
Brian Cao
|
8732d056dd
|
Dev (#1702)
* Initial Typescript models.
* Re-add realtime data
* get distinct sessions for session metrics
* Add queries for new schema.
* Fix Typo.
* Add some api/team endpoints.
* Fix destructure error.
* Fix getWebsites call.
* Ignore typescript build errors.
* Fix enum issue.
* add clickhouse route to deleteWebsite
* Fix Website auth.
* Updated lint-staged config.
* Add permission checks.
* Add user role api.
* Fix error when updating website.
* Fix isAdmin check. Fix Schema.
* Initial conversion to react-basics.
* Remove user/team transfer from website update.
* delete website in relational query
* Fix login secure token creation.
* Add event type to event.
* Allow user to be added to team with role.
* Updated login form.
* Add Role to TeamUser.
* Add database migration.
* Refactored permissions check. Updated redis lib.
* Feat/um 114 roles and permissions (#1683)
* Auth checkpoint.
* Merge branch 'dev' into feat/um-114-roles-and-permissions
* Add 02 migration.
* Added lib/types.
* Updated schema.
* Updated roles and permissions logic.
* Implement react-basics styles. Fix queries.
* Update website details layout.
* Add 01 migration.
* Fix admin create.
* Update react-basics.
Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>
|
2022-12-12 19:45:38 -08:00 |
|
Brian Cao
|
e4fe22233c
|
Update react-basics.
|
2022-12-12 16:46:46 -08:00 |
|
Brian Cao
|
4501951336
|
Fix admin create.
|
2022-12-12 12:31:56 -08:00 |
|
Brian Cao
|
8097428a4b
|
Add 01 migration.
|
2022-12-12 12:04:31 -08:00 |
|
Mike Cao
|
e8e90a5451
|
Update website details layout.
|
2022-12-10 14:26:52 -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
|
4eb3140e43
|
Updated schema.
|
2022-12-05 13:03:02 -08:00 |
|
Mike Cao
|
849c0f9bc8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-12-02 14:15:45 -08:00 |
|
Mike Cao
|
4781a0cc8c
|
Added lib/types.
|
2022-12-02 14:15:24 -08:00 |
|
Brian Cao
|
b40630f9d4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-12-01 22:06:39 -08:00 |
|
Brian Cao
|
4ef48a8f4b
|
Add 02 migration.
|
2022-12-01 22:06:36 -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 |
|
Brian Cao
|
1a7369e1f6
|
Merge branch 'feat/um-114-roles-and-permissions' into dev
|
2022-11-30 09:35:23 -08:00 |
|
Brian Cao
|
77b739870e
|
Add database migration.
|
2022-11-29 21:56:43 -08:00 |
|
Brian Cao
|
0a9089a463
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-11-28 13:08:49 -08:00 |
|
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 |
|