Commit graph

313 commits

Author SHA1 Message Date
Francis Cao
8048bc7866 Fix viewonly for teams addwebsite button 2024-02-16 13:09:20 -08:00
Mike Cao
f25cd93012 Prevent admin from resetting their own role. 2024-02-16 10:22:18 -08:00
Mike Cao
b50bf535de
Merge pull request #2514 from Maxime-J/dev-fixes
Dev fixes
2024-02-15 19:13:40 -08:00
Mike Cao
7ab580c709 Added hooks for website stats and pageviews. 2024-02-15 14:45:07 -08:00
Maxime-J
b81f5112bc Add basePath for telemetry. 2024-02-15 10:59:00 +00:00
Mike Cao
f50067e44f Fixed website refresh after save. 2024-02-14 23:21:35 -08:00
Mike Cao
f01073c46a Update redirects for teams. 2024-02-14 22:13:13 -08:00
Mike Cao
1955166bdf Bump query limit to 500. 2024-02-14 15:13:53 -08:00
Mike Cao
bbf85cb110 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-14 13:16:37 -08:00
Mike Cao
ee3f7cb618 Updated root layout. 2024-02-14 12:37:41 -08:00
Francis Cao
928fb3ee89 remove cloudMode condition 2024-02-13 23:53:06 -08:00
Mike Cao
a3f7382673 Added additional logic for handling website transfers. 2024-02-10 23:47:26 -08:00
Mike Cao
d99fb09c37 Website transfer. 2024-02-09 19:37:45 -08:00
Mike Cao
b6a900c5a4 Refresh websites after create. 2024-02-09 13:25:36 -08:00
Mike Cao
cc3393d1ff Merge remote-tracking branch 'origin/dev' into dev 2024-02-08 19:34:36 -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
Francis Cao
8da3811c73 add website in team context, permissions, display non-deleted users 2024-02-07 16:37:48 -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
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
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
Francis Cao
74ea4f511e clean-up edit forms, removed unused params 2024-02-06 12:25:21 -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
b9825304c3 Fixed paging. Updated edit props. 2024-02-05 15:32:36 -08:00
Mike Cao
8bcea84409 Updated profile page. 2024-02-04 23:55:14 -08:00
Mike Cao
6802093d69 Added settings layout. 2024-02-04 22:35:14 -08:00
Mike Cao
d818bf5aaf Update show edit button logic for websites table. 2024-02-04 21:48:10 -08:00
Mike Cao
926effb0e3 Update teams table props. 2024-02-04 21:44:22 -08:00
Mike Cao
36f207c97d Updated team and websites tables. 2024-02-04 21:27:12 -08:00
Mike Cao
76c5d54b50 Missing team context. 2024-02-04 20:22:31 -08:00
Mike Cao
cac15b55ae Fixed component build. 2024-02-04 20:17:05 -08:00
Mike Cao
063e2d8c11 Use team context in edit. 2024-02-04 20:09:46 -08:00
Mike Cao
cc273092d5 Added website and team providers. 2024-02-04 19:53:06 -08:00
Mike Cao
dbb3801e66 Updates to team components. 2024-02-04 18:03:26 -08:00
Mike Cao
102f5b78b1 Added "use client". 2024-02-04 00:44:20 -08:00
Mike Cao
7ae3d47947 Update GH actions. 2024-02-04 00:32:31 -08:00
Mike Cao
d9670f10a4 Fixed team website create. 2024-02-04 00:09:15 -08:00
Mike Cao
e971f2533d Updated search queries. 2024-02-03 23:19:29 -08:00
Mike Cao
80a58cbdd1 Fixed type. 2024-02-02 22:48:03 -08:00
Mike Cao
bb0504065b Handle when team not found. 2024-02-02 22:30:01 -08:00
Mike Cao
238e6efee2 Added "use client" to hooks. 2024-02-02 22:20:13 -08:00
Mike Cao
400657d59e Updated profile menu. Fixed dashboard. 2024-02-02 21:06:55 -08:00
Mike Cao
8f853ddb97 Teams context settings. 2024-02-02 17:49:17 -08:00
Mike Cao
4429198397 Renamed id routes for API. 2024-01-31 22:08:48 -08:00
Mike Cao
53a991176b Changed icon for view actions. 2024-01-31 15:29:01 -08:00
Mike Cao
099aa7640b Updated teams button. 2024-01-31 15:09:57 -08:00
Mike Cao
992342aa72 Added teams button and Avatar component. 2024-01-31 02:30:49 -08:00
Mike Cao
b16f5cc067 Refactored queries. 2024-01-30 00:10:25 -08:00
Mike Cao
18e36aa7b3 Changed route ids to be more explicit. 2024-01-29 14:47:52 -08:00
Mike Cao
1a70350936 Removed SettingsContext. Added hostUrl prop. 2024-01-29 13:51:59 -08:00
Mike Cao
fec81695e8 Updated website, team and user save. 2024-01-29 03:15:22 -08:00
Mike Cao
2fa50892d8 Updated query hooks for teams and websites. 2024-01-29 01:32:05 -08:00
Mike Cao
9448aa3ab5 Added teams pages. Refactored hooks. 2024-01-28 18:33:40 -08:00
Mike Cao
f85393f8df Teams refactor: removed team websites. 2024-01-25 23:20:53 -08:00
Mike Cao
288836d4a5 Update team remove button. 2024-01-19 15:06:09 -08:00
Mike Cao
dc3818baaa Refactor of team websites. 2024-01-18 16:46:40 -08:00
Francis Cao
5df49e9273 prevent column overflow 2024-01-16 10:48:26 -08:00
Mike Cao
28d2787880 Refactored tracker. Added handling for buttons. 2024-01-14 21:17:11 -08:00
Mike Cao
6b9c83381c Updated types. 2024-01-14 02:21:39 -08:00
Mike Cao
1e0c177fe6 Added search to languages and timezone. 2024-01-03 10:17:27 -08:00
Mike Cao
c24fe079f1 Tracking script should use defer instead of async. 2024-01-02 22:22:15 -08:00
Francis Cao
f01abe23c6 show actions in users websites 2023-12-26 10:11:53 -08:00
Mike Cao
c9d3a18af7 Changed props for new Dropdown. 2023-12-22 21:26:42 -08:00
Mike Cao
e5f820bd49
Merge pull request #2445 from uzzii-21/Hide-Add-Website-button-for-View-Only-users
fix: Hide Add Website button for View Only users
2023-12-21 14:06:11 -10:00
Uzair Ahmed
778beafae2 fix: Hide Add Website button for View Only users 2023-12-22 01:29:13 +05:00
Mike Cao
fe14f84497 Disable prefetch for /settings. 2023-12-20 13:57:31 -08:00
Mike Cao
a75f6679b9 Fixed CSP and telemetry errors. 2023-12-20 09:32:19 -08:00
Mike Cao
479ce985a9 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-12-19 23:20:14 -08:00
Mike Cao
54ace15338 Allow hiding of create team button. 2023-12-19 23:20:04 -08:00
Francis Cao
cdc2624caf update submit button in team website add form 2023-12-15 09:52:49 -08:00
Mike Cao
9f73aba900 Added external links for pages. 2023-12-13 00:02:54 -08:00
Mike Cao
442ad61779 Created admin API endpoints. 2023-12-12 21:23:12 -08:00
Mike Cao
e1c65cdf2a Updated loading for reports. 2023-12-12 20:05:45 -08:00
Mike Cao
907685b96e Added limit to metrics queries. 2023-12-12 19:00:44 -08:00
Mike Cao
765874731d Added search to real-time activity log. 2023-12-10 20:12:13 -08:00
Mike Cao
cad719fd23 Added search to metrics table. 2023-12-10 02:02:24 -08:00
Mike Cao
3a28fea8ac Fixed broken links behavior. 2023-12-09 22:45:55 -08:00
Mike Cao
08bd9e8357 Upgrade to Next 14. 2023-12-09 22:18:47 -08:00
Mike Cao
44e243ad12 Moved SettingsProvider to root Providers component. 2023-12-09 21:30:57 -08:00
Mike Cao
92a513e4d0 Fixed realtime chart rendering. 2023-12-09 20:55:50 -08:00
Mike Cao
7a5f28870f Fixed realtime chart rendering of initial payload. 2023-12-09 01:41:07 -08:00
Mike Cao
c520a329d2 Fixed activity log timestamp. 2023-12-09 01:25:02 -08:00
Mike Cao
8d31f43f0f Convert realtime components to TS. 2023-12-09 00:35:54 -08:00
Mike Cao
c8eb76c7af Fixed share url. 2023-12-06 01:26:58 -08:00
Mike Cao
4fca98d25d Added SettingsContext. 2023-12-05 19:22:14 -08:00
Mike Cao
905b480c13 Fixed mutate. 2023-12-03 22:20:36 -08:00
Mike Cao
a4f8ab6ad9 Fixed mutate queries. 2023-12-03 21:35:20 -08:00
Brian Cao
4d3d784c68 Fix dashboard call. 2023-12-03 20:15:02 -08:00
Mike Cao
7c42f0da82 Typescript refactor. 2023-12-03 03:07:03 -08:00
Mike Cao
b578162cb6 Refactored useQuery functions. 2023-12-01 20:27:59 -08:00
Mike Cao
e068ac0dd9 Fixed insights report. 2023-12-01 16:02:50 -08:00
Mike Cao
a224a3caf3 Upgrade prisma. Lint fixes. 2023-11-30 21:58:11 -08:00
Mike Cao
a7cb0eaa20
Merge pull request #2379 from Maxime-J/ordered-filter-values
Sort filter values
2023-11-30 15:48:48 -10:00
Mike Cao
d08cba0df7
Merge pull request #2401 from esdete2/bugfix-user-creation
Fix user creation process
2023-11-30 14:37:46 -10:00
Mike Cao
c24a0c87dc Updated login check. 2023-11-29 14:03:10 -08:00
Mike Cao
4dedc57d0a Updated clients. 2023-11-22 18:03:48 -08:00
Philip Schmidt
27f5c8fceb execute onSave only if exists / update cache and show toast 2023-11-17 16:01:36 +01:00
Mike Cao
366ef35d3d Updated types. 2023-11-13 14:12:05 -08:00
Mike Cao
bdf2fa4f05 Fixed import. 2023-11-11 20:47:06 -08:00
Mike Cao
70cee9f5e8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/App.tsx
2023-11-11 20:46:41 -08:00
Mike Cao
eda2c07ea3 Allow embedding of share page. 2023-11-11 20:45:09 -08:00
Maxime-J
f016970186 fix single filter value 2023-11-05 17:11:50 +00:00
Francis Cao
cd1a98f51b Fix worldmap mapping 2023-11-03 15:46:12 -07:00
Maxime-J
d5eddeae24 sort formatted filter values 2023-11-03 11:53:23 +00:00
Mike Cao
02c3d2bab3 Moved files. New components build. 2023-10-30 17:18:48 -05:00
Mike Cao
9aa2830d2b Fixed test console. 2023-10-19 17:01:21 -07:00
Mike Cao
435e6a155d Add scroll prop to links. 2023-10-17 11:27:35 -07:00
Mike Cao
9af6e08c00 Mobile fixes for metrics bar. 2023-10-16 22:46:49 -07:00
Mike Cao
a43422d81f Updated menu view for mobile. 2023-10-16 21:55:59 -07:00
Mike Cao
81a810bd73 Fixed filter parameters. 2023-10-16 20:44:22 -07:00
Mike Cao
8cb1c4ed7a Merge remote-tracking branch 'origin/dev' into dev 2023-10-15 20:24:44 -07:00
Mike Cao
2732ed18a4 Updated report header. 2023-10-15 20:24:28 -07:00
Brian Cao
d5c4202ee4 Fixed settings/profile cloudMode. 2023-10-15 16:06:41 -07:00
Mike Cao
aa5d81d6a1 Fixed website select. 2023-10-15 14:07:53 -07:00
Mike Cao
8d85e3fcdb Update ListTable display of items. 2023-10-15 13:12:29 -07:00
Mike Cao
1351e6f14a Fixed issue with removing team members. 2023-10-15 02:08:29 -07:00
Mike Cao
096484ebe4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/websites/[id]/reports/WebsiteReports.js
2023-10-14 22:00:36 -07:00
Mike Cao
012d31e010 Updated ReportsTable. 2023-10-14 21:59:54 -07:00
Francis Cao
c4bbd09de4 Fix website reports error 2023-10-14 11:07:18 -07:00
Brian Cao
4906986080 Fix data map. 2023-10-13 12:47:47 -07:00
Francis Cao
88aa341821 add date param to values 2023-10-13 09:31:53 -07:00
Mike Cao
c18daf4845 Fixed share page. Updated data tables to be responsive. 2023-10-12 16:13:14 -07:00
Mike Cao
a15fb89c90 Added card mode to DataTable. 2023-10-12 00:03:10 -07:00
Mike Cao
a79183cd13 Layout fixes for DataTable. 2023-10-11 10:02:32 -07:00
Mike Cao
83fb358355 Added more cache checks. 2023-10-08 00:15:29 -07:00
Mike Cao
ef9f8ed816 Updated DataTable rendering. 2023-10-07 22:58:46 -07:00
Mike Cao
8b48130d5f Refactored teams components. 2023-10-07 22:42:49 -07:00
Mike Cao
6253d55790 Refactored forms and pages. 2023-10-07 18:55:14 -07:00
Mike Cao
1325abe31d Updated validations for websites. 2023-10-04 19:22:26 -07:00
Mike Cao
a14e11bae2 Updated add team website form. 2023-10-04 01:46:00 -07:00
Mike Cao
c990459238 Renamed (app) folder to (main). 2023-10-03 16:05:17 -07:00
Mike Cao
476dd52875 Layout updates. 2023-10-03 09:45:02 -07:00
Mike Cao
e4c5f42189 CSS updates. 2023-10-02 23:51:26 -07:00
Mike Cao
9bb89c7e8b Replaced SettingsTable with DataTable. 2023-10-01 16:11:12 -07:00
Mike Cao
5e3c135388 Cleaned up pages. Fixed SSO page. 2023-09-29 20:19:27 -07:00
Mike Cao
3720a5a2fc Fix CSS. Updated pages. 2023-09-29 19:18:44 -07:00
Mike Cao
9a52cdd2e1 Refactored to use app folder. 2023-09-29 05:29:22 -07:00