Commit Graph

1949 Commits

Author SHA1 Message Date
Mike Cao
46a18f2918 Fixed account lookup. 2022-10-25 11:01:28 -07:00
Mike Cao
2ad5cd9335 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/auth.js
2022-10-25 10:46:32 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Brian Cao
ebf439c598
fix auth, add pg extension (#1596) 2022-10-25 10:27:43 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Aidan Marshall
574dbff07e Adds @netlify/plugin-nextjs package & fixed dashboard link id 2022-10-25 15:01:49 +01:00
Mike Cao
94dc915272
Merge pull request #1582 from umami-software/dev
Fixed share page issue.
2022-10-24 19:50:34 -07:00
Mike Cao
2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -07:00
Mike Cao
80f22313f6
Merge pull request #1580 from umami-software/dev
v1.39
2022-10-24 18:03:43 -07:00
Mike Cao
fc879bbb7d Bump version 1.39.0. 2022-10-24 16:37:47 -07:00
Mike Cao
59fdaf580f Fixed share page. 2022-10-24 16:28:20 -07:00
Mike Cao
5429ffc1a6 Bump version. 2022-10-24 15:47:02 -07:00
Mike Cao
99c8752aa5 Add guard around location redirect. 2022-10-24 15:25:07 -07:00
Mike Cao
4bad94f436 Upgraded Next and Prisma. 2022-10-24 15:21:30 -07:00
Mike Cao
3e550f8f14 Updated language bundles. 2022-10-24 12:17:21 -07:00
Mike Cao
abe5bb5b84
Merge pull request #1576 from mikusaa/master
Update zh-CN.json
2022-10-24 12:12:41 -07:00
mikusa
35d57f4b79
Update zh-CN.json
Add translations for Yesterday date-range option.
2022-10-24 10:46:37 +08:00
Brian Cao
500a2b9663 fix column names 2022-10-21 22:30:52 -07:00
Brian Cao
a320d65652 default column/filters 2022-10-21 22:19:51 -07:00
Brian Cao
ba31f48f1a
Feat/um 49 query builder api (#1573)
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
2022-10-21 21:33:23 -07:00
mike
9c36dc485e Removed update-db step. 2022-10-18 14:23:17 -07:00
Mike Cao
6147c3502a
Merge pull request #1567 from umami-software/feat/um-69-nice
add cloud_mode
2022-10-12 17:33:54 -07:00
Brian Cao
9e8748e2f3 checkpoint 2022-10-12 16:29:44 -07:00
Mike Cao
e429abc08e Added error conditions for website updates. 2022-10-12 15:52:31 -07:00
Brian Cao
db1ae3f2c7 add cloud_mode 2022-10-12 15:35:33 -07:00
Mike Cao
4e756727ed Merge remote-tracking branch 'origin/dev' into dev 2022-10-12 13:11:55 -07:00
Mike Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Brian Cao
9147415761 add index to uuid 2022-10-12 12:20:20 -07:00
Mike Cao
c33729e185 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-10-11 23:48:05 -07:00
Mike Cao
71badb8d52
Merge pull request #1566 from umami-software/feat/um-66-update-clickhouse-schema-uuid
Feat/um 66 update clickhouse schema UUID
2022-10-11 23:29:22 -07:00
Brian Cao
249f02d073 fix schema 2022-10-11 23:10:32 -07:00
Brian Cao
07d003e858 fix collect 2022-10-11 23:09:06 -07:00
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