Commit Graph

197 Commits

Author SHA1 Message Date
Brian Cao
40f53e8856 Merge branch 'feat/um-285-report-schema' into dev 2023-05-18 13:21:35 -07:00
Brian Cao
de509e7ccc checkpoint 2023-05-18 11:17:35 -07:00
Mike Cao
a5700d4a25 Added reports section. 2023-05-17 23:20:06 -07:00
Brian Cao
748ad84a52 Merge branch 'dev' into feat/um-285-report-schema 2023-05-16 14:12:39 -07:00
Francis Cao
f528fac7be fix teams api route and messaging 2023-05-16 11:06:42 -07:00
Brian Cao
b5f84159d2 funnel checkpoint 2023-05-15 14:03:42 -07:00
Brian Cao
07cb9f621d Funnel Table/Chart hooked up. 2023-05-14 21:38:03 -07:00
Brian Cao
1130bca195 Funnel form. 2023-05-11 16:42:58 -07:00
Francis Cao
5692c0e07d add formatted message to reset website 2023-05-02 23:44:42 -07:00
Brian Cao
65ebb26a70 Fix boolean event data. 2023-04-30 22:55:54 -07:00
Francis Cao
9b349b53c4 limit realtime record set to 15 2023-04-25 22:52:53 -07:00
Ash Monsh
8bc0fb92ba Update UsersList.js
show toast after creating user and refresh the list after delete
2023-04-23 05:43:09 +03:00
Mike Cao
987e3aabbd Fix tracking code form. 2023-04-21 17:21:44 -07:00
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
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
5f30cbd789
Merge pull request #1938 from MBRjun/dev
Bug Fix & Translation Updates
2023-04-20 11:24:59 -07: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
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
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
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
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
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
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
2656de6682 Updated language bundles with new keys. 2023-04-08 13:14:22 -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
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