Mike Cao
|
ae49317c93
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-19 18:38:46 -07:00 |
|
Mike Cao
|
e33a8e054b
|
Updated how datasets are loaded, preventing chart redraw.
|
2023-04-19 18:38:08 -07:00 |
|
Mike Cao
|
1cfebc8c78
|
Merge pull request #1896 from lozanoSergio/develop
fix typo prisma mysql schema
|
2023-04-19 17:09:31 -07:00 |
|
Mike Cao
|
06d19e8594
|
Merge branch 'dev' into develop
|
2023-04-19 17:09:21 -07:00 |
|
Mike Cao
|
eb7a83b404
|
Merge pull request #1879 from kaisteinke/master
Add missing locales
|
2023-04-19 17:07:03 -07:00 |
|
Mike Cao
|
afde1377dc
|
Merge branch 'dev' into master
|
2023-04-19 17:06:46 -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 |
|
Mike Cao
|
f2c0b4253a
|
Merge pull request #1917 from atmonshi/ui-rtl
UI rtl
|
2023-04-19 17:02:25 -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
|
dbafc98142
|
Update checkout action.
|
2023-04-19 16:20:45 -07:00 |
|
Mike Cao
|
b39ef68372
|
Update language bundle.
|
2023-04-19 13:18:47 -07:00 |
|
Mike Cao
|
b95208afcd
|
Merge pull request #1921 from MBRjun/dev
i18n: update zh-CN translations
|
2023-04-19 13:15:44 -07:00 |
|
Mike Cao
|
374555aff3
|
Updated prisma to 4.13.0.
|
2023-04-19 12:51:42 -07:00 |
|
MBRjun
|
af14ccb60e
|
i18n: update zh-CN translations
|
2023-04-20 03:03:33 +08:00 |
|
Mike Cao
|
8bd289ad01
|
Fixed realtime metrics display. Closes #1899.
|
2023-04-19 11:46:41 -07:00 |
|
Mike Cao
|
9c2242012e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-19 11:41:40 -07:00 |
|
Mike Cao
|
cc20f898b1
|
Localize x axis labels. Closes #1913
|
2023-04-19 11:41:31 -07:00 |
|
Francis Cao
|
2cd1f5541b
|
add event type to getWebsiteStats
|
2023-04-19 09:13:16 -07:00 |
|
Mike Cao
|
083a9ffc2c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-19 08:49:47 -07:00 |
|
Mike Cao
|
ac8d8bbd1e
|
Added middleware for docker.
|
2023-04-19 08:49:16 -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 |
|
Francis Cao
|
16ece9ad64
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-18 12:45:08 -07:00 |
|
Francis Cao
|
e8ca23c390
|
update mysql min versino to 5.7
|
2023-04-18 11:27:55 -07:00 |
|
Mike Cao
|
3eabe9b958
|
Merge branch 'dev'
|
2023-04-18 10:56:05 -07:00 |
|
Mike Cao
|
78030eb4a0
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-18 10:55:55 -07:00 |
|
Mike Cao
|
db31810e68
|
Updated messages.
|
2023-04-18 10:04:49 -07:00 |
|
Mike Cao
|
81bc5d730e
|
Merge pull request #1897 from atmonshi/update-lang
update missing translation for arabic lang
|
2023-04-18 09:53:26 -07:00 |
|
Mike Cao
|
64d2cf3805
|
Merge pull request #1904 from screendriver/noindex
Prevent indexing content by search engines
|
2023-04-18 09:51:46 -07:00 |
|
Mike Cao
|
3d64985f1a
|
Merge pull request #1910 from jonaskuske/patch-1
fix: use new script name in update-tracker.js
|
2023-04-18 09:51:15 -07:00 |
|
Mike Cao
|
03f7f910f2
|
Merge pull request #1911 from Maxime-J/localization
ensure some translations
|
2023-04-18 09:50:37 -07:00 |
|
Mike Cao
|
ab0066517d
|
Merge pull request #1912 from Maxime-J/fr
update fr-FR
|
2023-04-18 09:49:28 -07:00 |
|
Francis Cao
|
939f4752bb
|
Fix mysql prisma schema teamuser
|
2023-04-18 09:43:58 -07:00 |
|
Mike Cao
|
56ad1c1602
|
Merge pull request #1908 from dngferreira/master
fix version sql on check_db.js
|
2023-04-18 09:37:29 -07:00 |
|
Maxime-J
|
c548ac9ca3
|
update fr-FR
|
2023-04-18 14:51:04 +00:00 |
|
Maxime-J
|
b3c1eb1437
|
ensure some translations
|
2023-04-18 14:35:45 +00:00 |
|
Jonas
|
e19d612db2
|
fix: use new script name in update-tracker.js
|
2023-04-18 16:29:30 +02:00 |
|
Duarte Ferreira
|
94df42a306
|
fix version sql on check_db.js
|
2023-04-18 15:17:34 +01:00 |
|
Christian Rackerseder
|
904f9408d8
|
Prevent indexing content by search engines
|
2023-04-18 14:05:43 +02:00 |
|
Ash Monsh
|
10a4921942
|
update missing translation for arabic lang
|
2023-04-18 10:27:17 +03:00 |
|
Sergio
|
a7daae2d20
|
fix typo prisma mysql schema
|
2023-04-18 09:07:59 +02:00 |
|
Mike Cao
|
bac8edd113
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-17 11:13:08 -07:00 |
|
Mike Cao
|
dfae0c150d
|
Merge branch 'dev'
# Conflicts:
# components/common/Calendar.js
# components/common/EventDataButton.js
# components/forms/EventDataForm.js
# components/layout/Header.js
# db/mysql/migrations/02_add_event_data/migration.sql
# lang/be-BY.json
# lang/de-CH.json
# lang/es-MX.json
# lang/fa-IR.json
# lang/km-KH.json
# lang/lt-LT.json
# lang/th-TH.json
# lib/auth.js
# lib/detect.ts
# lib/lang.js
# lib/middleware.js
# lib/prisma.js
# package.json
# pages/_app.js
# pages/api/accounts/[id]/password.js
# pages/api/collect.js
# pages/api/realtime/init.js
# pages/api/websites/[id]/index.js
# pages/api/websites/[id]/reset.ts
# pages/api/websites/index.js
# public/intl/messages/fa-IR.json
# public/intl/messages/lt-LT.json
# public/intl/messages/pt-BR.json
# public/intl/messages/th-TH.json
# queries/analytics/event/getEventData.js
# queries/analytics/event/getEventMetrics.js
# queries/analytics/pageview/getPageviewMetrics.js
# queries/analytics/pageview/getPageviewParams.js
# queries/analytics/pageview/getPageviewStats.js
# queries/analytics/session/getSessionMetrics.js
# queries/analytics/stats/getActiveVisitors.js
# queries/analytics/stats/getWebsiteStats.js
# sql/schema.mysql.sql
# styles/index.css
# yarn.lock
|
2023-04-17 11:08:17 -07:00 |
|
Mike Cao
|
0e4c071b16
|
Bump version v2.0.0.
|
2023-04-17 10:36:24 -07:00 |
|
Mike Cao
|
d406564af3
|
Manually merge PR #1879.
|
2023-04-17 10:31:50 -07:00 |
|
Mike Cao
|
60984e031c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-17 10:26:37 -07:00 |
|
Mike Cao
|
d2edb0d0d7
|
Manually merge PR #1799.
|
2023-04-17 10:26:08 -07:00 |
|