Commit Graph
100 Commits
Author SHA1 Message Date
Mike Cao cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -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
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 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 4cc22fcc95 Fix event data check. 2022-12-12 20:46:43 -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
Mike Cao a4e80ca3e5 Refactored permissions check. Updated redis lib. 2022-12-01 10:58:50 -08:00
Mike Cao fe01574b16 Updated login form. 2022-11-28 11:14:24 -08:00
Mike Cao f98a97ef83 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 22:33:13 -08:00
Mike Cao 2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Mike Cao c0a18e13fa Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 10:08:14 -08:00
Mike Cao 1e5174c211 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:09:40 -08:00
Mike Cao df50d9cefc Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:04:53 -08:00
Mike Cao 817880b511 Updated lint-staged config. 2022-11-19 18:28:46 -08:00
Mike Cao 21072c712c Ignore typescript build errors. 2022-11-18 10:00:12 -08:00
Mike Cao 2b10802e07 Fix getWebsites call. 2022-11-18 09:47:06 -08:00
Mike Cao 4bc3d46efb Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 03:21:55 -08:00
Mike Cao 803ce54fef Merge remote-tracking branch 'origin/dev' into dev 2022-11-18 03:21:13 -08:00
Mike Cao bba8876522 Fix destructure error. 2022-11-18 03:20:45 -08:00
Mike Cao 592c3fa6e6 Merge remote-tracking branch 'origin/dev' into dev 2022-11-16 11:45:04 -08:00
Mike Cao 8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Mike Cao 091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao e9b1869eb8 Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 09:44:08 -08:00
Mike Cao 1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Mike Cao cd9036adaf Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 04:47:24 -08:00
Mike Cao c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Mike Cao 4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Mike Cao d2100c33b7 Update auth logic. 2022-11-09 10:16:50 -08:00
Mike Cao 76cad96a24 Updated auth to check for uuid. 2022-11-09 10:15:21 -08:00
Mike Cao 8a74138e17 Fixed website create. 2022-11-09 07:40:17 -08:00
Mike Cao 3b705e6cb4 Fetch user inside useAuth. 2022-11-09 06:40:36 -08:00
Mike Cao 1bce4f2174 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 22:59:01 -08:00
Mike Cao 67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Mike Cao 1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Mike Cao 208fcb8418 Added redis check to verify. 2022-11-08 12:28:45 -08:00
Mike Cao 168283bf11 Merge remote-tracking branch 'origin/dev' into dev 2022-11-07 22:35:59 -08:00
Mike Cao f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao 3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Mike Cao a9112f39ec Updated schema. 2022-11-04 16:15:26 -07:00
Mike Cao 6b13d3eaa3 Added eslint declarations. 2022-11-03 21:33:37 -07:00
Mike Cao 1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Mike Cao 05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Mike Cao d5fd333633 Bump version v2.0.0-beta.1. 2022-10-31 20:33:06 -07:00
Mike Cao 486ac3fad1 Merge branch 'app' into dev 2022-10-31 20:31:54 -07:00
Mike Cao dbe6884016 Bump version v1.39.4. Updated packages, languages. 2022-10-31 20:30:02 -07:00
Mike Cao 5d73a9c4b4 Merge remote-tracking branch 'origin/app' into dev 2022-10-31 20:21:19 -07:00
Mike Cao c58e037a7e Updated useConfig. Added SSO page. 2022-10-31 11:02:37 -07:00
Mike Cao f10c8ba9e2 Merge branch 'app' into dev 2022-10-28 20:49:55 -07:00
Mike Cao 246e4e5f4f Fix disable checks. 2022-10-28 10:34:50 -07:00
Mike Cao 98835bbc78 Define uiDisabled at build time. 2022-10-27 17:02:54 -07:00
Mike Cao fc9584eb44 Refactor env check. 2022-10-27 16:42:57 -07:00
Mike Cao d05fd2bd3d Refactor redis calls. 2022-10-25 20:17:13 -07:00
Mike Cao 8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
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
Mike Cao 994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Mike Cao 2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -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 9c36dc485e Removed update-db step. 2022-10-18 14:23:17 -07:00
Mike Cao e429abc08e Added error conditions for website updates. 2022-10-12 15:52:31 -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
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 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
Mike Cao 5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -07:00
Mike Cao edd1751b81 Merge changes 2022-10-10 21:38:02 -07: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 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
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 5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -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
Mike Cao ea427f9366 Merge branch 'master' into dev 2022-09-12 14:38:50 -07:00
Mike Cao fb6aabaf06 Updated language bundles. 2022-09-12 14:36:27 -07:00
Mike Cao 24b2322987 Merge branch 'master' into dev 2022-09-06 12:04:37 -07:00
Mike Cao 405d264ad6 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-06 12:04:34 -07:00
Mike Cao bf8ebde0b1 Bump version. 2022-09-06 12:04:08 -07:00
Mike Cao 81ca9c9665 Bump version. 2022-09-05 16:44:44 -07:00
Mike Cao b829d84fc1 Merge remote-tracking branch 'origin/dev' into dev 2022-09-05 15:36:10 -07:00
Mike Cao 13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Mike Cao 52bbc3692d Fix issue with generating URLs. 2022-09-05 12:04:30 -07:00