3737 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Cao	b6a900c5a4	Refresh websites after create.	2024-02-09 13:25:36 -08:00
Mike Cao	9e70667de1	Update exports for components lib.	2024-02-08 22:34:26 -08:00
Mike Cao	cc3393d1ff	Merge remote-tracking branch 'origin/dev' into dev	2024-02-08 19:34:36 -08:00
Mike Cao	04ec1d3990	Export ROLES constant.	2024-02-08 19:34:23 -08:00
Mike Cao	2d371098b4	Changed loading for TeamProvider.	2024-02-08 18:44:28 -08:00
Francis Cao	5e5ab6c7c3	fix teammember button conditions	2024-02-08 15:17:03 -08:00
Francis Cao	7c1cb7631d	fix cloud mode for teams	2024-02-08 15:11:42 -08:00
Francis Cao	e8d8a8a84a	Fix buttons / dropdown values	2024-02-08 14:05:35 -08:00
Francis Cao	6b381e7157	Remove team access code functionality from cloud mode	2024-02-08 13:44:51 -08:00
Mike Cao	d62dd3be44	Merge remote-tracking branch 'origin/dev' into dev	2024-02-08 13:40:56 -08:00
Mike Cao	56441a4157	Moved menu items to match cloud.	2024-02-08 13:40:44 -08:00
Francis Cao	a7ea9ea64b	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-08 13:01:47 -08:00
Francis Cao	c7e9190c95	add team member edit and remove confirmation	2024-02-08 13:01:39 -08:00
Mike Cao	b4a9ffe89e	Merge remote-tracking branch 'origin/dev' into dev	2024-02-08 11:47:55 -08:00
Mike Cao	642aba83e5	Changed Admin tab to Manage.	2024-02-08 11:47:32 -08:00
Francis Cao	5ae04291af	Disable website select for saved report. Fix delete website routing	2024-02-08 10:30:14 -08:00
Mike Cao	91e3dff7f5	Convert useModified into a real hook.	2024-02-07 23:48:51 -08:00
Mike Cao	a426c242cb	Fixed website edit for teams.	2024-02-07 23:20:41 -08:00
Mike Cao	32a97e68ec	Do not export page components.	2024-02-07 22:55:09 -08:00
Mike Cao	264c6954e9	Updated menu style.	2024-02-07 22:53:36 -08:00
Francis Cao	8da3811c73	add website in team context, permissions, display non-deleted users	2024-02-07 16:37:48 -08:00
Francis Cao	b885f57f40	only get non-deleted teams	2024-02-07 14:22:38 -08:00
Francis Cao	bc73410dba	remove default deleted_at	2024-02-07 14:01:25 -08:00
Francis Cao	c302939043	Remove admin panel if not team-owner	2024-02-07 13:45:06 -08:00
Francis Cao	a47f94c577	Allow only team owner to remove other members	2024-02-07 11:58:58 -08:00
Francis Cao	8969a010e8	go back to team settings on team delete	2024-02-07 11:43:00 -08:00
Francis Cao	0016a9f4e1	Add functionality to leave team	2024-02-07 11:33:35 -08:00
Mike Cao	d7f32e6987	Merge remote-tracking branch 'origin/dev' into dev	2024-02-07 10:27:33 -08:00
Mike Cao	91e679643f	Fixed TeamsProvider not working.	2024-02-07 10:27:23 -08:00
Mike Cao	46a57183a1	Fixed team users validation.	2024-02-07 10:26:36 -08:00
Francis Cao	ba081565fc	make zustand teams:members consistent, fix team delete	2024-02-06 23:42:37 -08:00
Francis Cao	87a18dc570	add modified to useTeamMembers, fix website delete	2024-02-06 23:04:22 -08:00
Francis Cao	f9f67264a5	Fix type errors in admin queries	2024-02-06 21:50:48 -08:00
Francis Cao	86d482f18a	make website/team add consistent	2024-02-06 20:53:13 -08:00
Mike Cao	194472b104	Removed TeamProvider from components.	2024-02-06 20:01:38 -08:00
Mike Cao	ec8176e2c2	Export team page.	2024-02-06 19:50:38 -08:00
Mike Cao	d307eb4317	Updated team provider.	2024-02-06 19:38:31 -08:00
Brian Cao	10f1b906ec	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-06 12:29:48 -08:00
Brian Cao	305a161509	Fix property.	2024-02-06 12:29:43 -08:00
Francis Cao	74ea4f511e	clean-up edit forms, removed unused params	2024-02-06 12:25:21 -08:00
Francis Cao	3277b65993	update @umami/prisma-client package	2024-02-06 11:17:59 -08:00
Mike Cao	f02bc13ac3	Fixed build.	2024-02-06 08:13:19 -08:00
Mike Cao	2975b560fd	Fixed import.	2024-02-06 00:57:02 -08:00
Mike Cao	3e4e338d13	Fixed more pages.	2024-02-06 00:53:53 -08:00
Mike Cao	b85109241b	Fixed pages.	2024-02-06 00:38:33 -08:00
Mike Cao	f7151a880e	Fixed 'use client' usage.	2024-02-05 23:59:33 -08:00
Mike Cao	be5592446a	Refactored teams components.	2024-02-05 20:29:00 -08:00
Mike Cao	0e144269ee	Fixed website search.	2024-02-05 15:48:45 -08:00
Mike Cao	1ba6f30401	Merge remote-tracking branch 'origin/dev' into dev	2024-02-05 15:32:48 -08:00
Mike Cao	b9825304c3	Fixed paging. Updated edit props.	2024-02-05 15:32:36 -08:00