360 Commits

Author	SHA1	Message	Date
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
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
Mike Cao	7450b76e6d	Refactored settings components.	2023-01-09 23:59:26 -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
Mike Cao	796c65fa29	Updated login check method.	2023-01-04 21:20:24 -08:00
Mike Cao	170b30b391	CSS fix.	2023-01-03 12:31:55 -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
Brian Cao	eb2f07c105	Event Data maximum size.	2022-12-29 14:51:51 -08:00
Mike Cao	c56f02c475	Refactored fetching to use react-query.	2022-12-28 15:43:22 -08:00
Mike Cao	cad0b73e42	Refactored useApi usage.	2022-12-27 20:20:44 -08:00
Brian Cao	561cde6e7e	Add admin check. (#1716) ... * Add admin check. * Fix teamId check.	2022-12-27 15:18:58 -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
Brian Cao	a91386434d	Remove snake_case.	2022-12-26 17:36:48 -08:00
Brian Cao	e1f99a7d01	Rewrite admin. (#1713) ... * Rewrite admin. * Clean up password forms. * Fix naming issues. * CSS Naming.	2022-12-26 16:57:59 -08:00
Mike Cao	4c202741c2	Fixed share page.	2022-12-13 11:27:55 -08:00
Mike Cao	cb4c8accea	Fixed admin checks.	2022-12-13 08:41:13 -08:00
Mike Cao	4cc22fcc95	Fix event data check.	2022-12-12 20:46:43 -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	4781a0cc8c	Added lib/types.	2022-12-02 14:15:24 -08:00
Brian Cao	06bebadbb9	Feat/um 114 roles and permissions (#1683) ... * Auth checkpoint. * Merge branch 'dev' into feat/um-114-roles-and-permissions	2022-12-01 20:53:37 -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
Brian Cao	502facd426	Allow user to be added to team with role.	2022-11-22 22:17:49 -08:00
Brian Cao	d85b2be5f8	Add event type to event.	2022-11-22 15:06:52 -08:00
Brian Cao	c90194dad4	Merge remote-tracking branch 'origin/dev' into dev	2022-11-21 23:23:20 -08:00
Brian Cao	9172098fa7	Fix login secure token creation.	2022-11-21 23:23:16 -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
Brian Cao	3efd2a5b10	Remove user/team transfer from website update.	2022-11-21 22:32:59 -08:00
Mike Cao	2259ee8d76	Initial conversion to react-basics.	2022-11-21 22:32:55 -08:00
Brian Cao	d60ad1c782	Fix isAdmin check. Fix Schema.	2022-11-21 16:44:42 -08:00
Brian Cao	371425ab60	Fix error when updating website.	2022-11-21 11:39:59 -08:00
Brian Cao	8fc6e99aa8	Add user role api.	2022-11-20 22:24:31 -08:00
Brian Cao	78225691df	Add permission checks.	2022-11-20 00:48:13 -08:00
Brian Cao	e28ee6597a	Fix Website auth.	2022-11-18 18:49:58 -08:00
Mike Cao	2b10802e07	Fix getWebsites call.	2022-11-18 09:47:06 -08:00
Brian Cao	25279271ce	Add some api/team endpoints.	2022-11-18 00:27:42 -08:00
Brian Cao	f5eb974d8d	Fix Typo.	2022-11-17 22:46:05 -08:00
Brian Cao	5aa8187e42	Add queries for new schema.	2022-11-17 22:27:33 -08:00
Brian Cao	0aaba8cbd1	Initial Typescript models.	2022-11-15 13:21:14 -08:00
Mike Cao	4f098a34c1	Hide user button for cloud.	2022-11-09 22:12:40 -08:00
Brian Cao	84375a582e	Fix isAdmin check.	2022-11-09 12:03:24 -08:00
Brian Cao	df84a16b95	Add external uuid to user create.	2022-11-09 10:59:03 -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	67732b9b5a	Refactor authentication and token handling.	2022-11-08 22:58:52 -08:00
Brian Cao	e9c8d16d5b	pass in correct arguments to save pageview/event	2022-11-08 16:45:23 -08:00
Mike Cao	208fcb8418	Added redis check to verify.	2022-11-08 12:28:45 -08:00
Brian Cao	13fd3ccd16	api and lib fixes (#1643)	2022-11-08 11:55:02 -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	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
Brian Cao	075d77abac	change const	2022-11-01 09:56:43 -07:00
Brian Cao	689b732829	Merge branch 'dev' into feat/um-23-v2-schema-init	2022-10-31 23:48:12 -07:00
Brian Cao	17041efaae	use uuid	2022-10-31 23:42:37 -07:00
Mike Cao	5d73a9c4b4	Merge remote-tracking branch 'origin/app' into dev	2022-10-31 20:21:19 -07:00
Brian Cao	3a617b7bfa	fix account delete bug	2022-10-31 18:50:05 -07:00
Mike Cao	c58e037a7e	Updated useConfig. Added SSO page.	2022-10-31 11:02:37 -07:00
Brian Cao	572df48667	assign backup	2022-10-31 10:38:37 -07:00
Brian Cao	d32d5e75e9	change owner by id	2022-10-29 15:50:29 -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
Brian Cao	08ec801fdc	remove GSS from 404	2022-10-27 14:48:21 -07:00
Brian Cao	99c975c329	add DISABLE_UI, DISABLE_ADMIN	2022-10-27 12:14:34 -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	ac070d3ce9	Fixed change password issue. API refactoring. Closes #1592.	2022-10-25 10:45:56 -07:00
Mike Cao	2290be7ca4	Fixed share page issue.	2022-10-24 19:48:10 -07:00
Mike Cao	59fdaf580f	Fixed share page.	2022-10-24 16:28:20 -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 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	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
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
Mike Cao	5e2d23f18f	Refactor auth logic.	2022-10-11 21:48:33 -07:00
Brian Cao	c147742d7a	use uuid	2022-10-11 19:37:38 -07:00
Mike Cao	edd1751b81	Merge changes	2022-10-10 21:38:02 -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
Mike Cao	2428314f58	Updated save method for websites.	2022-10-07 17:13:03 -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
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	b3d7d49448	Fix timezone bug (#1543)	2022-09-27 17:18:16 -07:00
Brian Cao	78c3453639	fix clickhouse calls (#1536)	2022-09-23 22:43:51 -07:00
Brian Cao	52e036964b	Merge Session/Event/Pageview CH	2022-09-12 09:55:34 -07:00
Mike Cao	13cf286874	Fix www replace.	2022-09-05 15:35:36 -07:00
Mike Cao	9f6834925b	Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning ... Admins can assign websites to non-admins	2022-09-03 23:17:06 -07:00
Mike Cao	efb52f5ff1	Fix crypto errors.	2022-08-29 08:31:16 -07:00