m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-16 02:05:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,354 Commits 2 Branches 0 Tags 16 MiB
7e096336ce
Commit Graph

2354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Cao
1eb9e10d94 Re-write CH queries to use query params. 2023-01-12 00:02:12 -08:00
Francis Cao
96de650a67 add logic for database type 2023-01-11 16:19:20 -08:00
Mike Cao
53ec66e820 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	components/pages/login/LoginForm.js
 2023-01-11 14:48:17 -08:00
Mike Cao
4f15c4f146 Updated login and layout pages. 2023-01-11 14:47:38 -08:00
Brian Cao
b4bd988e4e WebsiteId query param. Fix Prisma filters. 2023-01-11 11:01:44 -08:00
Brian Cao
f654e6728c Fix links. 2023-01-11 10:49:04 -08:00
Mike Cao
9d967fb0fe Updated settings components and date filter. 2023-01-11 08:33:43 -08:00
Mike Cao
4b5b4db108 Updated settings components and date filter. 2023-01-10 17:18:59 -08:00
Francis Cao
ac2b79c5cf move migrateData into its own function 2023-01-10 16:03:44 -08:00
Francis Cao
b05b18e736 update checkV1Tables check 2023-01-10 15:01:41 -08:00
Francis Cao
9cc0588175 fix transaction bug 2023-01-10 09:54:16 -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
Francis Cao
0cb33a9c73 add check migration, use prisma transaction 2023-01-09 13:14:30 -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
Francis Cao
19166e580e add mysql schema file 2023-01-05 14:40:34 -08:00
Francis Cao
f10694d07e create new mysql schema file 2023-01-05 11:13:49 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Francis Cao
5f159ed5ce add final success prompt 2023-01-04 11:15:19 -08:00
Francis Cao
b845ae547d fix v1 replace bug 2023-01-04 11:03:28 -08:00
Francis Cao
1cd195d895 add delete v1 table prompt 2023-01-04 10:07:58 -08:00
Francis Cao
3cf0617366 add warning message during data transfer 2023-01-04 00:26:31 -08:00
Francis Cao
c24f8cb985 add data migration script 2023-01-03 13:16:29 -08:00
Francis Cao
0a731e3408 run rawsql for 01_init 2023-01-03 12:50:08 -08:00
Mike Cao
170b30b391 CSS fix. 2023-01-03 12:31:55 -08:00
Francis Cao
2a5927e345 update migrations 2023-01-03 09:32:32 -08:00
Francis Cao
8f686db116 fix rename to v1_ 2023-01-02 16:58:52 -08:00
Francis Cao
82e6728e1e fix index drop 2023-01-02 16:53:20 -08:00
Francis Cao
660c810ec1 add prisma table PK 2023-01-02 16:47:48 -08:00
Francis Cao
b46a0c179f add migration node script 2023-01-02 16:34:58 -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