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,017 Commits 2 Branches 0 Tags 16 MiB
9e6dae2e55
Commit Graph

2017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brian Cao
61df707765 Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 21:51:20 -07:00
Mike Cao
5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -07:00
Mike Cao
9a90d2e88f
Merge pull request #1563 from umami-software/feat/um-66-update-clickhouse-schema-uuid 
Feat/um 66 update clickhouse schema UUID
 2022-10-11 21:46:16 -07:00
Brian Cao
317d3c6637 fix schema script 2022-10-11 21:02:15 -07:00
Brian Cao
bce4476d12 fix reset/delete 2022-10-11 19:43:02 -07:00
Brian Cao
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Brian Cao
b0bed5e73a Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 10:31:15 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
4073d57e64 roll back id adds 2022-10-10 17:01:48 -07:00
Brian Cao
ec6454aead Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-10 16:20:07 -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
Francis Cao
96add409b6 update api to new CH columns 2022-10-08 16:12:33 -07:00
Mike Cao
36edbe2f4c
Merge pull request #1554 from SeesawLiu/patch-1 
Update Website id from getWebsiteByUuid.js
 2022-10-08 10:18:42 -07:00
刘岗
6f6cbaa098
Update getWebsiteByUuid.js 
if redis website set from getWebsiteByUuid,the value is 1 forever
 2022-10-08 13:46:50 +08:00
Mike Cao
aa64b76518 Merge remote-tracking branch 'origin/dev' into dev 2022-10-07 17:13:32 -07:00
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
73e7f647c0
Merge pull request #1551 from sergiomensing/fix-color-dots-in-realtime-logs 
Fix unique dot colors in the realtime logs
 2022-10-07 16:34:51 -07:00
Brian Cao
dcf16e1411 fix redis init 2022-10-06 16:41:37 -07:00
Mike Cao
e442617421 Add connect methods to libraries. 2022-10-06 15:00:16 -07:00
Mike Cao
186f484ff1 Merge branch 'dev' into analytics 2022-10-06 14:19:19 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Brian Cao
6bb61d7a53 Revert "remove postgres collect" 
This reverts commit 86bd9a7793.
 2022-10-06 13:48:24 -07:00
Brian Cao
0e10470c02 Revert "break CH fetch" 
This reverts commit 5dd395918f.
 2022-10-06 13:47:40 -07:00
Brian Cao
f53ea06c23 Revert "reject" 
This reverts commit 5fd3ba3809.
 2022-10-06 13:47:34 -07:00
Brian Cao
76c0057d2e Revert "do not collect" 
This reverts commit 75cba808e3.
 2022-10-06 13:47:22 -07:00
Brian Cao
75cba808e3 do not collect 2022-10-06 13:44:23 -07:00
Brian Cao
5fd3ba3809 reject 2022-10-06 13:35:38 -07:00
Brian Cao
5dd395918f break CH fetch 2022-10-06 13:29:55 -07:00
Brian Cao
86bd9a7793 remove postgres collect 2022-10-06 13:13:44 -07:00
Brian Cao
ae46520930 Merge branch 'dev' into analytics 2022-10-06 13:07:08 -07:00
Brian Cao
0387cf0da0 remove CH import 2022-10-06 12:49:49 -07:00
Brian Cao
46b3da1b07 Merge branch 'dev' into analytics 2022-10-05 16:08:45 -07:00
Sergio Mensing
e8a30e7251 use slice instead of substring for desired result 2022-10-05 14:44:49 +02: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
Mike Cao
d6854d4ff9
Merge pull request #1548 from umami-software/feat/um-58-account-uuid 
Feat/um 58 account UUID
 2022-10-03 11:40:51 -07:00
Brian Cao
a2ce1d833d update check-db 2022-10-03 11:14:19 -07:00
Brian Cao
6de634f0b4 add mysql changes 2022-10-02 20:42:32 -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
d4abe51331 remove database_type from prisma getdb function 2022-09-28 15:36:41 -07:00
Brian Cao
b3d7d49448
Fix timezone bug (#1543) 2022-09-27 17:18:16 -07:00
Mike Cao
add7c5ebe9
Merge pull request #1531 from userdehghani/pr-blank-target 
open update links in new tab
 2022-09-24 18:36:18 -07:00
Brian Cao
78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Mike Cao
dfac7e1af5 Updated Kafka loading process. 2022-09-22 10:36:23 -07:00
Mike Cao
0b163274ba Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-21 21:59:46 -07:00
Francis Cao
55218d1ddd
Francis/uc 37 secure kafka (#1532) 
* add ssl encryption to kafka client

* fix missing columns in getPageview CH. fix Kafka SSL Pathing
 2022-09-21 11:31:52 -07:00
Mohammad Amin Dehghani
e92cb29025 open update links in new tab 2022-09-21 17:49:18 +04:30
Mike Cao
3932583bc9
Merge pull request #1529 from ariaieboy/patch-1 
Update RealtimeLog to decode the urls
 2022-09-19 17:39:34 -07:00