Commit Graph

766 Commits

Author SHA1 Message Date
Mike Cao
115a2560a7
Merge branch 'dev' into dev 2023-04-21 14:57:04 -07:00
Mike Cao
223f0051ed Only display first tracker script name. 2023-04-21 14:45:06 -07:00
Mike Cao
6c09dd1e23 Merge remote-tracking branch 'origin/dev' into dev 2023-04-21 14:39:15 -07:00
Mike Cao
e6c5a9b17d Added country to regions display. 2023-04-21 14:35:00 -07:00
Mike Cao
69b9458975 Removed rollup for components. 2023-04-21 13:16:54 -07:00
Mike Cao
a0894866b9 POC for exporting components. 2023-04-21 12:43:37 -07:00
Mike Cao
8bddc666b4 Refactored exports. 2023-04-21 08:00:42 -07:00
Maxime-J
b2d8423dcb restore login localization 2023-04-21 13:14:14 +00:00
Francis Cao
322990b03b userstable css fix for edit button 2023-04-20 12:10:33 -07:00
Francis Cao
7aac95a410 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-20 12:07:10 -07:00
Francis Cao
cce966c48c Fix realtime countries / visitors 2023-04-20 12:07:04 -07:00
Mike Cao
1d639c77a2
Merge pull request #1931 from atmonshi/more-rtl-ui
rotate arrows in rtl
2023-04-20 11:53:28 -07:00
php coder
80aad4ef55
Update WebsiteMenuView.js 2023-04-20 21:49:42 +03:00
Mike Cao
4bd8b44420
Merge pull request #1942 from atmonshi/rtl-css
fix some css for RTL
2023-04-20 11:25:59 -07:00
Mike Cao
5f30cbd789
Merge pull request #1938 from MBRjun/dev
Bug Fix & Translation Updates
2023-04-20 11:24:59 -07:00
Ash Monsh
5cd4e9fd8d fix some css for RTL 2023-04-20 21:08:56 +03:00
Francis Cao
fa3659fcf6 fix user password edit and fix prisma schema for updated_at columns 2023-04-20 10:46:58 -07:00
MBRjun
981abd5966
fix: get tracking code correctly 2023-04-20 22:41:25 +08:00
Ash Monsh
aba523cbee rotate arrows in rtl 2023-04-20 12:41:06 +03:00
Mike Cao
f0d13efc7a Fix typo. 2023-04-19 22:11:00 -07:00
Mike Cao
98028f1756 Add version info. 2023-04-19 19:33:24 -07:00
Mike Cao
e33a8e054b Updated how datasets are loaded, preventing chart redraw. 2023-04-19 18:38:08 -07:00
Mike Cao
b1856c7eb3 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-19 17:03:11 -07:00
php coder
1520f21b82
Merge branch 'umami-software:master' into ui-rtl 2023-04-20 03:01:20 +03:00
Mike Cao
1d9cb0d7c7 Fix message. 2023-04-19 16:42:42 -07:00
Mike Cao
8bd289ad01 Fixed realtime metrics display. Closes #1899. 2023-04-19 11:46:41 -07:00
Mike Cao
cc20f898b1 Localize x axis labels. Closes #1913 2023-04-19 11:41:31 -07:00
Ash Monsh
ab48a0882a rotate the arrow icon for rtl language
rotate the arrow icon for rtl language
2023-04-19 07:31:25 +03:00
Ash Monsh
aca612c833 Update ProfileButton.js
set alignment base on the page dir for User profile menu
2023-04-19 07:30:43 +03:00
Ash Monsh
a52bfaa629 Update LanguageButton.js
set alignment base on the page dir for Language menu
2023-04-19 07:30:09 +03:00
Francis Cao
0889542f3b fix minimum password length message 2023-04-18 16:00:33 -07:00
Maxime-J
b3c1eb1437 ensure some translations 2023-04-18 14:35:45 +00:00
Mike Cao
d2edb0d0d7 Manually merge PR #1799. 2023-04-17 10:26:08 -07:00
Francis Cao
43499eb4fd fix region / city filters 2023-04-17 00:10:51 -07:00
Mike Cao
561770a469 Add selected state. 2023-04-16 20:46:38 -07:00
Mike Cao
061d8cd174 Fixed incorrect messages. 2023-04-16 16:34:49 -07:00
Mike Cao
b183fc1600 Fixed map issue. 2023-04-13 23:05:54 -07:00
Mike Cao
e286994397 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	public/iso-3166-2.json
2023-04-13 22:30:22 -07:00
Mike Cao
f2edd0d604 Added regions and cities support. 2023-04-13 22:28:29 -07:00
Francis Cao
aa418e0bed add delete user label for modal 2023-04-13 17:20:42 -07:00
Francis Cao
887b3abb29 Fix deleteWebsite message 2023-04-13 17:10:04 -07:00
Francis Cao
cc9b1d21cb fix delete team confirmation message 2023-04-13 16:14:05 -07:00
Brian Cao
ef324fdf73 Fix update user. 2023-04-13 12:08:53 -07:00
Mike Cao
a30147547b Fix dropdown css. 2023-04-12 17:47:11 -07:00
Mike Cao
4e36149e32 Merge remote-tracking branch 'origin/dev' into dev 2023-04-12 17:43:18 -07:00
Mike Cao
b32ced5501 Responsive fixes for settings pages. 2023-04-12 17:43:08 -07:00
Mike Cao
e2fcd40c2b Added SettingsTable. 2023-04-12 13:40:19 -07:00
Francis Cao
f5f6dc052e fix column name date bug 2023-04-10 09:44:25 -07:00
Mike Cao
f84e41e198 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	components/messages.js
2023-04-10 07:25:27 -07:00
Mike Cao
94ed67e339 Responsive updates. 2023-04-09 20:22:28 -07:00
Brian Cao
3e1c1a85e4 update label. 2023-04-09 17:42:34 -07:00
Brian Cao
339085a946 Add 'admin' label 2023-04-09 16:17:30 -07:00
Brian Cao
f7119d494b Fix translation. 2023-04-09 16:06:59 -07:00
Brian Cao
9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Mike Cao
53b23420a4 Fixed country names lookup. 2023-04-08 16:31:21 -07:00
Mike Cao
0dc6529cf1 Added new languages to lib/lang. 2023-04-08 15:51:49 -07:00
Mike Cao
2656de6682 Updated language bundles with new keys. 2023-04-08 13:14:22 -07:00
Mike Cao
f0cddc2743 Fixed messages. 2023-04-07 22:03:52 -07:00
Francis Cao
f38f0c6420
Merge pull request #1873 from umami-software/bug/um-250-fix-realtime-data
fix some components in realtime data
2023-04-07 10:56:42 -07:00
Francis Cao
db845d6c04 remove urlpath conditional 2023-04-07 10:28:54 -07:00
Mike Cao
25d4a9cec0 Added ProfileButton to cloud mode. 2023-04-06 20:34:02 -07:00
Francis Cao
05ece6a4d0 fix some components in realtime data 2023-04-06 18:31:16 -07:00
Mike Cao
f56374b259 Migrate changes from cloud. 2023-04-05 09:55:21 -07:00
Mike Cao
d851a9e88b Fixed test console error. 2023-04-04 00:27:25 -07:00
Brian Cao
93707606df Fix chart re-render. 2023-04-03 17:26:37 -07:00
Brian Cao
d47724858a Fix team message. 2023-04-03 14:35:31 -07:00
Mike Cao
5103da331a Remove visible check. 2023-04-03 03:12:12 -07:00
Mike Cao
4e9d661d82 Merge remote-tracking branch 'origin/dev' into dev 2023-04-02 14:23:30 -07:00
Mike Cao
8b966a04b0 Fixed password update. 2023-04-02 14:23:21 -07:00
Brian Cao
6805a8978a Move loading button logic out. 2023-04-02 12:24:50 -07:00
Mike Cao
2713e3316a Fixed font. 2023-04-02 10:00:28 -07:00
Mike Cao
8da72a693d Fix filter clear all button. 2023-04-01 21:06:11 -07:00
Mike Cao
2411aeae8d Updated scrollbar styles. 2023-04-01 20:40:01 -07:00
Mike Cao
8397102bac Switch to next/font. 2023-04-01 20:03:38 -07:00
Mike Cao
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Mike Cao
57c3d03cc8 Removed Tag component. 2023-03-31 22:01:36 -07:00
Mike Cao
17601c4dea Style scrollbars. 2023-03-31 21:31:58 -07:00
Mike Cao
14802afe8b Fixed pages table loading. Fixed z-indexes. 2023-03-31 20:03:28 -07:00
Mike Cao
9dd35b3766 Fixed metrics display. 2023-03-31 05:55:28 -07:00
Brian Cao
e4c801e823 Merge remote-tracking branch 'origin/dev' into dev 2023-03-30 10:46:01 -07:00
Brian Cao
c175120aa2 Add page title to test console. 2023-03-30 10:45:58 -07:00
Mike Cao
358519dddd Removed filters from pages. 2023-03-29 23:29:37 -07:00
Mike Cao
d471d05217 Added config to open websites in new tab. 2023-03-29 23:08:26 -07:00
Brian Cao
6d5aeb3bd1 Fix joining team dupe. Add loading to team member remove. Fix messages. 2023-03-29 16:02:14 -07:00
Mike Cao
cdacb640c6 Updated tracker and collect. 2023-03-26 04:15:08 -07:00
Mike Cao
43ef6884df Updated layout for settings pages. 2023-03-24 10:55:20 -07:00
Mike Cao
9260e5bc33 Updated settings. 2023-03-23 16:33:10 -07:00
Brian Cao
9979672de5
Feat/um 202 event data new (#1841)
* Add event_data base.

* Add url_path.

* Add eventData back.

* Finish event_data relational.

* resolve comments.
2023-03-23 14:01:15 -07:00
Mike Cao
c2789d70bc Added SideNav component. 2023-03-23 11:46:49 -07:00
Mike Cao
9ddb8b5d25 Use useMessages hook everywhere. 2023-03-22 14:05:55 -07:00
Mike Cao
f3e1f18e1b Updated sticky header logic. 2023-03-22 01:53:34 -07:00
Mike Cao
fc2a8f3d9f Updated navigation. 2023-03-21 21:28:36 -07:00
Mike Cao
611169c65f Fix referrers table. 2023-03-20 13:39:40 -07:00
Francis Cao
ffb2771819 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-20 11:27:00 -07:00
Francis Cao
b0c5899569 update prisma / ch filters logic 2023-03-20 11:26:45 -07:00
Mike Cao
c62e2e9cc7 Update tooltip date formats. 2023-03-16 15:56:05 -07:00
Mike Cao
afec08b355 Fixed grid lines on bar chart. 2023-03-16 02:05:56 -07:00
Mike Cao
be8eb61f7f Fixed issue with responsive charts. 2023-03-14 23:29:53 -07:00
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Mike Cao
3823705fc6 Added HoverTooltip component. Removed react-tooltip. 2023-03-14 11:35:24 -07:00
Mike Cao
9a3e8921a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-03-10 18:45:51 -08:00
Mike Cao
6ba00152c2 Updated filter tags. 2023-03-10 17:49:19 -08:00
Brian Cao
72af76a417 Merge remote-tracking branch 'origin/dev' into dev 2023-03-09 23:21:23 -08:00
Brian Cao
701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -08:00
Mike Cao
fd83b63a30 Updated metrics logic. 2023-03-09 20:42:55 -08:00
Mike Cao
c3426a67ee Add messages for devices. 2023-03-09 15:18:54 -08:00
Brian Cao
8a9532f213
Feat/um 197 hook up teams (#1825)
* Link up teams UI.

* Fix auth order.

* PR touchups.
2023-03-09 12:42:12 -08:00
Mike Cao
f908476e71 Fixed link issue. 2023-03-09 10:39:59 -08:00
Mike Cao
0607e9f442 Upgraded next to 13. Fixed date filter for websites. 2023-03-08 20:23:32 -08:00
Mike Cao
696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -08:00
Mike Cao
3fc5f5151b Touch up footer. 2023-03-03 21:26:39 -08:00
Mike Cao
bb99b3eba5 Fixed sticky header scrolling. Updated settings button. 2023-03-03 12:37:26 -08:00
Mike Cao
5262d19c8b Fix update notice. 2023-03-01 23:59:01 -08:00
Brian Cao
82f0bc3d2b
remove event_data. (#1804) 2023-03-01 16:42:47 -08:00
Mike Cao
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Mike Cao
5657a64c77 Pass domain to realtime components. 2023-02-24 02:41:02 -08:00
Mike Cao
7d3334ccce Fixed realtime logs. 2023-02-22 20:59:59 -08:00
Mike Cao
8ecc6400ef Fixed visitor calculation. 2023-02-17 22:17:29 -08:00
Mike Cao
802c262cd9 Fixed realtime chart display. 2023-02-17 21:42:42 -08:00
Mike Cao
93b77672f3 More updates to realtime. 2023-02-15 02:27:18 -08:00
Mike Cao
28921a7cd5 Updates to realtime. Fixed refresh button. 2023-02-14 17:23:20 -08:00
Mike Cao
638a674e99 Fixed filter tags. Added clear all option. 2023-02-11 22:10:14 -08:00
Mike Cao
4a689bf294 Added website menu view. Fixed pages filter. 2023-02-10 23:21:50 -08:00
Mike Cao
d4437427c4 Removed prop-types. 2023-02-10 03:37:06 -08:00
Mike Cao
c815e7cd51 More refactoring and clean-up. 2023-02-10 03:26:57 -08:00
Mike Cao
f062cdbed2 Updated sticky header logic. 2023-02-09 08:22:36 -08:00
Mike Cao
45c13da262 More deletes. Fixed sticky header. 2023-02-08 23:14:11 -08:00
Mike Cao
87bbaa7f1d Fixed tooltips. 2023-02-07 22:17:55 -08:00
Mike Cao
ad5e34a894 Fixed lint issues. 2023-02-07 16:29:25 -08:00
Mike Cao
54d5af5cbb Progress check-in. 2023-02-04 08:59:52 -08:00
Mike Cao
0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Mike Cao
835289a1f8 Fixed team websites query. 2023-02-02 03:30:09 -08:00
Mike Cao
22aeaf7166 Added owner column to teams table. 2023-02-02 02:54:43 -08:00
Mike Cao
656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
Mike Cao
02a1438cfe More refactoring. 2023-01-30 21:44:07 -08:00
Mike Cao
5f15ad0807 More refactoring, cleaned up icons, nav buttons, add messages. 2023-01-27 21:53:13 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Mike Cao
cdd54df8f6 Refactored user components. 2023-01-23 15:32:35 -08:00
Mike Cao
91af593ff5 Updated settings components. 2023-01-20 17:12:53 -08:00
Mike Cao
1d9c3133f0 Refactored layout. Added NavBar component. 2023-01-18 15:05:39 -08:00
Mike Cao
53ec66e820 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/pages/login/LoginForm.js
2023-01-11 14:48:17 -08:00
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
Brian Cao
f654e6728c Fix links. 2023-01-11 10:49:04 -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
70ef857dc7 Fix links. 2023-01-10 00:13:32 -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