Commit Graph

3183 Commits

Author SHA1 Message Date
Francis Cao
5fc96cf5e1 fix logout error 2023-04-12 22:53:38 -07:00
Mike Cao
5997efc276 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-12 20:03:16 -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
4a1c6f40a6 Fix config. 2023-04-12 13:41:00 -07:00
Mike Cao
e2fcd40c2b Added SettingsTable. 2023-04-12 13:40:19 -07:00
Kai Steinke
0926a4c310
feat: add missing locales and sort alphabetically 2023-04-11 10:53:43 +02:00
Francis Cao
21e48c194e fix system user insert mysql 2023-04-10 09:56:25 -07:00
Francis Cao
f5f6dc052e fix column name date bug 2023-04-10 09:44:25 -07:00
Mike Cao
da79e4c19e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-10 07:29:15 -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
07c92ff9b5 Compiled language bundles. 2023-04-08 15:56:13 -07:00
Mike Cao
0dc6529cf1 Added new languages to lib/lang. 2023-04-08 15:51:49 -07:00
Mike Cao
7b97cb3348 Merged messages. 2023-04-08 14:07:36 -07:00
Mike Cao
2798de0c4c Added de-CH file. 2023-04-08 14:06:43 -07:00
Mike Cao
b2bebaea3e Added km-KH, updated be-BY. 2023-04-08 13:58:58 -07:00
Mike Cao
e850fbd0bd Merge changes from master. 2023-04-08 13:55:52 -07:00
Mike Cao
2dbc6ce381 Updated languages. 2023-04-08 13:49:58 -07:00
Mike Cao
2656de6682 Updated language bundles with new keys. 2023-04-08 13:14:22 -07:00
Mike Cao
63e535eea4
Merge pull request #1870 from kaisteinke/master
Add Swiss German language locale (de-CH)
2023-04-08 02:30:30 -07:00
Mike Cao
45d3fa4016 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-08 01:36:21 -07:00
Brian Cao
f45995e8b5 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 22:45:49 -07:00
Brian Cao
7b07de7a98 Api work for remove user. 2023-04-07 22:45:46 -07:00
Mike Cao
f0cddc2743 Fixed messages. 2023-04-07 22:03:52 -07:00
Mike Cao
ee8d1ee9e3
Merge pull request #1785 from enricopaulini/master
Label Incrementions and pt-BR update
2023-04-07 21:46:57 -07:00
Francis Cao
6ee846d102
Merge pull request #1875 from umami-software/dev
add referrer_domain to getEvent
2023-04-07 14:40:16 -07:00
Francis Cao
7a1ac22dde add referrer_domain to getEvent 2023-04-07 14:37:22 -07:00
Francis Cao
0f6cfca522
Merge pull request #1874 from umami-software/dev
fix urlPath clickhouse
2023-04-07 14:27:04 -07:00
Francis Cao
24ac7d6be0 fix urlPath clickhouse 2023-04-07 14:23:38 -07:00
Mike Cao
a33706585b Merge branch 'dev' into analytics 2023-04-07 11:49:31 -07:00
Mike Cao
6424100223 Fixed typo in query. 2023-04-07 11:48:43 -07:00
Brian Cao
f4f657b666 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 11:40:30 -07:00
Brian Cao
6b0d6c0d1c Delete event_data on website reset/delete. 2023-04-07 11:40:28 -07:00
Mike Cao
459fbc03ce Merge branch 'dev' into analytics 2023-04-07 11:39: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
b1fbb20967 Merge branch 'dev' into analytics 2023-04-06 20:41:24 -07:00
Mike Cao
594660f298 Reverted SSO process. 2023-04-06 20:35:55 -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
Kai Steinke
767b25a9af
Update lang/de-CH.json
Co-authored-by: Philipp <49908921+pwuersch@users.noreply.github.com>
2023-04-06 23:40:40 +02:00
Kai Steinke
5325996a56
Update lang/de-CH.json
fix: delete warning message correct grammar

Co-authored-by: Philipp <49908921+pwuersch@users.noreply.github.com>
2023-04-06 23:36:21 +02:00
Kai Steinke
e71200a53f
feat: add ch-DE locale 2023-04-06 23:14:13 +02:00