Commit Graph

605 Commits

Author SHA1 Message Date
Brian Cao
fd1b9ff7b4 add permission to create report. 2024-02-22 13:47:28 -08:00
Mike Cao
2832ff9622 Always fetch website directly. 2024-02-19 18:30:44 -08:00
Mike Cao
fcba703f82 Merge remote-tracking branch 'origin/dev' into dev 2024-02-19 15:47:00 -08:00
Mike Cao
7639d6b36e Fixed share url. 2024-02-19 15:46:43 -08:00
Francis Cao
7fce92dffd fix active visitor bug 2024-02-19 13:39:57 -08:00
Mike Cao
1746d7d8fb Merge remote-tracking branch 'origin/dev' into dev 2024-02-19 11:31:21 -08:00
Mike Cao
d709f4eb80 Fixed websites paging. 2024-02-19 11:31:11 -08:00
Francis Cao
5468ca5dd3 fix getActiveVisitors return type 2024-02-19 11:18:50 -08:00
Mike Cao
9671414edd Updated types. 2024-02-19 10:05:51 -08:00
Mike Cao
117cb6168c Added hostUrl prop. 2024-02-19 09:36:44 -08:00
Mike Cao
d5b4da63df Updated page titles. 2024-02-17 15:12:14 -08:00
Mike Cao
709f46a391 Moved suspense boundary. 2024-02-17 10:41:34 -08:00
Mike Cao
54abab0bda Added suspense boundary. 2024-02-17 10:37:29 -08:00
Mike Cao
007625ecf7 Split up sso page. 2024-02-17 10:21:46 -08:00
Mike Cao
b76f4aa42d Merge branch 'analytics' into dev 2024-02-16 19:28:53 -08:00
Mike Cao
01fe95a891 Updated teams button props. 2024-02-16 19:26:46 -08:00
Mike Cao
b7083421e5 Added icon to teams button. 2024-02-16 19:02:31 -08:00
Mike Cao
44393472cf Updated teams button. 2024-02-16 18:58:15 -08:00
Francis Cao
8048bc7866 Fix viewonly for teams addwebsite button 2024-02-16 13:09:20 -08:00
Brian Cao
f5e87083eb Fix validation. 2024-02-16 12:02:18 -08:00
Mike Cao
a24e8b6396 Fixed "All time" and "Custom range" date selections. 2024-02-16 11:51:48 -08:00
Mike Cao
858864ef7f Fixed dashboard display. 2024-02-16 11:33:01 -08:00
Mike Cao
f25cd93012 Prevent admin from resetting their own role. 2024-02-16 10:22:18 -08:00
Mike Cao
8e6c7eef86
Merge branch 'dev' into master 2024-02-15 19:56:33 -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
1e6e468644
Merge pull request #2513 from Maxime-J/metrics-search
Fix metrics search when a value is null.
2024-02-15 19:13:18 -08:00
Mike Cao
5217d3009d Merge remote-tracking branch 'origin/dev' into dev 2024-02-15 14:45:48 -08:00
Mike Cao
7ab580c709 Added hooks for website stats and pageviews. 2024-02-15 14:45:07 -08:00
Mike Cao
45d77ac70a
Merge pull request #2502 from Maxime-J/os-names
Render correct OS names globally.
2024-02-15 12:56:06 -08:00
Francis Cao
71f904ce57 fix usemodified for team websites 2024-02-15 10:46:54 -08:00
Maxime-J
d1cbbf37c0 Fix metrics search when a value is null. 2024-02-15 14:25:33 +00: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
37e28bbf74
Merge branch 'dev' into os-names 2024-02-14 22:15:08 -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
jermanuts
c10e977951
Update ar-SA.json 2024-02-13 21:53:24 +03:00
Mike Cao
474113fe32
Merge pull request #2479 from enfiniteio/feat/api-send-visitor-ip
Allow setting visitor IP when registering event through API
2024-02-13 08:27:11 -08:00
Mike Cao
1d627a04bb
Merge pull request #2496 from bilguun0203/master
Update mn-MN.json
2024-02-13 08:22:54 -08:00
Mike Cao
a3f7382673 Added additional logic for handling website transfers. 2024-02-10 23:47:26 -08:00
Mike Cao
08b2f69658 Added exports to components lib. 2024-02-10 08:57:23 -08:00
Maxime-J
0be4a9b416 Render correct OS names globally. 2024-02-10 12:47:02 +00: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
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
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
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
0e144269ee Fixed website search. 2024-02-05 15:48:45 -08:00
Mike Cao
b9825304c3 Fixed paging. Updated edit props. 2024-02-05 15:32:36 -08:00
Mike Cao
d392e500c6 Export team data component. 2024-02-05 02:44:13 -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
Bilguun Ochirbat
5e072a566b
Update mn-MN.json 2024-02-05 14:21:16 +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
1a9501d8ce Missing use client. 2024-02-04 20:30:26 -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
406672886f Fixed save event. 2024-02-04 20:11:37 -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
ecb3af284f Missing 'use client'. 2024-02-02 22:35:46 -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
a91b9c9716 Merge remote-tracking branch 'origin/dev' into dev 2024-02-02 17:49:30 -08:00
Mike Cao
8f853ddb97 Teams context settings. 2024-02-02 17:49:17 -08:00
Brian Cao
5a8543fd25 Add version. 2024-02-01 13:35:34 -08:00
Brian Cao
6ab57a1ace Auto stash before merge of "dev" and "origin/dev" 2024-02-01 12:05:55 -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
c7df1063ac Added query hooks for website events and metrics. 2024-01-30 18:25:41 -08:00
Mike Cao
c5046d0043 Refactored date navigation. 2024-01-30 13:46:16 -08:00
Mike Cao
87bb9b1e73 Fixed reports queries. 2024-01-30 02:10:23 -08:00
Mike Cao
40970f6c33 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 00:10:57 -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
Brian Cao
3a5a3ce34f Add team user update. 2024-01-29 12:58:13 -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
Brian Cao
a2c202fa36 Re-add user delete. 2024-01-26 11:39:27 -08:00
Brian Cao
80883b5ff1 Update api for new teams. 2024-01-26 11:28:16 -08:00
Mike Cao
bd87f287e9 Fixed team counts. 2024-01-26 09:00:39 -08:00
Mike Cao
c6e52c247c Fixed team user delete. 2024-01-25 23:53:50 -08:00
Mike Cao
a226114374 Removed function deleteTeamWebsite. 2024-01-25 23:47:11 -08:00
Mike Cao
f85393f8df Teams refactor: removed team websites. 2024-01-25 23:20:53 -08:00
Ben
ebb29b8207 Allow setting visitor IP when registering event through API 2024-01-24 13:25:37 +01:00
Mike Cao
0d442b751d URI encode title, url and referrer in tracker. 2024-01-19 15:06:41 -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
Mike Cao
2552e1d495
Merge pull request #2473 from timokoessler/dev
Log IP address on failed login attempts
2024-01-17 14:52:40 -08:00
Timo Kössler
6bf1aa7f66
Modify logging of IP on failed login 2024-01-17 13:54:06 +01:00
Mike Cao
fbf87ee936 Merge remote-tracking branch 'origin/dev' into dev 2024-01-16 14:19:58 -08:00
Mike Cao
583d79859c Fixed user dropdown issue. 2024-01-16 14:19:44 -08:00
Francis Cao
5df49e9273 prevent column overflow 2024-01-16 10:48:26 -08:00
Timo Kössler
bfbe059505
Log IP address on failed login attempts 2024-01-16 12:24:28 +01:00
Mike Cao
70a9ba4efb Merge remote-tracking branch 'origin/dev' into dev 2024-01-14 21:17:23 -08:00
Mike Cao
28d2787880 Refactored tracker. Added handling for buttons. 2024-01-14 21:17:11 -08:00
Mike Cao
2197551e58 Removed do not track logic. 2024-01-14 19:04:02 -08:00
Mike Cao
6b9c83381c Updated types. 2024-01-14 02:21:39 -08:00
Francis Cao
37f6102ce2 update time blocks to hour instead of day 2024-01-08 11:42:38 -08:00
Mike Cao
a13856d325
Merge pull request #2453 from jaasonw/fix-typo
Replace all instances of "publically" with "publicly"
2024-01-08 03:19:07 -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
jaasonw
048707dffe replace all instances of publically with publicly 2023-12-27 23:02:29 -08:00
Mike Cao
63bfad4d9c Fixed profile button. 2023-12-27 19:14:23 -08:00
Mike Cao
6c4a297697 Added search to websites dropdown. 2023-12-27 14:20:36 -08:00
Francis Cao
f01abe23c6 show actions in users websites 2023-12-26 10:11:53 -08:00
Mike Cao
bb059abdb8 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 21:26:54 -08:00
Mike Cao
c9d3a18af7 Changed props for new Dropdown. 2023-12-22 21:26:42 -08:00
Mike Cao
0b39eebfc6
Merge pull request #2447 from Braggedtooth/update-swedish-lang
Update Localisation for Swedish language
2023-12-21 17:15:54 -10:00
Adebayo
b8e6517787
Update Swedish translation for default date range label 2023-12-22 03:57:18 +01:00
Adebayo
232b693932
Update Swedish translations 2023-12-22 03:53:57 +01: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
8f9c363e9b Added "use client" to ErrorBoundary component. 2023-12-20 10:42:58 -08:00
Mike Cao
a75f6679b9 Fixed CSP and telemetry errors. 2023-12-20 09:32:19 -08:00
Mike Cao
e86dfa43af Make es-ES the default for Spanish. 2023-12-20 00:04:06 -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
8f2fac10d1 fix formatvalue for city showing undefined 2023-12-19 19:03:53 -08:00
Francis Cao
cdc2624caf update submit button in team website add form 2023-12-15 09:52:49 -08:00
Mike Cao
9f7851b9f4 Upgrade to Prisma v5.7.0. 2023-12-14 14:01:58 -08:00
Mike Cao
310cf0b221 Fixed clear all filters button. 2023-12-13 00:59:19 -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
e67282d7d8 Render correct OS names. 2023-12-08 22:14:55 -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
3f657d97b2 Fixed bar chart rendering issue. 2023-12-03 23:16:50 -08:00
Mike Cao
e718b22599 Fixed types. 2023-12-03 23:02:28 -08:00
Mike Cao
66d7a815fc Fixed websites query. 2023-12-03 22:49:30 -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
Mike Cao
e462a55ab9 Merge remote-tracking branch 'origin/dev' into dev 2023-12-03 21:19:17 -08:00