1903 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
刘岗	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
AriaieBOY	d8eb22932b	Update RealtimeLog.js	2022-09-19 19:28:52 +04:30
Mike Cao	b12bfb2f2f	Merge pull request #1515 from umami-software/brian/uc-35-merge-tables-ch ... Brian/uc 35 merge tables ch	2022-09-13 10:32:32 -07:00
Brian Cao	dd54fb3d2c	combine logic	2022-09-13 09:18:58 -07:00
Brian Cao	c73d07d329	clarified var	2022-09-13 09:16:21 -07:00
Mike Cao	ea427f9366	Merge branch 'master' into dev	2022-09-12 14:38:50 -07:00
Mike Cao	0cb14f3f6c	Merge pull request #1508 from roywangdev/patch-1 ... Update package.json	2022-09-12 14:38:10 -07:00
Mike Cao	fb6aabaf06	Updated language bundles.	2022-09-12 14:36:27 -07:00
Brian Cao	8e068310b8	remove CH migration	2022-09-12 10:12:17 -07:00
Brian Cao	52e036964b	Merge Session/Event/Pageview CH	2022-09-12 09:55:34 -07:00
ROYWANG	a4a3cdeb9f	Update package.json	2022-09-09 22:33:39 +08:00
Mike Cao	6941efa26d	Merge pull request #1499 from AliMickey/patch-1 ... Update README.md	2022-09-07 14:04:32 -07:00
Micky	04c028697f	Update README.md ... Change docker-compose to docker compose as per latest changes with Docker packaging.	2022-09-07 12:55:15 +10:00
Brian Cao	d377ef86e7	Merge branch 'dev' into brian/uc-35-merge-tables-ch	2022-09-06 12:13:47 -07:00
Mike Cao	24b2322987	Merge branch 'master' into dev	2022-09-06 12:04:37 -07:00