m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,080 Commits 2 Branches 0 Tags 16 MiB
4b5b4db108
Commit Graph

2080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Cao
4b5b4db108 Updated settings components and date filter. 2023-01-10 17:18:59 -08:00
Mike Cao
70ef857dc7 Fix links. 2023-01-10 00:13:32 -08:00
Mike Cao
7450b76e6d Refactored settings components. 2023-01-09 23:59:26 -08:00
Mike Cao
d827b79c72 Updated forms usage. 2023-01-05 22:56:36 -08:00
Brian Cao
fcb1767eb1
Feat/um 145 re add events (#1733) 
* Re-add events. Fix event_type queries.

* Re-add eventData

* revert CSS.
 2023-01-05 19:39:29 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Mike Cao
170b30b391 CSS fix. 2023-01-03 12:31:55 -08:00
Mike Cao
f3879c92e1 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	lib/middleware.ts
#	pages/api/users/[id]/index.ts
#	pages/api/users/index.ts
#	pages/api/websites/[id]/active.ts
#	pages/api/websites/[id]/eventdata.ts
#	pages/api/websites/[id]/events.ts
#	pages/api/websites/[id]/index.ts
#	pages/api/websites/[id]/metrics.ts
#	pages/api/websites/[id]/pageviews.ts
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/[id]/stats.ts
#	yarn.lock
 2022-12-31 13:54:44 -08:00
Francis Cao
f42cab8d83
Merge pull request #1719 from umami-software/feat/um-138-remove-prisma-foreign-key 
Feat/um 138 remove prisma foreign key
 2022-12-29 15:12:34 -08:00
Brian Cao
eb2f07c105 Event Data maximum size. 2022-12-29 14:51:51 -08:00
Mike Cao
db6a6d6055 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	components/forms/UserPasswordForm.js
#	components/pages/Dashboard.js
 2022-12-28 15:49:28 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Brian Cao
b243f0a319 Fix Icon. 2022-12-28 12:56:22 -08:00
Brian Cao
74d2cd8d03
Feat/um 140 password modal (#1718) 
* Change password to modal.

* Close on save.
 2022-12-28 12:37:09 -08:00
Mike Cao
7bbed0e12b Changed HASH_SALT to APP_SECRET. 2022-12-27 21:38:23 -08:00
Mike Cao
cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -08:00
Francis Cao
1472e205a3 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-138-remove-prisma-foreign-key 2022-12-27 16:52:04 -08:00
Francis Cao
8ee7172ea0 drop foreign keys, add missing indexes 2022-12-27 16:26:25 -08:00
Brian Cao
561cde6e7e
Add admin check. (#1716) 
* Add admin check.

* Fix teamId check.
 2022-12-27 15:18:58 -08:00
Mike Cao
c90bd941b5 Merge remote-tracking branch 'origin/dev' into dev 2022-12-27 00:00:42 -08:00
Mike Cao
aef7326f4c Added access_code column to teams. 2022-12-27 00:00:31 -08:00
Brian Cao
ef9d915592 Fix event var names. 2022-12-26 23:21:54 -08:00
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