Compare commits

..

3633 commits

Author SHA1 Message Date
Bradley Shellnut
8e45fc8d67
Merge branch 'umami-software:master' into master 2024-10-05 16:27:31 -07:00
Mike Cao
d8e46e487c
Update README.md 2024-10-05 10:16:21 -07:00
Bradley Shellnut
e09f77d173
Merge branch 'umami-software:master' into master 2024-09-24 06:33:55 +00:00
Mike Cao
1b6429f55b
Merge pull request #2968 from umami-software/dependabot/npm_and_yarn/next-14.2.10
Bump next from 14.2.5 to 14.2.10
2024-09-17 22:37:06 -07:00
dependabot[bot]
501d016ae3
Bump next from 14.2.5 to 14.2.10
Bumps [next](https://github.com/vercel/next.js) from 14.2.5 to 14.2.10.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v14.2.5...v14.2.10)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-18 05:32:03 +00:00
Bradley Shellnut
935727bf32
Merge branch 'umami-software:master' into master 2024-08-30 23:48:19 -07:00
Mike Cao
e881735a23
Merge pull request #2918 from umami-software/dev
v2.13.2
2024-08-27 19:30:56 -07:00
Francis Cao
ff0c825a7b fix retention report dates and days 2024-08-27 17:07:43 -07:00
Francis Cao
ef98ceac2f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-27 16:28:09 -07:00
Francis Cao
b89fb0a962 Fix autofocus on events page 2024-08-27 16:28:03 -07:00
Mike Cao
ed5ff81684 Bump version v2.13.2. 2024-08-27 16:24:03 -07:00
Mike Cao
178f9dc1a7 Updated lang files. 2024-08-27 16:23:34 -07:00
Mike Cao
d310066769 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-27 16:23:12 -07:00
Mike Cao
89257605b3 Show stats changes on dashboard page. Closes #2840 2024-08-27 16:21:31 -07:00
Francis Cao
398a665791 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-27 16:02:50 -07:00
Francis Cao
ab050e51c5 Fix tooltip label, retention report for mysql, pass minDate into eventsChart 2024-08-27 16:02:43 -07:00
Mike Cao
fc9ec268bb
Merge pull request #2904 from konstantintutsch/dev
Update German translation
2024-08-27 15:55:42 -07:00
Mike Cao
23648ed331
Merge pull request #2905 from gerardnll/patch-3
Update ca-ES.json
2024-08-27 15:54:16 -07:00
Mike Cao
ed0d778e97 Merge branch 'master' into dev 2024-08-27 15:52:27 -07:00
Mike Cao
35f7930df6
Merge pull request #2910 from quiple/ko-kr
Update Korean translation
2024-08-27 15:52:14 -07:00
Mike Cao
bcb05f61d5
Merge pull request #2914 from quiple/string
Fix some strings
2024-08-27 15:51:33 -07:00
Francis Cao
a5e2242486 Merge branch 'analytics' of https://github.com/umami-software/umami into dev 2024-08-27 14:22:29 -07:00
Francis Cao
981a655654 fix mindate logic 2024-08-27 14:17:42 -07:00
Mike Cao
1341f449a8 Merge remote-tracking branch 'origin/dev' into dev 2024-08-27 14:01:47 -07:00
Mike Cao
291c64f7b0 Updated initialization process. 2024-08-27 14:01:29 -07:00
Francis Cao
b1caf6edb7 fix monthly and all time charts 2024-08-27 12:02:23 -07:00
Minseo Lee
a92fa260e1 Update RealtimeLog.tsx 2024-08-27 16:04:22 +09:00
Minseo Lee
248722edbf Fix name of KakaoTalk 2024-08-27 15:53:49 +09:00
Minseo Lee
8776af9bc8 OS strings in visitorLog 2024-08-27 15:53:19 +09:00
Minseo Lee
0f93f18364 Update ko-KR.json 2024-08-27 15:40:29 +09:00
Francis Cao
a219f5dbe3 pass timezone in stats CH query 2024-08-26 10:36:07 -07:00
Gerard Nesta
83cfc659df
Update ca-ES.json 2024-08-24 09:27:32 +02:00
Konstantin Tutsch
e033438023
Fix various errors in German translation 2024-08-24 09:16:04 +02:00
Konstantin Tutsch
50bdc23425
Remove occasional informal address from German translation
Consistent use of “Siezen” (addressing the use formally/polite)
2024-08-24 09:12:53 +02:00
Konstantin Tutsch
633b26315e
Fix use of Website and Webseite in German translation
See https://www.duden.de/sprachwissen/sprachratgeber/website-oder-webseite for further details.
2024-08-24 09:05:30 +02:00
Konstantin Tutsch
c480a971d3
Update German translation
Improvements to previous translation

New translations for 8ee37d1246
2024-08-24 08:58:38 +02:00
Mike Cao
5d37810686
Merge pull request #2903 from umami-software/dev
v2.13.1
2024-08-23 20:12:44 -07:00
Mike Cao
bba584a09f Bump version. 2024-08-23 20:11:40 -07:00
Mike Cao
2c4d7f1810 Updated lang. 2024-08-23 20:10:58 -07:00
Mike Cao
ff6a090456
Merge pull request #2900 from gerardnll/patch-2
Update ca-ES.json
2024-08-23 20:09:20 -07:00
Francis Cao
a15d0ca94a fix UTC issues 2024-08-23 19:23:04 -07:00
Francis Cao
004ccdc22f fix order by and revert getDateSQL 2024-08-23 16:43:38 -07:00
Gerard Nesta
b9f8647262
Update ca-ES.json 2024-08-23 22:35:56 +02:00
Mike Cao
47a6170a83
Merge pull request #2895 from umami-software/dev
Updated ja-JP
2024-08-23 09:34:38 -07:00
Mike Cao
8500669ed0 Updated lang. 2024-08-23 09:33:58 -07:00
Mike Cao
a600da1bb7
Merge pull request #2894 from err931/err931-patch-1
Update ja-JP.json
2024-08-23 09:33:30 -07:00
Minoru Maekawa
0ef936eec6
Update ja-JP.json 2024-08-23 17:56:37 +09:00
Mike Cao
d1eabaf60c
Merge pull request #2892 from umami-software/dev
v2.13.0
2024-08-22 22:55:16 -07:00
Mike Cao
60f1b7b755 Revert session stats change. 2024-08-22 13:42:22 -07:00
Mike Cao
8f934d2552 Reapply "Fixed realtime chart for relational. Removed getDateArray. Added chart min/max dates."
This reverts commit 5e5b61dc7e.
2024-08-22 13:15:48 -07:00
Mike Cao
5e5b61dc7e Revert "Fixed realtime chart for relational. Removed getDateArray. Added chart min/max dates."
This reverts commit 647dcb5f25.
2024-08-22 13:14:40 -07:00
Mike Cao
82f766342e Merge remote-tracking branch 'origin/dev' into dev 2024-08-22 12:02:56 -07:00
Mike Cao
647dcb5f25 Fixed realtime chart for relational. Removed getDateArray. Added chart min/max dates. 2024-08-22 12:02:36 -07:00
Mike Cao
fb67f44a3f
Merge pull request #2891 from wjsoj/master
fix: a small type error
2024-08-22 09:04:43 -07:00
wjsoj
cfb3fcafc9 fix: a small type error 2024-08-22 23:54:45 +08:00
Mike Cao
9311f0a183 Merge remote-tracking branch 'origin/dev' into dev 2024-08-22 03:11:10 -07:00
Mike Cao
9b88611a38 Fixed search field disappearing when results are empty. Closes #2879. 2024-08-22 03:10:48 -07:00
Francis Cao
db7d705767 fix getwebsiteevent search 2024-08-21 15:25:42 -07:00
Francis Cao
7bc5635b9d fix websiteSession screens 2024-08-21 15:08:22 -07:00
Francis Cao
917916c224 update queries for event / session properties and values screens 2024-08-21 13:51:28 -07:00
Mike Cao
2c0ba65ba0 Merge remote-tracking branch 'origin/dev' into dev 2024-08-20 23:58:45 -07:00
Mike Cao
e35c11c3d6 Updated realtime data fetch. 2024-08-20 23:58:20 -07:00
Francis Cao
0220091cff add paging for relational raw query 2024-08-20 18:59:24 -07:00
Mike Cao
04e0b33622 Updated Clickhouse number handling. Removed number formatting. 2024-08-20 14:53:53 -07:00
Mike Cao
caa9da9166 Removed junk. 2024-08-20 14:16:35 -07:00
Mike Cao
511fec2ddb Fixed timezone date format. 2024-08-20 14:15:47 -07:00
Mike Cao
17e2658fdc Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-20 13:59:14 -07:00
Francis Cao
adc65e4487 fix websiteEvent query 2024-08-20 13:57:40 -07:00
Mike Cao
a1b7b9087e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-20 12:48:17 -07:00
Francis Cao
8ee4fc32fd fix css console errors 2024-08-20 09:28:10 -07:00
Francis Cao
eb05e2ada6 fix getDateWeeklySQL 2024-08-20 09:21:15 -07:00
Mike Cao
da28fe8fe9 Fixed some styles. 2024-08-20 01:15:33 -07:00
Mike Cao
5aba9acb81 Fixed date value for properties. 2024-08-20 00:34:01 -07:00
Mike Cao
10239fefcd Fixed docker build for Prisma. 2024-08-19 15:24:02 -07:00
Mike Cao
dc9b1dc446 Rolled back Prisma to 5.17. 2024-08-19 12:58:00 -07:00
Mike Cao
07576bef61 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/queries/analytics/getWebsiteStats.ts
2024-08-19 10:55:39 -07:00
Mike Cao
8d92509f71 Fixed queries. 2024-08-19 10:53:31 -07:00
Francis Cao
7ae3c790cd fix relational queries for new screens 2024-08-19 10:28:10 -07:00
Francis Cao
66510fd441 Merge branch 'analytics' of https://github.com/umami-software/umami into dev 2024-08-19 09:37:49 -07:00
Francis Cao
a058552d39 add sessionstats query for performance, countries, events values 2024-08-19 09:35:22 -07:00
Mike Cao
89313e754e Merge branch 'dev' into analytics 2024-08-18 10:40:29 -07:00
Mike Cao
e98bc3bd74 Changed session weekly to dots. 2024-08-18 10:38:28 -07:00
Mike Cao
ceacc25021 Fixed session weekly rendering bug. 2024-08-18 00:15:20 -07:00
Mike Cao
56f6beeb45 Merge branch 'dev' into analytics 2024-08-17 21:51:42 -07:00
Mike Cao
e853ed7ae9 Updated weekly session styles. 2024-08-17 21:51:29 -07:00
Mike Cao
12bebdd61f Merge branch 'dev' into analytics 2024-08-17 21:36:18 -07:00
Mike Cao
7add059f43 Updated weekly session labels. 2024-08-17 21:32:42 -07:00
Mike Cao
ffa954ee02 Updated data query limits. 2024-08-17 20:27:40 -07:00
Mike Cao
b6b1488ddf Updated packages. 2024-08-17 20:00:58 -07:00
Mike Cao
25d002cefc Merge branch 'dev' into analytics 2024-08-17 13:26:42 -07:00
Mike Cao
53d8548909 Weekly session data. 2024-08-16 23:42:26 -07:00
Mike Cao
fc1fc5807e Session properties. 2024-08-16 19:44:16 -07:00
Mike Cao
deb9dd60df Render UTC dates in sessions. 2024-08-16 00:35:08 -07:00
Francis Cao
439377f5c5 add final keyword to session data queries 2024-08-15 12:04:48 -07:00
Francis Cao
c79720ae1d update session data schema 2024-08-15 09:28:39 -07:00
Francis Cao
db25f241c0 clean up session properties / values 2024-08-14 12:57:43 -07:00
Francis Cao
aaf9adacc6 add event name to properties table 2024-08-14 12:29:47 -07:00
Mike Cao
04de691893 Removed custom date format. Use ISO string everywhere. 2024-08-13 22:16:21 -07:00
Mike Cao
0bd57bb158 Added display of session properties. 2024-08-13 21:42:20 -07:00
Francis Cao
3805a0b431 limit event/session table to 1000 for performance 2024-08-13 10:49:04 -07:00
Francis Cao
7ae53e2650 fix event property format, fix realtime date format 2024-08-13 10:11:12 -07:00
Francis Cao
ae3888ced8 fix loading spinner / no results bug 2024-08-13 09:21:20 -07:00
Francis Cao
f9c7129a3e implement visit duration 2024-08-13 08:45:52 -07:00
Mike Cao
fc758745dc Fixed date display for session profile. 2024-08-13 01:04:28 -07:00
Mike Cao
af64602951 Added map to sessions page. 2024-08-13 00:56:41 -07:00
Mike Cao
9b005e11c0 Created formatDate function for rendering dates in correct timezone. 2024-08-13 00:40:19 -07:00
Mike Cao
b11b2e3524 Display correct date for events/sessions. 2024-08-12 23:54:21 -07:00
Mike Cao
78728b8706 Fixed event search. Removed session time from profile. 2024-08-11 23:14:02 -07:00
Mike Cao
1e52eeb0f0 Updated header nav. 2024-08-09 20:02:46 -07:00
Francis Cao
22333a1e9a remove event from website stats. doesnt work with view 2024-08-09 18:20:26 -07:00
Francis Cao
136dd6794e update websitesession, add session duration 2024-08-09 17:27:06 -07:00
Francis Cao
3646039e54 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-09 15:49:39 -07:00
Francis Cao
a1c0ec9c81 update getSessionActivity / getWebsiteSession 2024-08-09 15:49:30 -07:00
Mike Cao
4c0d7d960d Fixed empty logic. 2024-08-09 15:02:48 -07:00
Mike Cao
c7d39a3e94 Fixed session properties. 2024-08-09 14:13:34 -07:00
Mike Cao
5feae93162 Fixed share page. 2024-08-09 13:37:39 -07:00
Mike Cao
840c1c02bf Fixed type icons. 2024-08-09 11:49:08 -07:00
Mike Cao
67874a6282 Update event property styles. 2024-08-09 01:41:21 -07:00
Mike Cao
8ee37d1246 New event data screen. 2024-08-09 01:09:54 -07:00
Mike Cao
10c438d1de Fixed components build. 2024-08-08 16:22:24 -07:00
Mike Cao
4703ba61ad Merge remote-tracking branch 'origin/dev' into dev 2024-08-08 12:00:51 -07:00
Mike Cao
f135e4ffbb Moved events components to events page. Updated map data loading. 2024-08-08 12:00:38 -07:00
Francis Cao
166b704166 fix transfer website button disable logic 2024-08-08 10:30:45 -07:00
Francis Cao
60d53382ca remove revenue report 2024-08-08 09:20:46 -07:00
Mike Cao
c6b8114945 Updated events page. 2024-08-07 22:39:36 -07:00
Mike Cao
3a97bfe11c Merge remote-tracking branch 'origin/dev' into dev 2024-08-07 00:10:38 -07:00
Mike Cao
b9068c0050 Added metrics bar and date range to sessions. 2024-08-07 00:10:25 -07:00
Francis Cao
3fd9d6b148 limit contain filters on country, region, city 2024-08-05 13:57:33 -07:00
Mike Cao
36663bd52d
Merge pull request #2873 from RayeEvtuch/website-transfer-permissions
Allow Team Managers to transfer websites to teams
2024-08-05 10:30:04 -07:00
Mike Cao
e473381c74
Merge pull request #2842 from eagleon/master
fix: Compatible with browsers that do not support ES2019
2024-08-04 20:43:20 -07:00
Mike Cao
bcc712a40c
Merge pull request #2841 from Cuzart/fix/mobile-dvh-and-dashboard-website-header-breaking
fix: mobile dvh and dashboard website header breaking
2024-08-04 20:42:21 -07:00
Mike Cao
9722a76b79
Merge pull request #2868 from beforetech/master
chore: fix comment
2024-08-04 20:40:56 -07:00
Mike Cao
a48866a870
Merge pull request #2855 from israelozarate7/update-es-translations-and-fix-typo
Update es-ES translations
2024-08-04 20:40:11 -07:00
Mike Cao
4e83fcc888 Merge branch 'Feuerhamster-improve-de-translation' into dev 2024-08-04 20:39:24 -07:00
Mike Cao
f8ce85c6f7 Merge branch 'improve-de-translation' of https://github.com/Feuerhamster/umami into Feuerhamster-improve-de-translation 2024-08-04 20:38:32 -07:00
Mike Cao
1190f5f3ac
Merge pull request #2871 from lsvs/feat/update-by-lang
feat: Update Belarusian translations
2024-08-04 20:23:41 -07:00
Raye Evtuch
0988808b75
Allow team managers to transfer websites to teams 2024-08-04 20:31:53 -05:00
Mike Cao
440db17000 Added created date to session data save. 2024-08-03 22:02:41 -07:00
Sergey Lisovskiy
4e7e1019bd feat: Update be-BY translations 2024-08-03 18:51:44 +04:00
Mike Cao
eda18d3795 Fixed website details page not rendering. 2024-08-02 17:52:53 -07:00
Mike Cao
1195695b72 Upgrade next. 2024-08-02 17:50:00 -07:00
Mike Cao
a88fda0942 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-08-02 15:25:27 -07:00
Mike Cao
9d3513256f Updated session link. 2024-08-02 15:25:08 -07:00
Francis Cao
dc52449cfd Merge branch 'analytics' of https://github.com/umami-software/umami into dev 2024-08-02 09:54:49 -07:00
Francis Cao
7582670aef fix retention report invalid date 2024-08-02 00:14:32 -07:00
Francis Cao
2c18cca3cd
Merge pull request #2870 from umami-software/feat/clickhouse-performance
Feat/clickhouse performance
2024-08-01 23:02:36 -07:00
Francis Cao
d02dc6f997 remove parse session filters 2024-08-01 22:57:54 -07:00
Mike Cao
3262ea0285 Updated avatar colors and events table. 2024-08-01 22:53:17 -07:00
Mike Cao
9c32057841 Redo events tab to show all events. 2024-08-01 21:05:43 -07:00
Francis Cao
3207b0ce06 revert AggregatingMergeTree order by 2024-08-01 16:40:48 -07:00
Francis Cao
57a23bab2d fix hourly order by 2024-08-01 16:16:18 -07:00
Francis Cao
61dfa1391e add projection code 2024-08-01 15:34:35 -07:00
Francis Cao
9882ff24f6 route dashboard queries based on filters selected 2024-08-01 15:32:49 -07:00
Francis Cao
cb4368e12c template multiple queries for filtering 2024-07-31 09:35:29 -07:00
beforetech
1e5616a872 chore: fix comment
Signed-off-by: beforetech <mail@before.tech>
2024-07-31 22:21:58 +08:00
Mike Cao
10f65cae68 Responsive styles for session page. 2024-07-30 22:10:32 -07:00
Mike Cao
b3e6e52473 Added session data display. 2024-07-30 21:22:19 -07:00
Mike Cao
f32bf0a2e0 Session details screen. 2024-07-29 19:09:13 -07:00
Mike Cao
c3c3b46ef6 Updated session profile page. Added TypeIcon component. Added useRegionNames hook. 2024-07-29 01:38:36 -07:00
Mike Cao
ac60d08ee5 Sessions page. 2024-07-28 19:51:14 -07:00
Francis Cao
3494ae46b7 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2024-07-25 12:33:35 -07:00
Francis Cao
cd0f185f77 remove revenue report 2024-07-25 12:24:10 -07:00
Francis Cao
2742f1708d remove sessions link 2024-07-24 17:55:37 -07:00
Francis Cao
161da582ba reorder CH stats index 2024-07-24 16:57:23 -07:00
Francis Cao
3205b4f0f4 fix realtime queries for stats 2024-07-23 22:44:10 -07:00
Francis Cao
174b9e4376 only use hourly table, remove daily table logic, fix updatechart undefined 2024-07-23 22:35:11 -07:00
Francis Cao
038ecdb592 fix pkey for stats tables 2024-07-23 15:34:25 -07:00
Israel Ortiz de Zárate
e5d176547a
Merge branch 'dev' into update-es-translations-and-fix-typo 2024-07-23 17:46:46 +02:00
Israel Ortiz de Zárate
9f3138e9b4 Update translations and fix typos 2024-07-23 17:26:03 +02:00
Francis Cao
7ec845db36 fix undefined datasets 2024-07-22 23:16:57 -07:00
Francis Cao
9957080f36 Merge branch 'feat/clickhouse-mv' into dev 2024-07-22 22:13:56 -07:00
Francis Cao
6d0ae13bc8 add back exclude domain logic 2024-07-22 22:13:04 -07:00
Francis Cao
5299e9f579 resolve entry / exit queries 2024-07-22 21:30:06 -07:00
Mike Cao
faffa8b185 Merge remote-tracking branch 'origin/dev' into dev 2024-07-22 18:08:00 -07:00
Mike Cao
829a45b40e Added sessions table. 2024-07-22 18:06:36 -07:00
Francis Cao
77fcdc0646 Merge branch 'dev' of https://github.com/umami-software/umami into feat/clickhouse-mv 2024-07-19 11:27:03 -07:00
Francis Cao
3a4cefef72 update event/pageview metrics 2024-07-19 11:20:18 -07:00
Lena Emme
5eead0e1c8 improve german translation 2024-07-16 14:17:00 +02:00
eagleon
60d4d8db22 fix: Compatible with browsers that do not support ES2019 2024-07-15 11:23:21 +08:00
Chris Heinz
4f113bc3ac fix website header wrapping and height 2024-07-14 12:16:52 +02:00
Chris Heinz
eda5adfd79 replace vh with dvh 2024-07-13 16:50:31 +02:00
Mike Cao
05829641c5
Merge pull request #2839 from Manethpak/Manethpak/update-kh-lang
Feature: Update and fill missing translation for khmer lang
2024-07-12 03:56:08 -07:00
Mike Cao
b59c6c15c7
Merge branch 'dev' into Manethpak/update-kh-lang 2024-07-12 03:56:00 -07:00
manethpak
d270031793 fix: typo, update wording and fill missing words/sentence 2024-07-10 22:18:31 +07:00
manethpak
d6a4eea7f8 Update and fill missing translation for khmer lang 2024-07-10 17:39:40 +07:00
Francis Cao
f518066d93 refactor views and queries for dashboard 2024-07-10 00:54:46 -07:00
Mike Cao
44ccb661a2 Updated IP regex to work with IPv6. 2024-07-09 16:33:43 -07:00
Mike Cao
374faae27b Updated lang files. 2024-07-08 23:42:26 -07:00
Mike Cao
ec082446da Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-07-08 23:41:54 -07:00
Mike Cao
4494665d2e Updated date output for Clickhouse. 2024-07-08 23:41:40 -07:00
Mike Cao
62f35668ae Fixed funnel chart. 2024-07-08 23:39:06 -07:00
Mike Cao
970e9e04a3
Merge pull request #2823 from RikoDEV/patch-1
Update pl-PL.json
2024-07-08 23:20:12 -07:00
Mike Cao
625178f81d
Merge branch 'dev' into patch-1 2024-07-08 23:20:02 -07:00
Mike Cao
f02c3c302b
Merge pull request #2824 from mobeicanyue/patch-6
Update zh-CN.json
2024-07-08 23:19:26 -07:00
Mike Cao
9f0d2b1e32
Merge branch 'dev' into patch-6 2024-07-08 23:19:16 -07:00
Mike Cao
456665d0cb
Merge pull request #2825 from konstantintutsch/dev
Update German translation for v2.12
2024-07-08 23:13:45 -07:00
Mike Cao
ba8541790f
Merge branch 'dev' into dev 2024-07-08 23:13:30 -07:00
Francis Cao
bfd5c5f150 update dashboard queries to use mv 2024-07-08 11:18:30 -07:00
Mike Cao
db36c37d32 Updated session and events queries. Added sessions page. 2024-07-08 01:45:54 -07:00
Bradley Shellnut
9a0d5fc1e7
Merge branch 'umami-software:master' into master 2024-07-07 23:28:34 +00:00
Mike Cao
082a751ffe Should allow non http referrers. Closes #2831 2024-07-05 02:52:36 -07:00
Mike Cao
72b3b6158a Changed kafka method signature. 2024-07-05 02:29:12 -07:00
Mike Cao
26462cffbc Support clickhouse for save session data. 2024-07-05 02:04:51 -07:00
Mike Cao
9bf34bd5e4 Support Clickhouse insert without Kafka. 2024-07-04 20:30:15 -07:00
Mike Cao
d501410a63 Fixed console command. Updated packages. 2024-07-04 15:55:06 -07:00
Mike Cao
9118f24668 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-07-03 11:39:33 -07:00
Francis Cao
5289c277fb replace count(distinct with uniq for session / visits 2024-07-01 13:13:13 -07:00
Francis Cao
20b3a3e6c2 replace count(distinct with uniq for session / visits 2024-07-01 12:26:19 -07:00
Francis Cao
05894df58f replace count(distinct with uniq for session / visits 2024-07-01 12:18:43 -07:00
Konstantin Tutsch
9bb06d8610
Update German translation for v2.12
Report categories, Compare, Transfers, Team features
2024-07-01 17:05:48 +02:00
Konstantin Tutsch
001dbbad9f
Revert "Add German translation for v2.12.0"
This reverts commit d95e212990.
2024-07-01 17:04:56 +02:00
Konstantin Tutsch
d95e212990
Add German translation for v2.12.0
Report categories, Compare, Transfers, Team features
2024-06-30 13:39:37 +02:00
mobeicanyue
87779202f9
Update zh-CN.json 2024-06-30 11:26:21 +08:00
Jacek Maciejak
512603d79b
Whoops 2024-06-29 19:00:33 +02:00
Jacek Maciejak
490d51bde1
Update pl-PL.json 2024-06-29 18:57:21 +02:00
Mike Cao
0142e0ff2f Fixed typo. 2024-06-28 20:20:12 -07:00
Mike Cao
caaa87c0a7 Updated packages and lang files. 2024-06-27 20:12:32 -07:00
Mike Cao
2729b22a2e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-06-27 20:09:40 -07:00
Mike Cao
c1cddc3806
Merge pull request #2786 from IvanGnusarkov/db-check-error-msg
added error message when db connection check fails
2024-06-27 20:09:36 -07:00
Mike Cao
ea1263ff39 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-06-27 20:07:32 -07:00
Mike Cao
94b854f45d
Merge pull request #2808 from ccbikai/master
Update Chinese(zh-CN) translations
2024-06-27 20:07:29 -07:00
Mike Cao
dd35542a35 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-06-27 20:07:21 -07:00
Mike Cao
768f53ebb0 Merge branch 'master' into dev 2024-06-27 20:07:18 -07:00
Mike Cao
f3df2da835
Merge pull request #2818 from gerardnll/patch-2
Update ca-ES.json
2024-06-27 20:06:31 -07:00
Mike Cao
b006747a45
Merge pull request #2819 from mommocmoc/master
Update ko-KR.json
2024-06-27 20:04:56 -07:00
Mike Cao
6a7dac3aad
Merge pull request #2813 from mho22/patch-1
Update `start-env` with new NextStartOptions
2024-06-27 20:03:00 -07:00
mommocmoc
a124b698be Update ko-KR.json
Update Korean translation
2024-06-28 01:57:44 +09:00
Gerard Nesta
5fc596ff41
Update ca-ES.json 2024-06-27 12:39:21 +02:00
Gerard Nesta
e6d4c536ae
Update ca-ES.json 2024-06-27 12:35:14 +02:00
Mike Cao
d7141e626e
Merge pull request #2815 from umami-software/dev
v2.12.1
2024-06-25 09:31:52 -07:00
Mike Cao
05e4555334 Bump version v2.12.1. 2024-06-25 09:31:02 -07:00
Mike Cao
0b0cd9e272 Fixed overflowing journey label. 2024-06-25 09:30:26 -07:00
Yannick Decat
43f231eca4
Updated start-env with new NextStartOptions
Corrected error with port and hostname argument and removed unneeded array.
2024-06-25 15:33:19 +02:00
面条
84e670858c
Update Chinesi(zh-CN) translations 2024-06-24 19:40:04 +08:00
Mike Cao
7342d52c68 Fixed team settings not found. 2024-06-23 21:59:50 -07:00
Mike Cao
2109d3225e Fixed team data not refreshing. 2024-06-22 16:23:06 -07:00
Mike Cao
b0c9197f2d Fixed teams settings. 2024-06-21 12:49:57 -07:00
Francis Cao
9104332623 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-06-20 23:26:42 -07:00
Francis Cao
32f0d23de4 fix null toString event data bug 2024-06-20 23:26:36 -07:00
Mike Cao
d2658458aa Merge branch 'dev' 2024-06-20 21:12:22 -07:00
Mike Cao
bfe494f507 Fixed chart labels. 2024-06-20 21:10:42 -07:00
Mike Cao
87a03785de
Merge pull request #2794 from umami-software/dev
v2.12.0
2024-06-20 13:18:25 -07:00
Francis Cao
29694352e7 add timestamp column to prisma realtime queries 2024-06-20 12:11:49 -07:00
Mike Cao
8a4fe95a72 Remove revenue report from release. 2024-06-20 09:43:20 -07:00
Mike Cao
fedbb50950 Updated lang files. 2024-06-20 09:30:47 -07:00
Mike Cao
1da05b8a20
Merge pull request #2791 from frantic/uk-UA-translations
Update Ukrainian translations
2024-06-20 09:29:41 -07:00
Mike Cao
3217ef3df3 Fixed chart. 2024-06-19 22:22:18 -07:00
Mike Cao
90c690fe5d
Merge branch 'dev' into uk-UA-translations 2024-06-19 22:18:38 -07:00
Mike Cao
b1024c71de Update types. 2024-06-19 22:12:35 -07:00
Mike Cao
19d5ac0a4c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/lib/constants.ts
2024-06-19 21:48:49 -07:00
Mike Cao
5108b91f80 Refactored realtime. 2024-06-19 21:47:27 -07:00
Brian Cao
f3efe0c9c3 Add revenue. 2024-06-19 21:41:45 -07:00
Alex Kotliarskyi
5bad3b63af
Update Ukrainian translations 2024-06-19 19:36:00 -07:00
Francis Cao
3f477c5d50 fix host filtering 2024-06-19 09:50:39 -07:00
Mike Cao
cda3ba345b Build new lang files. 2024-06-18 23:12:12 -07:00
Mike Cao
74a3cb6dac Only show hosts in expanded view. 2024-06-18 23:09:29 -07:00
Mike Cao
0626a33d75
Merge pull request #2689 from giuseongit/hosts-support
add host to visualization
2024-06-18 23:02:27 -07:00
Mike Cao
d1559c3a98
Merge branch 'dev' into hosts-support 2024-06-18 23:02:14 -07:00
Mike Cao
e11c2e452c
Merge branch 'master' into hosts-support 2024-06-18 23:01:09 -07:00
Mike Cao
f56849a431 Fixed path counts. Updated number display. 2024-06-18 22:38:36 -07:00
Ivan Gnusarkov
4c88a97698 added error message when db connection check fails 2024-06-18 14:10:35 +07:00
Francis Cao
45d6b16b0d fix journeys path counts bug 2024-06-17 14:20:33 -07:00
Francis Cao
3c259109aa fix insights column name bug 2024-06-17 11:17:28 -07:00
Mike Cao
8955c3d30d
Merge pull request #2784 from umami-software/dependabot/npm_and_yarn/braces-3.0.3
Bump braces from 3.0.2 to 3.0.3
2024-06-16 22:27:18 -07:00
Francis Cao
9aff134368 fix bigint conversion error 2024-06-16 22:16:36 -07:00
dependabot[bot]
02e5dfb901
Bump braces from 3.0.2 to 3.0.3
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-16 12:49:18 +00:00
Mike Cao
263e92c888 Updated language. Fixed CSS. 2024-06-15 22:48:14 -07:00
Mike Cao
2eed78783e
Merge pull request #2781 from krzysztofrewak/patch-1
Update 🇵🇱 Polish translations
2024-06-15 22:45:36 -07:00
Mike Cao
6f182fe5a0 Fixed toggle button positioning. 2024-06-15 02:53:23 -07:00
Mike Cao
d765f5f1a0 Added toggle button to report menu. 2024-06-15 02:28:52 -07:00
Mike Cao
21ff3d1280 Fix flickering in journey nodes. 2024-06-14 20:49:29 -07:00
Mike Cao
2204ffa9c3 Refactored journey rendering. 2024-06-14 20:44:47 -07:00
Mike Cao
b97ac23432 Merge remote-tracking branch 'origin/dev' into dev 2024-06-14 18:34:04 -07:00
Mike Cao
84548a669e Added drop-off info to journey. 2024-06-14 18:33:54 -07:00
Francis Cao
dd47ca9e33 fix filterlink logic for entry / exit 2024-06-14 13:06:32 -07:00
Francis Cao
8493db1402 fix scroll and expanded view items 2024-06-14 12:41:05 -07:00
Francis Cao
117229f9f1 Add entry / exit filters 2024-06-14 12:35:12 -07:00
Mike Cao
499392c110 Merge remote-tracking branch 'origin/dev' into dev 2024-06-13 22:15:48 -07:00
Mike Cao
1463482e89 Updated journey counts. 2024-06-13 22:15:31 -07:00
Krzysztof Rewak
3825031a36
update Polish translations 2024-06-13 17:37:41 +02:00
Francis Cao
fdc7c39fe4 fix missing websitechart 2024-06-12 23:23:12 -07:00
Francis Cao
632ecd1a1b update insights query 2024-06-12 22:36:09 -07:00
Francis Cao
8f015e870d add Journey report 2024-06-10 15:47:59 -07:00
Francis Cao
41baa56fdc Merge branch 'analytics' of https://github.com/umami-software/umami into dev 2024-06-10 15:45:46 -07:00
Francis Cao
1d9079f6ad fix change label 2024-06-10 13:20:24 -07:00
Francis Cao
895398bebf change bounce rate to use visits 2024-06-10 13:00:21 -07:00
Francis Cao
f6e8522f6a change bounce rate to use visits 2024-06-10 12:47:31 -07:00
Mike Cao
3234120bfb Changed steps to dropdown. 2024-06-08 21:43:29 -07:00
Francis Cao
edd679295c Revert "add dropped off node"
This reverts commit e8a605af39.
2024-06-07 22:59:14 -07:00
Mike Cao
a6a4cf9e9b Merge remote-tracking branch 'origin/dev' into dev 2024-06-07 22:44:23 -07:00
Mike Cao
8362d883d1 Refactored line rendering. 2024-06-07 22:44:00 -07:00
Francis Cao
e8a605af39 add dropped off node 2024-06-07 11:45:49 -07:00
Francis Cao
8b410096bd prevent report date range from overflowing 2024-06-07 10:30:14 -07:00
Mike Cao
d5e14fb5a8 Journey report view with nodes and lines. 2024-06-06 22:30:58 -07:00
Mike Cao
9abb201d86 Fixed change labels display. 2024-06-05 15:09:33 -07:00
Mike Cao
6c79175077 Merge remote-tracking branch 'origin/dev' into dev 2024-06-04 19:54:00 -07:00
Mike Cao
d0607303a1 Journey view update. 2024-06-04 19:53:49 -07:00
Francis Cao
cd3beefd4d fix path icon fill in dark mode 2024-06-04 16:07:25 -07:00
Francis Cao
5dccfe3392 update journeys relational query 2024-06-04 13:47:36 -07:00
Francis Cao
0333bec986 finish clickhouse journeys query 2024-06-03 23:40:38 -07:00
Mike Cao
3a6971e173 Ensure website id is passed to tracker. 2024-06-03 20:00:54 -07:00
Francis Cao
d24634ffbb fix userId getReport query 2024-06-03 12:43:18 -07:00
Francis Cao
7a9b6a521d fix getReports for website, user, team 2024-06-03 12:43:18 -07:00
Francis Cao
bafa3ad8c9 fix userId getReport query 2024-06-03 12:38:37 -07:00
Francis Cao
d40807e672 fix getReports for website, user, team 2024-06-03 12:26:03 -07:00
Francis Cao
b41ab4ec2a remove Journey report 2024-06-03 09:33:58 -07:00
Mike Cao
9b139f75ff Merge branch 'dev' into analytics 2024-06-01 21:42:44 -07:00
Mike Cao
111c93be20 Fixed all time not showing. 2024-06-01 19:55:44 -07:00
Mike Cao
5a4a9b6472 Merge branch 'dev' into analytics 2024-06-01 14:10:02 -07:00
Mike Cao
4b67d10f04 Fixed teams urls. 2024-06-01 14:06:17 -07:00
Mike Cao
8a722ff013 Render view for user journey report. 2024-06-01 11:45:06 -07:00
Mike Cao
84d33a51b6 Merge branch 'dev' into analytics 2024-05-31 21:37:55 -07:00
Mike Cao
06c62a199c Add filter to compare page. 2024-05-31 19:25:04 -07:00
Mike Cao
f666136d2a Merge language changes in bn-BD. Closes #2729 2024-05-30 01:29:29 -07:00
Mike Cao
b012a3641c Fixed lang files. 2024-05-29 23:34:07 -07:00
Mike Cao
bb5191f30a Added lang bg-BG. 2024-05-29 22:55:21 -07:00
Mike Cao
ea2a8ff976
Merge pull request #2764 from abahchevanov/master
Feature: Localization - Bulgarian language
2024-05-29 10:52:01 -07:00
Mike Cao
7b0b11ffaa Fixed label display on metrics. Removed compare for all time. 2024-05-28 22:15:44 -07:00
Atanas Bahchevanov
70533e3310 Feature: Localization - Bulgarian language 2024-05-29 02:32:45 +03:00
Francis Cao
cfe2389b8e update admin get websites with includeAllTeams 2024-05-27 23:14:38 -07:00
Mike Cao
f6786a0a86 Merge branch 'dev' into analytics 2024-05-27 21:23:35 -07:00
Mike Cao
1c8ae90457 Updated change labels. 2024-05-27 21:23:06 -07:00
Bradley Shellnut
d67137dec6
Merge branch 'umami-software:master' into master 2024-05-27 07:46:01 -07:00
Mike Cao
3e51a569f3 Merge remote-tracking branch 'origin/dev' into dev 2024-05-26 23:04:31 -07:00
Mike Cao
377a22f1ea Switch file based redirect to rewrites. 2024-05-26 23:04:18 -07:00
Francis Cao
2667fac806 Merge branch 'dev' into analytics 2024-05-26 22:52:36 -07:00
Francis Cao
9c2917a53f add goals page for teams 2024-05-26 22:49:22 -07:00
Mike Cao
646a071da5 Merge branch 'dev' into analytics 2024-05-26 22:10:28 -07:00
Mike Cao
cbd5f7b556 Added redirect for teams. 2024-05-26 22:08:23 -07:00
Mike Cao
c37a8c343c
Merge pull request #2758 from umami-software/dev
Merge analytics
2024-05-26 21:59:18 -07:00
Mike Cao
b8b1ff8fd4 Remove journey report. 2024-05-26 21:57:43 -07:00
Mike Cao
8b304b7ca2 Show percentages in metrics bar. 2024-05-26 21:30:03 -07:00
Mike Cao
b7a7d4de4d Added comparison tables. 2024-05-26 17:26:15 -07:00
Mike Cao
626fe14fc2
Merge pull request #2756 from shubhusion/master
Enhance Readme.md
2024-05-25 20:20:58 -07:00
Mike Cao
13e11ee371 Added tables to compare screen. 2024-05-25 09:31:38 -07:00
SHUBHAM SHARMA
89dcdf703f
Update README.md 2024-05-25 20:13:28 +05:30
SHUBHAM SHARMA
2df45f30d0
Update README.md 2024-05-25 20:10:47 +05:30
SHUBHAM SHARMA
46724280ca
Update README.md 2024-05-25 20:10:17 +05:30
SHUBHAM SHARMA
e1de8f30c2
Update README.md 2024-05-25 20:08:33 +05:30
SHUBHAM SHARMA
9c532f26ab
Update README.md 2024-05-25 20:07:21 +05:30
SHUBHAM SHARMA
fdf28920e6
Update README.md 2024-05-25 20:02:00 +05:30
SHUBHAM SHARMA
65b1992c46
Update README.md 2024-05-25 19:56:32 +05:30
SHUBHAM SHARMA
db06a0d256
Update README.md 2024-05-25 19:48:58 +05:30
Mike Cao
154b559315 Render correct tooltip label. 2024-05-24 19:44:50 -07:00
Mike Cao
a5337a0734 Updated rendering order. 2024-05-24 18:33:39 -07:00
SHUBHAM SHARMA
3222033f36
Update README.md 2024-05-25 00:18:10 +05:30
SHUBHAM SHARMA
754ca24ca5
Update logo-white.svg 2024-05-25 00:13:55 +05:30
SHUBHAM SHARMA
d46b274094
Update logo-white.svg 2024-05-25 00:10:11 +05:30
SHUBHAM SHARMA
51f7e187b7
Update README.md 2024-05-24 12:40:00 +05:30
shubhusion
47c4e6fd57 modified logo 2024-05-24 12:28:18 +05:30
shubhusion
16e1949d24 Create logo-white.svg.svg 2024-05-24 12:26:46 +05:30
Mike Cao
8cf7985dac Progress check-in for date compare. 2024-05-23 19:35:29 -07:00
Mike Cao
24af06f3aa Metrics bar styling. 2024-05-23 00:58:31 -07:00
Mike Cao
df66acaacf Updated metrics components for compare mode. 2024-05-23 00:17:20 -07:00
Mike Cao
6b03935fca Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-21 21:15:44 -07:00
Mike Cao
6589bc6ecb Redesigned filter bar. 2024-05-21 21:15:31 -07:00
Brian Cao
8e00a278db fix eent query 2024-05-21 11:14:38 -07:00
Brian Cao
7add6d583a fix params 2024-05-21 10:44:27 -07:00
Brian Cao
5c9abe966b add psql. 2024-05-20 23:58:40 -07:00
Brian Cao
79a93ed9fc add event_data to goal. 2024-05-20 21:10:46 -07:00
Mike Cao
76cab03bb2 Bootstrap User Journey report. 2024-05-17 01:42:36 -07:00
Mike Cao
37eb157ab5 Added bash build script. 2024-05-16 22:24:15 -07:00
Mike Cao
da7a4f3d9f Merge branch 'dev' into analytics 2024-05-16 22:12:50 -07:00
Mike Cao
394997e1d7 Updated lang files. 2024-05-15 15:02:50 -07:00
Mike Cao
8f19b638a5
Merge pull request #2726 from leits/patch-1
Update uk-UA translation
2024-05-15 15:01:38 -07:00
Mike Cao
71c9d31f3b Update pt-BR. Reverted hostUrl change. 2024-05-15 14:55:05 -07:00
Mike Cao
644ba448b0
Merge pull request #2738 from frontedu/master
Update i18n files pt-BR
2024-05-15 14:53:39 -07:00
Brian Cao
36928d4f04 fix admin/website 2024-05-14 17:51:38 -07:00
Francis Cao
b3bcfa5bd1 filter usagewebsites 2024-05-14 17:50:22 -07:00
Brian Cao
4b421d08d0 fix usage. 2024-05-14 17:50:22 -07:00
Francis Cao
c80be88d14 update getAllwebsites, match usage query with api / cloud call 2024-05-14 17:50:22 -07:00
Francis Cao
0d51f5bb7c fix param names for includeTeams 2024-05-14 17:40:18 -07:00
Francis Cao
b585f5e53f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-14 17:19:44 -07:00
Francis Cao
edefdfb4b1 filter usagewebsites 2024-05-14 17:19:10 -07:00
Brian Cao
213f96380e fix admin/website 2024-05-14 17:13:16 -07:00
Brian Cao
49b1d0a125 fix usage. 2024-05-14 12:01:27 -07:00
Francis Cao
e701d6976b update getAllwebsites, match usage query with api / cloud call 2024-05-14 09:39:04 -07:00
Brian Cao
d057b15460 Fix usage. 2024-05-13 15:44:45 -07:00
Brian Cao
8fc755df99 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-13 15:43:58 -07:00
Brian Cao
25dd94b551 Fix usage. 2024-05-13 15:43:53 -07:00
Francis Cao
0014e5a649 fix param names for includeTeams 2024-05-13 13:33:41 -07:00
Mike Cao
98a0a83ccf Updated handling of env vars. 2024-05-12 23:15:49 -07:00
Mike Cao
f42a99cf7e Merge remote-tracking branch 'origin/dev' into dev 2024-05-11 22:03:50 -07:00
Mike Cao
b911fecd8b Updated packages. 2024-05-11 22:03:41 -07:00
Mike Cao
30c1933718 Updated handling of env vars. 2024-05-11 21:52:40 -07:00
Brian Cao
ab39ae8511 fix usage get. 2024-05-10 23:20:47 -07:00
Brian Cao
cd797b610c Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-10 23:16:06 -07:00
Brian Cao
0db6ecf243 fix usage get. 2024-05-10 23:15:56 -07:00
Mike Cao
abd0913e9b Updated goals chart. 2024-05-10 14:06:13 -07:00
Mike Cao
9f43ae67ef Updated styling of goals report. 2024-05-10 11:15:23 -07:00
Eddu
8b6b81cfee
small spelling corrections 2024-05-09 23:47:25 -03:00
Eddu
6060ff7be0
spelling corrections 2024-05-09 23:43:24 -03:00
Eddu
92a45f9d91
pt-br release 2024-05-09 23:07:13 -03:00
Eddu
fed261023c
pt-br release 2024-05-09 20:25:42 -03:00
Eddu
cfe791ec8c
pt-BR todas as aparições 2024-05-09 20:16:15 -03:00
Eddu
a92eb841b8
consistent spelling in Brazilian Portuguese 2024-05-09 20:02:51 -03:00
Francis Cao
4731c1cca3 add redis calls to website delete/reset 2024-05-09 12:37:32 -07:00
Francis Cao
f259130202 add redis calls to website delete/reset 2024-05-09 11:55:54 -07:00
Mike Cao
90bd72cf98 Updated data table render check. 2024-05-07 23:09:19 -07:00
Mike Cao
3c27f08a97 Render children for data tables. 2024-05-07 22:47:39 -07:00
Mike Cao
42b475b061 Remove offset from query parameters. 2024-05-07 17:43:04 -07:00
Mike Cao
8bdb333716 Remove offset from query parameters. 2024-05-07 17:26:15 -07:00
Mike Cao
7a75639dd3
Update README.md 2024-05-06 21:24:17 -07:00
Mike Cao
fb16cae12e
Update README.md 2024-05-06 11:16:54 -07:00
Brian Cao
4d66d400a9 Fix percentages. 2024-05-05 22:28:18 -07:00
Brian Cao
60e7257656 Goals report CH 2024-05-05 22:15:47 -07:00
Andrii Leitsius
8fb436ab16
Update uk-UA translation 2024-05-05 14:33:20 +03:00
Francis Cao
1dda711401 add date-fns-tz 2024-05-04 13:36:08 -07:00
Mike Cao
43907bd075 Fixed metrics search. 2024-05-03 23:21:27 -07:00
Mike Cao
8be95e32ba
Merge pull request #2724 from umami-software/analytics
Team manager feature
2024-05-03 22:08:22 -07:00
Mike Cao
ad72828000 Merge branch 'dev' into analytics 2024-05-03 22:06:48 -07:00
Mike Cao
84d7089c15
Merge pull request #2723 from umami-software/release
v2.11.3
2024-05-03 21:35:55 -07:00
Mike Cao
222e3d0705 Change version. 2024-05-03 21:01:29 -07:00
Francis Cao
9c06bc9893 add team manager role 2024-05-03 14:31:08 -07:00
Bradley Shellnut
d97363fbc5 Two db references to URLs. 2024-05-03 13:01:57 -07:00
Bradley Shellnut
dfa33ed35e Adding reference to supabase run. 2024-05-03 13:00:23 -07:00
Bradley Shellnut
9389926da6
Update schema.prisma to point to the DIRECT_DATABASE_URL 2024-05-03 10:52:02 -07:00
Mike Cao
b8cab762ca Merge branch 'analytics' of https://github.com/umami-software/umami into analytics 2024-05-03 10:00:35 -07:00
Mike Cao
ca2a7f3354 Added query parameters to filters. 2024-05-03 00:13:28 -07:00
Mike Cao
8b5e690c3b Updated language bundles. 2024-05-02 23:58:58 -07:00
Mike Cao
63fe57321c Merge branch 'master' into dev 2024-05-02 23:49:57 -07:00
Mike Cao
5a221e6b9d
Merge pull request #2664 from styxit/mysql-version
Add minimum database versions to readme
2024-05-02 23:49:47 -07:00
Mike Cao
ceac4eb43f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-02 23:48:58 -07:00
Mike Cao
c4e3327dd8
Merge pull request #2676 from gerardnll/patch-1
Updated Catalan language
2024-05-02 23:48:53 -07:00
Mike Cao
cf6a37f0f2
Merge pull request #2721 from mobeicanyue/patch-5
Update zh-CN.json
2024-05-02 23:47:00 -07:00
mobeicanyue
abb7da8c95
Update zh-CN.json 2024-05-03 13:09:00 +08:00
Mike Cao
5f3998789d Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-02 19:58:31 -07:00
Mike Cao
85968d5c7c
Merge pull request #2687 from ccbikai/master
Update @netlify/plugin-nextjs to 5.x
2024-05-02 19:58:26 -07:00
Mike Cao
1b85c56e65 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-02 19:57:22 -07:00
Mike Cao
467b8a1b6b
Merge pull request #2700 from ruibinch/order-event-data-by-count-desc
Order event data in descending order by count
2024-05-02 19:57:15 -07:00
Mike Cao
e1315c0c10 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-05-02 19:49:07 -07:00
Mike Cao
89f8b5e8ce
Merge pull request #2699 from Celil6p/master
Turkish language updated
2024-05-02 19:49:03 -07:00
Mike Cao
e0510a815e Fixed types. 2024-05-02 19:48:56 -07:00
Mike Cao
de9b6c9173
Merge pull request #2703 from sake92/add-bosnian-lang
Add Bosnian language
2024-05-02 19:46:43 -07:00
Mike Cao
dd1795f08c
Merge pull request #2706 from mobeicanyue/patch-4
Update zh-CN.json
2024-05-02 19:45:30 -07:00
Mike Cao
ab94f5d1cd Moved filter params into a hook. Close #2691. 2024-05-02 19:44:26 -07:00
Mike Cao
2ba87cd483 Removed usage limit reference. 2024-05-02 18:01:43 -07:00
Brian Cao
4eb01c5563 Merge branch 'dev' into analytics 2024-04-29 21:52:04 -07:00
Brian Cao
4e2bfd7485 Update admin/website search. Update param names. 2024-04-28 22:45:58 -07:00
Mike Cao
0fc8828f8b Refactored caching logic. 2024-04-26 00:31:38 -07:00
Mike Cao
216304a191 Removed blocking logic and duplicate validations. 2024-04-25 23:21:12 -07:00
Mike Cao
439f8a8aa3 Removed cache logic for websites. 2024-04-25 22:26:20 -07:00
Mike Cao
2620e8fe26 Merge remote-tracking branch 'origin/dev' into dev 2024-04-25 11:26:20 -07:00
Mike Cao
592c181902 Updated redis methods. 2024-04-25 11:26:10 -07:00
Francis Cao
cfbc4ebd72 add filtering to event chart 2024-04-23 11:19:05 -07:00
Francis Cao
fde2be4900 add minute to UNIT_TYPES. Fix yup validations when all-time filter returne start date = end date 2024-04-22 14:03:47 -07:00
Francis Cao
64d9a196cc renderteamURL on create report 2024-04-22 13:31:58 -07:00
Francis Cao
4b40b4e9cf stay in team context for website header links 2024-04-22 13:17:24 -07:00
Francis Cao
758b289a51 fix bug for teams UTM report 2024-04-22 12:58:58 -07:00
mobeicanyue
436f55c1a5
Update zh-CN.json 2024-04-23 02:16:22 +08:00
Sakib Hadziavdic
5aa9b20ff7 Add Bosnian language 2024-04-22 14:03:35 +02:00
Rui Bin Choo
22ab8b8222 order event data in descending order by count 2024-04-21 12:57:01 +08:00
Celil6p
81283ee9e4 Turkish language updated 2024-04-20 22:30:40 +03:00
Mike Cao
4ca4be4445 Added types for session data. 2024-04-18 14:23:14 -07:00
Giuseppe Pagano
7152b0b76d feat: add host 2024-04-18 10:30:06 +02:00
Mike Cao
32cfb74c49 Updated check-env script. 2024-04-17 00:10:02 -07:00
Gerard Nesta
f4310be501
Merge branch 'master' into patch-1 2024-04-17 08:48:22 +02:00
面条
c28de0fb1b chore: Update @netlify/plugin-nextjs to 5.x 2024-04-17 04:43:28 +00:00
Mike Cao
a38baa50af
Merge pull request #2684 from umami-software/hotfix2
v2.11.2
2024-04-16 21:03:01 -07:00
Mike Cao
2a43d0b595 Bump version v2.11.2 2024-04-16 20:53:33 -07:00
Mike Cao
a7bfbae066 Merge branch 'dev' into analytics 2024-04-16 16:48:41 -07:00
Mike Cao
a83a71a612
Merge pull request #2679 from CediGasser/fix/track-only-path-on-pushstate
Fix: Properly parse url and respect data-exclude-search attribute in tracker
2024-04-16 16:41:13 -07:00
Mike Cao
6c8fe9ff50
Merge branch 'dev' into fix/track-only-path-on-pushstate 2024-04-16 16:34:48 -07:00
Mike Cao
a0f9a3ce2b Merge branch 'dev' into analytics 2024-04-16 16:22:21 -07:00
Mike Cao
0ef62d004f Merge remote-tracking branch 'origin/dev' into dev 2024-04-15 23:43:03 -07:00
Mike Cao
7c2bb95786 Updated "Last X" date logic. Closes #2672. 2024-04-15 23:42:41 -07:00
Mike Cao
8451e3261d Merge branch 'dev' into analytics 2024-04-15 15:01:19 -07:00
Cedric
0225e63abc fix(tracker): Respect excludeSearch consistently 2024-04-15 23:34:52 +02:00
Cedric
bd360207a6 fix(tracker): Remove domain name when parsing url 2024-04-15 23:25:15 +02:00
Francis Cao
a2e4ab7d46 update kafka connection to upstash config 2024-04-15 13:44:16 -07:00
Gerard Nesta
f3283d693d
Update ca-ES.json 2024-04-15 11:00:45 +02:00
Mike Cao
0ea97eb0bc Removed dev logging. 2024-04-14 00:58:57 -07:00
Mike Cao
5aff8d1836 Merge branch 'dev' into analytics 2024-04-11 21:35:37 -07:00
mobeicanyue
1579beef5b Updated metrics query. Fixed chart error. 2024-04-11 21:35:07 -07:00
Mike Cao
94296ab1aa Merge branch 'dev' into analytics 2024-04-11 21:17:36 -07:00
Floris Ankersmit
10eb28ba04
Add minimum database versions to readme 2024-04-11 12:20:40 +02:00
Mike Cao
be7f69fd5d
Merge pull request #2659 from umami-software/hotfix
v2.11.1
2024-04-10 16:06:47 -07:00
Mike Cao
357c13fb15 Bump version v2.11.1 2024-04-10 16:05:59 -07:00
Francis Cao
7899289b3c fix case sensitivity for psql getValues 2024-04-10 12:43:49 -07:00
Mike Cao
6973b2b760 Pass start and end dates to filter component. Closes #2646. 2024-04-10 12:29:11 -07:00
Mike Cao
d90256b55f Updated language files. 2024-04-10 12:27:28 -07:00
Mike Cao
51b29b66bf Merge remote-tracking branch 'origin/dev' into dev 2024-04-10 12:26:21 -07:00
Mike Cao
741af25375 Pass start and end dates to filter component. Closes #2646. 2024-04-10 12:26:09 -07:00
Mike Cao
982c8091d2
Merge pull request #2642 from jermanuts/master
Improves Arabic translations context
2024-04-10 11:32:39 -07:00
Mike Cao
8c3a48637a
Merge branch 'dev' into master 2024-04-10 11:32:21 -07:00
Mike Cao
bfd795f6a9
Merge pull request #2657 from Maxime-J/i18n
i18n updates
2024-04-10 10:59:30 -07:00
Mike Cao
09a75ec720 Fixed region view. Closes #2648. 2024-04-09 22:40:56 -07:00
Mike Cao
1ffef86f2a Fixed region view. Closes #2648. 2024-04-09 22:20:11 -07:00
Mike Cao
3749e22d4d Updated packages. Bumped version to v2.12.0. 2024-04-09 00:49:04 -07:00
Mike Cao
dfaeedbc09 Updated session data properties. 2024-04-09 00:42:44 -07:00
Mike Cao
f279254af5 Merged dev 2024-04-09 00:39:34 -07:00
Mike Cao
b79ed9dee6 Updated session event data save. 2024-04-09 00:37:23 -07:00
Francis Cao
31b059d7db fix 06_session_data migration bug 2024-04-08 20:29:16 -07:00
Francis Cao
7381254cc2 add relational migrations. update event_key references to data_key 2024-04-08 20:24:15 -07:00
Mike Cao
0a4eb05196 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-04-08 16:40:48 -07:00
Francis Cao
cc834083d9 update CH schema/migration to include session_data 2024-04-08 16:36:31 -07:00
Maxime-J
144167d2c4 Update fr-FR. 2024-04-08 10:32:09 +00:00
Maxime-J
785ff76706 Add new strings in lang files. 2024-04-08 10:00:28 +00:00
Maxime-J
405756dcea Remove duplicated label. 2024-04-08 09:58:02 +00:00
Maxime-J
0a2364ff06 Fix filter tags formatting. 2024-04-08 09:56:54 +00:00
Mike Cao
15a3cc2e1e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-04-06 21:58:44 -07:00
Francis Cao
8a92cd9bcf fix case sensitivity for psql getValues 2024-04-05 12:21:54 -07:00
Mike Cao
cc5f2a8a29 Upgraded Prisma to v5.12.1. 2024-04-05 01:50:23 -07:00
Mike Cao
698f0c6bbd Changed getClientInfo method. Refactored send logic. 2024-04-05 01:48:59 -07:00
jermanuts
eec62cf90d
Update ar-SA.json 2024-04-04 23:24:02 +03:00
jermanuts
95ec31fca6
Update ar-SA.json 2024-04-04 23:22:13 +03:00
Mike Cao
88da20ea7f
Merge pull request #2641 from umami-software/analytics
v2.11.0
2024-04-04 11:54:17 -07:00
Mike Cao
901e9480b6
Merge branch 'master' into analytics 2024-04-04 11:13:15 -07:00
Francis Cao
7e00be1662 remove unneccessary website join 2024-04-03 22:48:57 -07:00
Mike Cao
e8e95b5960 Merge branch 'dev' into analytics 2024-04-03 22:12:32 -07:00
Mike Cao
ada332f174 Fixed filtering on insights report. 2024-04-03 22:11:57 -07:00
Mike Cao
0fb1506d02 Merge branch 'dev' into analytics 2024-04-03 17:22:12 -07:00
Mike Cao
cf8d49f867 Funnel report updates. Fixed insights report. 2024-04-03 14:44:49 -07:00
Mike Cao
1b8923fef7 Merge branch 'dev' into analytics
# Conflicts:
#	src/app/(main)/reports/funnel/FunnelParameters.tsx
2024-04-03 00:04:33 -07:00
Mike Cao
3aee54009c Funnel report styling. 2024-04-02 23:53:08 -07:00
Mike Cao
cfe7089916 UI for new funnel report. 2024-04-02 23:30:12 -07:00
Mike Cao
30a1cdd53c Fixed metrics search. 2024-04-02 19:58:09 -07:00
Mike Cao
810b0639c8 Updated filtering logic. 2024-04-02 17:06:06 -07:00
Francis Cao
845968804b fix handleRemoveUrl for funnel report 2024-04-02 09:19:45 -07:00
Francis Cao
6ee9bb07da add funnel updates to relational query 2024-04-02 00:32:19 -07:00
Francis Cao
bc5e85c838 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-04-02 00:19:26 -07:00
Francis Cao
05079f3810 update funnels for CH. Add wildcards and event steps 2024-04-02 00:19:15 -07:00
Mike Cao
a695f6d516 Fixed legend not updating correctly. 2024-04-01 21:33:04 -07:00
Mike Cao
6767f95c0d Update tag rule. 2024-04-01 10:13:40 -07:00
Mike Cao
ef11124672 Filter tag enhancements. 2024-04-01 10:10:56 -07:00
Mike Cao
a4d8afe516 Convert local time to timezone. 2024-03-29 16:56:19 -07:00
Mike Cao
490e446481 Removed timezone-support package. 2024-03-29 16:17:24 -07:00
Mike Cao
291562f6c2 Updated timezone hook, fixed chart rendering, added icons. 2024-03-29 16:04:39 -07:00
Mike Cao
5a2330ba2a Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 11:48:23 -07:00
Mike Cao
dd88b1d901 Fixed styling on update notice. Added private mode. 2024-03-29 11:48:12 -07:00
Francis Cao
7ec4e5dfa2 Fix UTM report for postgres. udpate parseParameters to work with bigInt 2024-03-29 11:27:25 -07:00
Mike Cao
314bbee717 Fixed funnel report parameters not showing. 2024-03-29 09:36:07 -07:00
Mike Cao
40c1ce40e2 Fixed chart rendering issue. 2024-03-29 08:39:05 -07:00
Mike Cao
e1ad3b99cd Fixed wrong chart color. 2024-03-28 16:26:27 -07:00
Mike Cao
6ea48d5c2c Fixed filter menu issue. 2024-03-28 10:04:01 -07:00
Mike Cao
538fb49219 Null check. 2024-03-27 20:49:48 -07:00
Mike Cao
a933f5b4a0 Lowercase before checking headers. Closes #2634. 2024-03-27 20:13:31 -07:00
Mike Cao
a5362d9197 Prevent undefined strings in tracker. 2024-03-27 20:05:19 -07:00
Mike Cao
4e77d95809 Updated minimum date check. 2024-03-27 19:56:45 -07:00
Mike Cao
cfa568f15c Fixed column name for pageviews. 2024-03-27 17:07:03 -07:00
Mike Cao
740a9408c0 Fixed views label. 2024-03-27 16:54:21 -07:00
Francis Cao
ab58c76b6a change views back to pageviews 2024-03-27 11:17:00 -07:00
Mike Cao
d945ed3a23 Support contains queries in overview page. 2024-03-27 02:17:55 -07:00
Mike Cao
41593ee1df Prevent null error. 2024-03-27 02:06:16 -07:00
Mike Cao
be75f47719 Merge remote-tracking branch 'origin/dev' into dev 2024-03-26 21:47:16 -07:00
Mike Cao
91f49ba506 Updated encoding logic in tracker and send. 2024-03-26 21:46:57 -07:00
Mike Cao
e5c4da8df5
Merge pull request #2620 from kiprasmel/lt-lang-upd-2
update lt-LT lang (part 2)
2024-03-26 21:14:42 -07:00
Mike Cao
4ee7deafdd Merge remote-tracking branch 'origin/dev' into dev 2024-03-26 17:31:37 -07:00
Mike Cao
cff2d00536 Refactored filter parameters. 2024-03-26 17:31:16 -07:00
Francis Cao
dcf2457e45 update terminology, add metric cards to new metrics 2024-03-26 11:15:39 -07:00
Francis Cao
51139c1918 include visitors metrics in websiteStats 2024-03-26 10:43:01 -07:00
Mike Cao
1a839d1cae Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 22:51:24 -07:00
Mike Cao
91efb7f1d0 Fixed search for postgresql. 2024-03-25 22:51:10 -07:00
Mike Cao
e6aebf5104 Upgraded Next and Prisma. 2024-03-25 22:50:27 -07:00
Mike Cao
2fa95448e0 Updated url and referrer logic in tracker. 2024-03-25 22:50:03 -07:00
Brian Cao
7a6a598a19 Fix css date picker. 2024-03-25 21:41:31 -07:00
Francis Cao
c033b0582d create join table and remove subquery from insert 2024-03-25 19:13:54 -07:00
Francis Cao
d36bf4396a remove order by in insert select 2024-03-25 18:47:02 -07:00
Francis Cao
7c7fd577c3 remove test schema from CH migration script 2024-03-25 18:33:30 -07:00
Francis Cao
12cec94fd4 Merge branch 'dev' into feat/ume-660-implement-visitor-id 2024-03-25 18:17:25 -07:00
Francis Cao
db75e1e5d2 Add iat to session object 2024-03-25 17:49:13 -07:00
Francis Cao
0aaf2c0b3b update visitId hash and expiration logic 2024-03-25 17:47:53 -07:00
Francis Cao
d3ca856521 check in clickhouse migration script 2024-03-25 16:29:29 -07:00
Mike Cao
741c77d9f8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 13:50:31 -07:00
Mike Cao
8bc1dcb4b3 Update field select forms. Created new hooks. 2024-03-25 13:50:04 -07:00
Brian Cao
1a5b996b2c Fix team url. 2024-03-24 15:11:44 -07:00
Brian Cao
e61f36a8bd Team Websites responsive. 2024-03-24 11:46:45 -07:00
Brian Cao
03eeb6a022 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-03-24 11:36:13 -07:00
Brian Cao
c4d0c433c0 Fix mobile nav. 2024-03-24 11:36:09 -07:00
Kipras Melnikovas
5faa7ddc74
update LT lang, part 2 2024-03-23 20:03:17 +02:00
Mike Cao
5daad2726e Update insights report parameters. Added contains logic. 2024-03-22 23:33:45 -07:00
Mike Cao
d59477deb5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 14:36:00 -07:00
Mike Cao
09a161d04a Added more date filter options. 2024-03-22 14:35:41 -07:00
Mike Cao
3656234b5a
Merge pull request #2594 from mhespenh/master
fix: Administrator label in /settings/users
2024-03-22 12:34:10 -07:00
Mike Cao
d38d8c2e36
Merge pull request #2611 from umami-software/dependabot/npm_and_yarn/follow-redirects-1.15.6
Bump follow-redirects from 1.15.4 to 1.15.6
2024-03-22 12:31:56 -07:00
Mike Cao
dffe82365c
Merge pull request #2617 from reithose/patch-1
Completed dutch translation
2024-03-22 12:31:22 -07:00
Mike Cao
6bcc349a6e Merge branch 'dev' into analytics 2024-03-22 01:55:04 -07:00
Mike Cao
b873ea38ea Fixed UTM query. Fixed types. 2024-03-21 22:59:53 -07:00
Mike Cao
b3cad83f08 Use safe URI decoding. 2024-03-21 16:30:03 -07:00
Mike Cao
0e44ce31a1 Merge branch 'dev' into analytics 2024-03-21 13:38:04 -07:00
Mike Cao
a509336bef Fixed UTM display. 2024-03-21 13:33:48 -07:00
Francis Cao
91a4cb4487 add mysql column population 2024-03-21 11:33:35 -07:00
Francis Cao
af1a118374 update mysql migrations 2024-03-21 11:10:13 -07:00
Francis Cao
b36d61609d fix migration bug 2024-03-21 09:36:27 -07:00
Francis Cao
cbeefe733f add psql migration 2024-03-21 09:30:42 -07:00
Mike Cao
1de3ae4526 Merge branch 'dev' into analytics 2024-03-21 08:51:33 -07:00
Mike Cao
58df502d43 Fixed date filter display. 2024-03-20 21:58:33 -07:00
Mike Cao
91e004ebfb Null check. 2024-03-20 20:05:17 -07:00
Mike Cao
08ca6c1433 Merge branch 'dev' into analytics 2024-03-20 19:53:45 -07:00
Mike Cao
fb3536c352 Fixed UTM calculation. 2024-03-20 19:52:07 -07:00
Mike Cao
802873ce19 Merge branch 'dev' into analytics 2024-03-20 17:44:14 -07:00
Mike Cao
96af798d42 Fixed array conversion for UTM report. 2024-03-20 17:43:48 -07:00
Mike Cao
df790cffd2 Merge branch 'dev' into analytics 2024-03-20 16:56:20 -07:00
Mike Cao
f4a9336f9d Simplified date logic. 2024-03-20 15:29:59 -07:00
Mike Cao
0cb28e9fde Merge remote-tracking branch 'origin/dev' into dev 2024-03-19 10:38:32 -07:00
Mike Cao
902d4c83ba Updated theme check. 2024-03-19 10:38:16 -07:00
Francis Cao
79af936c93 fix setDateRange typing issue 2024-03-18 12:24:37 -07:00
Francis Cao
d431074b87 increase breadcrumb font size 2024-03-18 11:02:53 -07:00
Francis Cao
50c2bb2af7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-03-18 10:37:16 -07:00
Francis Cao
4c321d7f42 Add admin label 2024-03-18 10:37:09 -07:00
Joris
477ed0044a
Completed dutch translation 2024-03-18 08:55:51 +01:00
Mike Cao
c69a703c7f Host URL data attribute should take precedence. 2024-03-17 21:35:30 -07:00
Mike Cao
672d9281a9 Added COLLECT_API_HOST environment variable. 2024-03-17 20:42:39 -07:00
dependabot[bot]
51d5363124
Bump follow-redirects from 1.15.4 to 1.15.6
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-16 23:29:43 +00:00
Mike Cao
f6524392e2 Created PieChart component. Refactored charts. 2024-03-14 20:26:52 -07:00
Mike Cao
f277580722 Updated language files. 2024-03-14 11:29:01 -07:00
Mike Cao
57e64893cf Reorder UTM params. 2024-03-14 02:48:22 -07:00
Mike Cao
a02a098db8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 02:45:28 -07:00
Mike Cao
bca9c87021 UTM report. 2024-03-14 02:45:00 -07:00
Mike Cao
b37a60727d
Merge pull request #2603 from mobeicanyue/patch-3
Fix variable name typo in saveEventData and
2024-03-13 21:47:27 -07:00
Mike Cao
e602aedd21 Fixed primary color for dark mode. 2024-03-13 21:42:57 -07:00
mobeicanyue
2182fa4e9b
Fix variable name typo in saveEventData and
saveSessionData
2024-03-14 12:38:12 +08:00
Mike Cao
3552c4d9a2
Merge pull request #2602 from mobeicanyue/patch-2
Update Chinese translations
2024-03-13 20:53:53 -07:00
mobeicanyue
ba86716a82
Update Chinese translations 2024-03-14 11:14:20 +08:00
Mike Cao
af9aa8303a Fixed date buttons for 30/90 day entries. 2024-03-13 13:46:32 -07:00
Mike Cao
19cfe47ac4
Merge pull request #2530 from fabian-hiller/master
Upgrade Netlify plugin and add strip search config
2024-03-13 12:56:46 -07:00
Mike Cao
43a278c207
Merge branch 'dev' into master 2024-03-13 12:56:32 -07:00
Mike Cao
14cd549e1b Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 20:58:43 -07:00
Mike Cao
5165987076 Fixed remove trailing slash logic. 2024-03-11 20:56:36 -07:00
Mike Cao
226c6e313f Fixed page titles in tracker. 2024-03-11 19:13:53 -07:00
Michael Hespenheide
c91ade01c1
fix: Update admininstrator -> admin for translations (#3) 2024-03-11 20:55:24 -04:00
Michael Hespenheide
2cff2676f9
fix: Administrator label in users table (#2) 2024-03-11 20:29:40 -04:00
Brian Cao
2b019796be Update endpoints. 2024-03-11 15:44:48 -07:00
Francis Cao
4f03bec99e Fix decoding for FilterLink 2024-03-11 15:21:21 -07:00
Mike Cao
909a96d458 Fixed issue with long page titles. 2024-03-10 03:26:47 -07:00
Mike Cao
0de1cf7bb9 Updated packages. 2024-03-09 22:55:54 -08:00
Mike Cao
443994d497 Update Prisma and Next. 2024-03-09 01:54:42 -08:00
Mike Cao
dfe7a573fa Fixed chart legend not rendering. 2024-03-08 19:32:00 -08:00
Mike Cao
35fde36b61 Refactored realtime page. Fixed render issue. 2024-03-08 01:11:03 -08:00
Mike Cao
a2245efa2d
Merge pull request #2576 from umami-software/analytics
v2.10.2
2024-03-06 17:30:52 -08:00
Mike Cao
42f184584f Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 17:08:42 -08:00
Mike Cao
1603657995 Update bar chart only if dataset is different. 2024-03-06 17:08:24 -08:00
Mike Cao
174404af61 Updated version. 2024-03-06 14:14:07 -08:00
Francis Cao
5983b8a14d Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-03-06 11:38:10 -08:00
Francis Cao
2a8402218a clean-up cypress docker config 2024-03-06 11:36:40 -08:00
Mike Cao
8e68a781c5 Updated CSS for metrics bar. 2024-03-06 11:22:26 -08:00
Mike Cao
9779d9ba76 Don't show buttons for custom date range. Closes #2558 2024-03-05 23:41:55 -08:00
Mike Cao
9504d17d9a Merge remote-tracking branch 'origin/dev' into dev 2024-03-05 22:33:20 -08:00
Mike Cao
0260ec57ea Hide teams button if no teams. 2024-03-05 22:32:59 -08:00
Mike Cao
47677b8df4
Merge pull request #2556 from Maxime-J/localization
i18n updates
2024-03-05 21:32:57 -08:00
Mike Cao
f0c6960dc3
Merge branch 'dev' into localization 2024-03-05 21:32:41 -08:00
Francis Cao
eb5923a82d remove template literal 2024-03-05 17:48:26 -08:00
Francis Cao
efeade2125 remove extra double quotes from replace. 2024-03-05 17:43:20 -08:00
Francis Cao
53557f00b4 fix update-tracker regex repalce 2024-03-05 17:22:38 -08:00
Mike Cao
55f7d776e6
Merge pull request #2560 from ClaudiuCeia/ro_translations
Complete ro-RO translation strings
2024-03-05 16:05:47 -08:00
Mike Cao
180aefe885
Merge pull request #2564 from Maxime-J/prisma-fix
Fix Prisma text search with MySQL.
2024-03-05 16:01:15 -08:00
Mike Cao
e5f469853e
Merge pull request #2571 from israelozarate7/update-es-traslations
Update es-ES.json translations
2024-03-05 15:58:03 -08:00
Mike Cao
5492a22d72
Merge pull request #2570 from err931/err931-patch-1
Update ja-JP.json
2024-03-05 15:49:04 -08:00
Israel Ortiz de Zárate
f9078dfb86 Update es-ES.json transaltions 2024-03-05 12:40:38 +01:00
Minoru Maekawa
b8df9762d4
Update ja-JP.json
Signed-off-by: Minoru Maekawa <126235344+err931@users.noreply.github.com>
2024-03-05 19:30:10 +09:00
Mike Cao
b0bfd0b5ab Enable search for metrics. 2024-03-05 00:45:55 -08:00
Mike Cao
bbd7c4b6ea Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 16:09:05 -08:00
Mike Cao
3d343991dc Added tests for IP detection. 2024-03-04 16:08:39 -08:00
Maxime-J
4930c4439d Fix Prisma text search with MySQL. 2024-03-03 14:35:37 +00:00
Brian Cao
410f531441 add missing yup validations. 2024-03-02 21:09:20 -08:00
Brian Cao
fa2cc5dbbd Add breadcrumb. 2024-03-02 10:51:29 -08:00
Claudiu Ceia
67bb789743
Complete ro-RO translation strings 2024-03-02 12:54:37 +02:00
Maxime-J
3f87ef33f3 Update fr-FR. 2024-03-02 09:08:58 +00:00
Maxime-J
fd1bb49bed Fix typo. 2024-03-02 08:28:02 +00:00
Maxime-J
63ef9093c3 Add missing i18n label. 2024-03-02 08:26:59 +00:00
Mike Cao
c807c3a8e9 Added hover state for list tables. 2024-03-01 17:39:39 -08:00
Mike Cao
76f40dd621 Added types for cypress. 2024-03-01 15:56:18 -08:00
Mike Cao
011dea41c9
Merge pull request #2547 from MohanadOO/master
Improvments related to Arabic Translations & Right To Left Direction Styles
2024-03-01 14:48:28 -08:00
Mike Cao
8de2a25118 Update CI to run tests. 2024-03-01 14:24:51 -08:00
Mike Cao
e6b45cc9b9 Upgraded isbot package. 2024-03-01 14:20:04 -08:00
Mike Cao
bfa846d4c9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 13:25:43 -08:00
Mike Cao
2a8437cac9 Added jest testing. 2024-03-01 13:25:32 -08:00
Francis Cao
a587bce0e8 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-03-01 13:01:11 -08:00
Francis Cao
72090d778b add more website tests, support functions, login 2024-03-01 13:00:59 -08:00
Mohanad Alrwaihy
2c9e68aa84 refactor: 🌐 Edit Arabic Translations 2024-03-01 17:37:30 +03:00
Mike Cao
2363b03d1c Merge remote-tracking branch 'origin/dev' into dev 2024-02-29 21:18:47 -08:00
Mike Cao
6df266bbfd Added search to filter dropdown. Updated eslint packages. 2024-02-29 21:18:34 -08:00
Mike Cao
343cf7a364 Merge branch 'master' into dev 2024-02-29 20:28:00 -08:00
Mike Cao
75d2e3af41 Removed docker labels. 2024-02-29 20:21:51 -08:00
Mike Cao
0bae517677 Updated var reference. 2024-02-29 20:19:56 -08:00
Mike Cao
a6acd5e099 Added Docker labels to manual build. 2024-02-29 20:01:38 -08:00
Francis Cao
e5c19482ab Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-29 17:40:58 -08:00
Francis Cao
7ded5fc6c9 add prelim website tests 2024-02-29 17:40:49 -08:00
Mike Cao
9f90412b25 Merge master. 2024-02-29 17:35:54 -08:00
Mike Cao
7e742730ae Bump version. 2024-02-29 14:14:29 -08:00
Mike Cao
2795d0ecea
Merge pull request #2548 from umami-software/analytics
v2.10.1
2024-02-29 14:10:46 -08:00
Mohanad Alrwaihy
54db548832 refactor: 🌐 Add Missing Arabic Values 2024-02-29 23:47:59 +03:00
Mohanad Alrwaihy
adf910306b style: 🎨 Use Logical Style properties to apply same styles based on Language Direction (dir) 2024-02-29 23:32:06 +03:00
Mohanad Alrwaihy
354da4bc56 fix: 🐛 Change Page direction based on the language dir property 2024-02-29 23:10:41 +03:00
Francis Cao
14c0c5060a working compose file for cypress 2024-02-28 16:29:35 -08:00
Mike Cao
98989a6010 Merge remote-tracking branch 'origin/analytics' into analytics 2024-02-28 16:09:10 -08:00
Mike Cao
87b947d174 Fixed date buttons for today/yesterday selection. 2024-02-28 16:08:50 -08:00
Brian Cao
719699762c add orderBy 2024-02-28 15:01:58 -08:00
Francis Cao
44d8606d1a add cypress docker compose file 2024-02-28 15:01:13 -08:00
Brian Cao
59f4d9aff8 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-28 12:40:27 -08:00
Brian Cao
ec11bd7cfe add orderBy 2024-02-28 12:40:23 -08:00
Brian Cao
300a0f63e7 add orderby to query. 2024-02-28 10:26:15 -08:00
Francis Cao
e68d1b3233 remove cloud mode for transfer website 2024-02-28 10:25:57 -08:00
Francis Cao
6ac147f484 remove cloud mode for transfer website 2024-02-28 10:22:32 -08:00
Brian Cao
3d6cdddd38 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-28 10:19:27 -08:00
Brian Cao
ae82e531b1 add orderby to query. 2024-02-28 10:19:22 -08:00
Mike Cao
923a6b3914 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 22:41:20 -08:00
Mike Cao
0f298c4197 Bump dev version. 2024-02-27 22:41:03 -08:00
Francis Cao
5b9f0707b8 install cypress and add initial test 2024-02-27 21:41:34 -08:00
Mike Cao
3e45c9d055 Removed label causing build issue. 2024-02-27 20:35:39 -08:00
Mike Cao
915a4ee9b0
Merge pull request #2534 from umami-software/dev
v2.10.0
2024-02-27 15:59:02 -08:00
Mike Cao
23a45a3109 Updated validations for send payload. 2024-02-27 15:09:57 -08:00
Fabian Hiller
5153f320f6 Add data-strip-search config to tracker 2024-02-27 01:39:57 -05:00
Mike Cao
41eed2c056 Fix CSS. 2024-02-26 01:14:38 -08:00
Mike Cao
8f7f6b3479 Merge branch 'dev' into analytics 2024-02-26 00:57:21 -08:00
Mike Cao
968fda33e3 Updated event data view. 2024-02-26 00:53:56 -08:00
Mike Cao
7723576212 Updated handling of date values for event data. 2024-02-25 23:14:45 -08:00
Fabian Hiller
f59d34f64d Upgrade Next.js plugin of Netlify in package.json 2024-02-24 23:47:06 -05:00
Mike Cao
0c910f2abd Merge remote-tracking branch 'origin/dev' into dev 2024-02-23 20:41:36 -08:00
Mike Cao
c5c4aaeb44 Updated lang files. 2024-02-23 20:40:44 -08:00
Mike Cao
f81f0839c6 Updated Funnel report component. 2024-02-23 20:31:35 -08:00
Francis Cao
8dd4e96226 Merge branch 'dev' into analytics 2024-02-22 22:48:09 -08:00
Francis Cao
09869bbe5a fix date validation for getDataType 2024-02-22 22:31:43 -08:00
Francis Cao
490bb11771 fix create website / teams permissions 2024-02-22 22:21:11 -08:00
Francis Cao
8fbd6871f7 Fix report create for view only, fix createdby on save and add column in team websites table 2024-02-22 15:31:32 -08:00
Brian Cao
fd1b9ff7b4 add permission to create report. 2024-02-22 13:47:28 -08:00
Mike Cao
542c97455a Merge branch 'analytics' of https://github.com/umami-software/umami into analytics 2024-02-19 18:31:34 -08:00
Mike Cao
1d93a8773d Merge branch 'dev' into analytics 2024-02-19 18:31:22 -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
4c63db599f Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2024-02-19 13:40:18 -08:00
Francis Cao
7fce92dffd fix active visitor bug 2024-02-19 13:39:57 -08:00
Francis Cao
c1786069eb Merge branch 'dev' into analytics 2024-02-19 12:34:33 -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
b2a7aaaad0 Upgraded Prisma v5.9.1. 2024-02-17 10:52:53 -08:00
Mike Cao
a985245c79 Merge branch 'dev' into analytics 2024-02-17 10:48:36 -08:00
Mike Cao
709f46a391 Moved suspense boundary. 2024-02-17 10:41:34 -08:00
Mike Cao
fb72485f88 Merge remote-tracking branch 'origin/dev' into dev 2024-02-17 10:37:39 -08:00
Mike Cao
54abab0bda Added suspense boundary. 2024-02-17 10:37:29 -08:00
Mike Cao
9cbdf9bce9 Merge branch 'dev' into analytics 2024-02-17 10:23:16 -08:00
Mike Cao
b1dae9c484 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-17 10:22:48 -08:00
Mike Cao
007625ecf7 Split up sso page. 2024-02-17 10:21:46 -08:00
Mike Cao
df872a1989 Merge branch 'dev' into analytics 2024-02-17 10:18:55 -08:00
Mike Cao
cecdf49180 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-17 10:18:40 -08:00
Mike Cao
04e62bfd7c Merge branch 'dev' into analytics 2024-02-17 10:04:43 -08:00
Mike Cao
a9d46437f2 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-17 10:03:54 -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
c6f656e142 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2024-02-16 13:09:42 -08:00
Francis Cao
8048bc7866 Fix viewonly for teams addwebsite button 2024-02-16 13:09:20 -08:00
Brian Cao
379849ee1d Merge branch 'dev' into analytics 2024-02-16 12:03:21 -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
4853437afa Merge branch 'dev' into analytics 2024-02-16 10:49:32 -08:00
Mike Cao
d5de8b9d60 Merge branch 'analytics' into dev 2024-02-16 10:49:04 -08:00
Mike Cao
d1e9bb9472 Updated lang. 2024-02-16 10:46:14 -08:00
Mike Cao
f25cd93012 Prevent admin from resetting their own role. 2024-02-16 10:22:18 -08:00
Mike Cao
2e871af05b
Merge pull request #2508 from jermanuts/master
Update ar-SA.json
2024-02-15 19:56:46 -08:00
Mike Cao
8e6c7eef86
Merge branch 'dev' into master 2024-02-15 19:56:33 -08:00
Mike Cao
d11d974dab
Merge pull request #2512 from pxlfrk/master
add missing OCI docker labels
2024-02-15 19:54:50 -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
5fc3d81c39 Fix MySQL migration 4. 2024-02-15 10:59:11 +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
Achim Krämer
2170f87674
🎨 improve formatting
Signed-off-by: Achim Krämer <39946364+pxlfrk@users.noreply.github.com>
2024-02-14 18:52:46 +01:00
Achim Krämer
4135835270
🏷️ add OCI docker labels
Signed-off-by: Achim Krämer <39946364+pxlfrk@users.noreply.github.com>
2024-02-14 18:42:12 +01: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
a533cbdc54
Merge pull request #2503 from GimliForge/master
Updated nextjs version - 500 server error fix Netlify.
2024-02-13 08:21:32 -08:00
GimliForge
d5f91763e5
Update nextjs version 2024-02-11 19:58:42 -05: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
bc73410dba remove default deleted_at 2024-02-07 14:01:25 -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
Brian Cao
10f1b906ec Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-02-06 12:29:48 -08:00
Brian Cao
305a161509 Fix property. 2024-02-06 12:29:43 -08:00
Francis Cao
74ea4f511e clean-up edit forms, removed unused params 2024-02-06 12:25:21 -08:00
Francis Cao
3277b65993 update @umami/prisma-client package 2024-02-06 11:17:59 -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
1ba6f30401 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 15:32:48 -08:00
Mike Cao
b9825304c3 Fixed paging. Updated edit props. 2024-02-05 15:32:36 -08:00
Francis Cao
e915074c4b populate created_by in migration script 2024-02-05 12:09:57 -08:00
Francis Cao
e5e8d0acc8 finalize teams schema 2024-02-05 11:47:12 -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
Francis Cao
9eee25bbcf update bug template 2024-02-02 16:42:13 -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
Francis Cao
67edc5c092 fix team add website overflow bug 2024-01-29 11:50:36 -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
Brian Cao
f319ce7915 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2024-01-26 09:13:20 -08:00
Brian Cao
421d232cce Fix logoUrl 2024-01-26 09:13:01 -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
14991df868 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 23:21:55 -08:00
Mike Cao
f85393f8df Teams refactor: removed team websites. 2024-01-25 23:20:53 -08:00
Brian Cao
53c7d86be5 add logo url 2024-01-25 11:15:11 -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
Francis Cao
085f8a1b73 Merge branch 'feat/teams-redesign' into dev 2024-01-17 10:46:18 -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
625bd90d45 Revert "Update schema.prisma"
This reverts commit 7a77c82ca1.
2024-01-16 12:47:33 -08:00
Francis Cao
82465f9362 remove direct_url 2024-01-16 12:35:24 -08:00
Francis Cao
a6a73db9c4 update schema file and add migrations 2024-01-16 12:32:27 -08:00
Francis Cao
5df49e9273 prevent column overflow 2024-01-16 10:48:26 -08:00
Mike Cao
0b8e90c0c8
Merge pull request #2469 from umami-software/dependabot/npm_and_yarn/follow-redirects-1.15.4
Bump follow-redirects from 1.15.3 to 1.15.4
2024-01-16 09:30:36 -08:00
Mike Cao
30a14dff6c
Merge pull request #2472 from spencertweedy/spencertweedy-patch-1
Update schema.prisma
2024-01-16 09:30:08 -08:00
Timo Kössler
bfbe059505
Log IP address on failed login attempts 2024-01-16 12:24:28 +01:00
Spencer Tweedy
7a77c82ca1
Update schema.prisma
fix pgbouncer to supavisor migration issue
2024-01-15 12:49:12 -06: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
dependabot[bot]
8eb897f0ca
Bump follow-redirects from 1.15.3 to 1.15.4
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-11 02:05:06 +00: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
1cf5bd488c remove kafka engine tables 2023-12-27 09:22:32 -08:00
Francis Cao
f01abe23c6 show actions in users websites 2023-12-26 10:11:53 -08:00
Mike Cao
2c04115d20
Merge pull request #2425 from akshar-dave/patch-1
Fixed a typo
2023-12-22 19:27:32 -10: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
500a0cd261 Merge branch 'dev' into analytics 2023-12-21 16:09:03 -08: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
f11cd0ba17 Merge branch 'dev' into analytics 2023-12-20 22:47:23 -08: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
c990f377ae Merge branch 'dev' into analytics 2023-12-20 09:32:54 -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
Mike Cao
4625a335a0 Updated packages. 2023-12-17 23:52:14 -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
4a1a51fb8b Merge branch 'dev' into analytics 2023-12-13 12:31:46 -08:00
Mike Cao
784237bfab Merge branch 'master' of https://github.com/umami-software/umami 2023-12-13 00:59:53 -08:00
Mike Cao
310cf0b221 Fixed clear all filters button. 2023-12-13 00:59:19 -08:00
Mike Cao
fd4816f829
Merge pull request #2429 from umami-software/dev
v2.9.0
2023-12-12 22:07:50 -10:00
Mike Cao
9f73aba900 Added external links for pages. 2023-12-13 00:02:54 -08:00
Mike Cao
fd9bc2f130 Merge branch 'dev' into analytics 2023-12-12 21:31:22 -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
9735769413 Removed Node 16 from GH workflow. 2023-12-12 19:20:34 -08:00
Mike Cao
a45de0615e Merge branch 'analytics' of https://github.com/umami-software/umami into analytics 2023-12-12 19:17:58 -08:00
Mike Cao
5839c7ac12 Merge branch 'dev' into analytics 2023-12-12 19:16:58 -08:00
Mike Cao
907685b96e Added limit to metrics queries. 2023-12-12 19:00:44 -08:00
Mike Cao
a851ebf124 Bump version 2.9.0. 2023-12-11 00:15:26 -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
Akshar Dave
faaa9aa7cd
Fixed a typo 2023-12-08 12:09:04 +05:30
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
Mike Cao
a6968e2f70 Update ErrorBoundary. 2023-12-03 21:19:03 -08:00
Brian Cao
4d3d784c68 Fix dashboard call. 2023-12-03 20:15:02 -08:00
Brian Cao
260f03cda4 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-12-03 19:52:46 -08:00
Brian Cao
467790b67a Open /websites endpoint to view all. 2023-12-03 19:52:40 -08:00
Mike Cao
f3657685d1 Fixed filter params. 2023-12-03 03:19:27 -08:00
Mike Cao
7c42f0da82 Typescript refactor. 2023-12-03 03:07:03 -08:00
Mike Cao
b578162cb6 Refactored useQuery functions. 2023-12-01 20:27:59 -08:00
Mike Cao
be550cc440 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 16:03:02 -08:00
Mike Cao
e068ac0dd9 Fixed insights report. 2023-12-01 16:02:50 -08:00
Francis Cao
b343b6a9b2 Merge branch 'dev' into analytics 2023-12-01 13:27:22 -08:00
Francis Cao
b314cc88f5 update @umami/prisma-client to 0.8.0 2023-12-01 12:59:51 -08:00
Mike Cao
d0e1912faf Updated CSP rules. 2023-11-30 23:40:58 -08:00
Mike Cao
f16d74e25d Merge branch 'dev' into analytics 2023-11-30 22:25:13 -08:00
Mike Cao
3bb82aebd8 Fixed redis lookup. 2023-11-30 22:24:43 -08:00
Mike Cao
a224a3caf3 Upgrade prisma. Lint fixes. 2023-11-30 21:58:11 -08:00
Mike Cao
a3b5f05a32 Merge branch 'master' into dev 2023-11-30 18:09:23 -08:00
Mike Cao
7fb74feeaf
Merge pull request #2352 from sakil-ahmed/fix/dashboard-buttons-align-on-mobile-view
fixed Dashboard and buttons are not aligned on mobile view
2023-11-30 16:08:55 -10:00
Mike Cao
1e096c22a4
Merge pull request #2375 from Gouttfi/master
Solve issue : #2358
2023-11-30 15:52:43 -10:00
Mike Cao
fc662446e6
Merge pull request #2378 from Maxime-J/filterTags
Enhance filter tags
2023-11-30 15:51:53 -10:00
Mike Cao
a7cb0eaa20
Merge pull request #2379 from Maxime-J/ordered-filter-values
Sort filter values
2023-11-30 15:48:48 -10:00
Mike Cao
5c8941bba2
Merge pull request #2380 from Maxime-J/stats
Match cloud stats in self hosted
2023-11-30 15:47:34 -10:00
Mike Cao
cde85d7db7
Merge pull request #2388 from Maxime-J/subdivision1
Ensure country in region code
2023-11-30 14:48:01 -10:00
Mike Cao
becca1183b
Merge pull request #2395 from TightknitAI/fix-dashboards
Update moment to moment-timezone. Fixes charts
2023-11-30 14:40:59 -10:00
Mike Cao
2cfc71e8fe
Merge pull request #2399 from styxit/mysql57-migration-fix
Fix migrations to support mysql 5.7
2023-11-30 14:38:47 -10:00
Mike Cao
d08cba0df7
Merge pull request #2401 from esdete2/bugfix-user-creation
Fix user creation process
2023-11-30 14:37:46 -10:00
Mike Cao
3e2dff752b
Merge pull request #2408 from vndroid/master
Update Health Check
2023-11-30 14:35:29 -10:00
Mike Cao
afbef196c2
Merge branch 'dev' into master 2023-11-30 14:35:02 -10:00
Mike Cao
1770682598 Merge branch 'dev' into analytics 2023-11-30 15:00:30 -08:00
Mike Cao
91d385d838 Added frame-src to CSP. 2023-11-30 14:54:45 -08:00
Mike Cao
3e8d50d526 Merge branch 'dev' into analytics 2023-11-29 20:30:36 -08:00
Mike Cao
5acc1f0f3c Merge remote-tracking branch 'origin/dev' into dev 2023-11-29 14:03:22 -08:00
Mike Cao
c24a0c87dc Updated login check. 2023-11-29 14:03:10 -08:00
Brian Cao
c5fc16f241 Auto stash before merge of "dev" and "origin/dev" 2023-11-28 22:44:11 -08:00
Mike Cao
e074394b13 Removed hostname lookup. 2023-11-28 11:03:55 -08:00
Mike Cao
02c9e0115e Updated user get. 2023-11-28 10:22:24 -08:00
Francis Cao
ea28511b3c fix redis always being enabled 2023-11-27 22:20:47 -08:00
Mike Cao
f7dd0464e0 Updated redis calls. 2023-11-27 20:47:35 -08:00
Francis Cao
4c0beaee14 add extension-read-replicas package 2023-11-27 16:11:09 -08:00
vndroid
e1cd8eac83
Update Health Check
- Node container support healthcheck.
2023-11-27 16:25:53 +08:00
Mike Cao
4dedc57d0a Updated clients. 2023-11-22 18:03:48 -08:00
Philip Schmidt
27f5c8fceb execute onSave only if exists / update cache and show toast 2023-11-17 16:01:36 +01:00
Floris
b5a7e4e1cc
Fix migrations to support mysql 5.7 2023-11-15 18:35:40 +01:00
Zach Hawtof
9b54b3a3c7
Update moment to moment-timezone 2023-11-14 22:44:32 -05:00
Mike Cao
a78d11e352 Fixed types. 2023-11-13 21:58:23 -08:00
Mike Cao
8775d696b8 Typescript conversion. 2023-11-13 21:36:52 -08:00
Mike Cao
366ef35d3d Updated types. 2023-11-13 14:12:05 -08:00
Mike Cao
bdf2fa4f05 Fixed import. 2023-11-11 20:47:06 -08:00
Mike Cao
70cee9f5e8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/App.tsx
2023-11-11 20:46:41 -08:00
Mike Cao
eda2c07ea3 Allow embedding of share page. 2023-11-11 20:45:09 -08:00
Maxime-J
a34747578f ensure country in region code 2023-11-08 18:49:30 +00:00
Maxime-J
f016970186 fix single filter value 2023-11-05 17:11:50 +00:00
Francis Cao
d6ee8ee869 Revert "rename url filter to url_path"
This reverts commit 92f32ce7fa.
2023-11-03 15:48:25 -07:00
Francis Cao
cd1a98f51b Fix worldmap mapping 2023-11-03 15:46:12 -07:00
Francis Cao
452777bc7b Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-11-03 14:23:57 -07:00
Francis Cao
92f32ce7fa rename url filter to url_path 2023-11-03 14:23:48 -07:00
Maxime-J
d5eddeae24 sort formatted filter values 2023-11-03 11:53:23 +00:00
Maxime-J
76a5ac8e46 match cloud stats in self hosted 2023-11-02 17:34:06 +00:00
Maxime-J
0430903483 localize filter tags 2023-11-02 14:47:28 +00:00
Mike Cao
8a4623eb7b Updated stale workflow. 2023-10-31 21:16:02 -05:00
Gouttfi
423dfbb546 Solve issue : https://github.com/umami-software/umami/issues/2358 2023-10-31 18:54:49 +01:00
Mike Cao
02c3d2bab3 Moved files. New components build. 2023-10-30 17:18:48 -05:00
Mike Cao
4c599fa435 Upgraded next version. 2023-10-30 12:40:34 -05:00
Mike Cao
047aad1283 Merge branch 'dev' into analytics 2023-10-23 09:42:55 -07:00
Mike Cao
9cb6046844 Upgraded prisma and next. 2023-10-20 19:58:24 -07:00
Mike Cao
91b6dc5908
Merge pull request #2362 from umami-software/dev
Hotfix
2023-10-20 10:55:56 -10:00
Mike Cao
0901a000ed Merge remote-tracking branch 'origin/dev' into dev 2023-10-20 13:54:13 -07:00
Mike Cao
f175534f51 Added missing salt. 2023-10-20 13:54:03 -07:00
Mike Cao
140cac046b Update redis client. 2023-10-20 13:05:31 -07:00
Brian Cao
beac0350ac Better fix, usage. 2023-10-20 14:34:14 -05:00
Brian Cao
4153db48d2 Better fix, usage. 2023-10-20 14:34:02 -05:00
Brian Cao
671c9fc791 Fix usage. 2023-10-20 14:28:51 -05:00
Mike Cao
a106098129 Fix semver. 2023-10-19 19:14:03 -07:00
Mike Cao
c672c2d965 Update semver package. 2023-10-19 18:12:02 -07:00
Mike Cao
3437e01fd9 Rebuilt yarn.lock file. 2023-10-19 17:07:52 -07:00
Mike Cao
9aa2830d2b Fixed test console. 2023-10-19 17:01:21 -07:00
Mike Cao
b9477db1a2
Changed Docker URL. 2023-10-19 16:55:00 -07:00
Mike Cao
b54164a673
Merge pull request #2354 from umami-software/dev
v2.8.0
2023-10-19 09:23:22 -10:00
Brian Cao
ec0a3fa431 Fix query param pass through. 2023-10-17 22:09:28 -07:00
Brian Cao
214fadef22 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 21:55:56 -07:00
Brian Cao
ca6da03a0b Fix query param pass through. 2023-10-17 21:55:54 -07:00
Mike Cao
321f7fd20b Merge branch 'dev' into analytics 2023-10-17 20:17:28 -07:00
Mike Cao
55ad5fbe7b Bump version v2.8.0. 2023-10-17 20:10:57 -07:00
Francis Cao
6bdceabc65 Return array of records 2023-10-17 11:45:24 -07:00
Mike Cao
fc1f2c9cd3 Merge branch 'dev' into analytics
# Conflicts:
#	src/app/(main)/reports/[id]/Report.js
#	src/queries/analytics/eventData/getEventDataEvents.ts
#	src/queries/analytics/getActiveVisitors.ts
#	src/queries/analytics/sessions/getSessionMetrics.ts
#	yarn.lock
2023-10-17 11:31:49 -07:00
Mike Cao
435e6a155d Add scroll prop to links. 2023-10-17 11:27:35 -07:00
sakil-ahmed
22f2f2f251 fixed Dashboard and buttons are not aligned on mobile view 2023-10-17 21:05:10 +06:00
Mike Cao
9af6e08c00 Mobile fixes for metrics bar. 2023-10-16 22:46:49 -07:00
Mike Cao
4c57c32950 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 21:56:09 -07:00
Mike Cao
a43422d81f Updated menu view for mobile. 2023-10-16 21:55:59 -07:00
Francis Cao
e3df177edc convert count to number 2023-10-16 21:44:02 -07:00
Mike Cao
a8f429c9ee Fixed page height. 2023-10-16 21:13:48 -07:00
Mike Cao
3d9da7326e Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 20:44:33 -07:00
Mike Cao
81a810bd73 Fixed filter parameters. 2023-10-16 20:44:22 -07:00
Francis Cao
7eb5d19576 fix active visitors bug 2023-10-16 12:16:42 -07:00
Mike Cao
b1d3970ea7 Updated lang files. 2023-10-15 23:12:01 -07:00
Mike Cao
8cb1c4ed7a Merge remote-tracking branch 'origin/dev' into dev 2023-10-15 20:24:44 -07:00
Mike Cao
2732ed18a4 Updated report header. 2023-10-15 20:24:28 -07:00
Brian Cao
9732d0e6ef Add back pageSize. 2023-10-15 17:59:19 -07:00
Brian Cao
d5c4202ee4 Fixed settings/profile cloudMode. 2023-10-15 16:06:41 -07:00
Brian Cao
0487e48dd2 Fix pager. 2023-10-15 15:52:34 -07:00
Mike Cao
aa5d81d6a1 Fixed website select. 2023-10-15 14:07:53 -07:00
Mike Cao
69a189aae7 Fixed country not showing. 2023-10-15 13:19:51 -07:00
Mike Cao
8d85e3fcdb Update ListTable display of items. 2023-10-15 13:12:29 -07:00
Mike Cao
934b107e5e Merge remote-tracking branch 'origin/dev' into dev 2023-10-15 02:08:53 -07:00
Mike Cao
1351e6f14a Fixed issue with removing team members. 2023-10-15 02:08:29 -07:00
Mike Cao
82a8c5043f
Merge pull request #2306 from juangacovas/patch-4
Update es-ES.json
2023-10-14 22:47:00 -10:00
Mike Cao
ab8d607ba0
Merge pull request #2314 from mho22/start-env-modification
Corrected and Updated start-env script
2023-10-14 22:46:01 -10:00
Mike Cao
096484ebe4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/(main)/websites/[id]/reports/WebsiteReports.js
2023-10-14 22:00:36 -07:00
Mike Cao
012d31e010 Updated ReportsTable. 2023-10-14 21:59:54 -07:00
Mike Cao
30139d65e4
Merge pull request #2327 from umami-software/dependabot/npm_and_yarn/postcss-8.4.31
Bump postcss from 8.4.30 to 8.4.31
2023-10-14 18:21:21 -10:00
Mike Cao
b0ae313e06
Merge branch 'dev' into dependabot/npm_and_yarn/postcss-8.4.31 2023-10-14 18:20:51 -10:00
Mike Cao
1cecf54f68
Merge pull request #2335 from bilguun0203/master
Update mn-MN.json
2023-10-14 18:19:42 -10:00
Mike Cao
cac7be9c67
Merge pull request #2325 from RavelloH/patch-1
Update i18n files zh-CN and zh-TW
2023-10-14 18:18:08 -10:00
RavelloH
77d2f9360e
Update src/lang/zh-TW.json
Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org>
2023-10-15 10:56:46 +08:00
Francis Cao
c4bbd09de4 Fix website reports error 2023-10-14 11:07:18 -07:00
Francis Cao
82e669193d fix /settings redirect for cloud mode 2023-10-14 10:35:57 -07:00
RavelloH
2e56058aab
Update src/lang/zh-TW.json
Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org>
2023-10-14 21:18:30 +08:00
Francis Cao
3353277829 remove unit limit on month 2023-10-13 14:07:55 -07:00
Francis Cao
170a269723 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-10-13 12:53:08 -07:00
Francis Cao
8cc7657b1b allow undefined timezone in yup 2023-10-13 12:53:01 -07:00
Brian Cao
4906986080 Fix data map. 2023-10-13 12:47:47 -07:00
Brian Cao
94a27226d1 Add missing parameters. 2023-10-13 11:33:20 -07:00
Francis Cao
0e782f3bcc fix prisma query, column name 2023-10-13 10:01:23 -07:00
Francis Cao
88aa341821 add date param to values 2023-10-13 09:31:53 -07:00
Mike Cao
c18daf4845 Fixed share page. Updated data tables to be responsive. 2023-10-12 16:13:14 -07:00
Brian Cao
92d16d8937 Merge remote-tracking branch 'origin/dev' into dev 2023-10-12 13:15:01 -07:00
Brian Cao
1c76534470 update regex. 2023-10-12 13:15:00 -07:00
Mike Cao
003dc69ca4 Merge remote-tracking branch 'origin/dev' into dev 2023-10-12 00:03:22 -07:00
Mike Cao
a15fb89c90 Added card mode to DataTable. 2023-10-12 00:03:10 -07:00
Mike Cao
eae470c374
Merge pull request #2337 from aldo-roman/master
fix(tracker): Correctly extract pathname
2023-10-11 19:28:22 -10:00
Aldo Román
aef4b23cce fix(tracker): Correctly extract pathname 2023-10-12 00:41:58 +02:00
Francis Cao
4de710c534
Merge pull request #2338 from umami-software/update-clickhouse-client
Update clickhouse client
2023-10-11 11:12:46 -07:00
Francis Cao
49acf2edd0 add includeCountry logic to results 2023-10-11 10:46:08 -07:00
Mike Cao
5f73e4e8db Merge remote-tracking branch 'origin/dev' into dev 2023-10-11 10:02:43 -07:00
Mike Cao
a79183cd13 Layout fixes for DataTable. 2023-10-11 10:02:32 -07:00
Aldo Román
e8da04bebe fix(tracker): Correctly extract pathname 2023-10-11 15:09:07 +02:00
Francis Cao
5f0ac23c22 fix fieldValue in EventDataEvents 2023-10-10 10:41:13 -07:00
Francis Cao
444c01f1bf update yarn lock 2023-10-10 10:31:35 -07:00
Francis Cao
0a4d9f0e66 update package.json 2023-10-10 10:30:41 -07:00
Francis Cao
ce0a90e341 clean-up protocol, update getDatabaseType logic for CH 2023-10-10 10:29:35 -07:00
Francis Cao
be353d5555 add date params back to session metrics 2023-10-10 10:29:22 -07:00
Francis Cao
e2bb2defd4 update CH rawquery and type 2023-10-10 10:28:50 -07:00
Francis Cao
c9a0e23036 add windows-mobile.png 2023-10-10 10:21:05 -07:00
Aldo Román
a555d59153 fix(tracker): Correctly extract pathname 2023-10-10 15:06:48 +02:00
Bilguun Ochirbat
b832683f4d
Update mn-MN.json 2023-10-10 13:20:33 +08:00
Mike Cao
83fb358355 Added more cache checks. 2023-10-08 00:15:29 -07:00
Mike Cao
ef9f8ed816 Updated DataTable rendering. 2023-10-07 22:58:46 -07:00
Mike Cao
8b48130d5f Refactored teams components. 2023-10-07 22:42:49 -07:00
Mike Cao
6253d55790 Refactored forms and pages. 2023-10-07 18:55:14 -07:00
dependabot[bot]
329ab155ce
Bump postcss from 8.4.30 to 8.4.31
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-06 20:16:53 +00:00
RavelloH
494702b1f8
Update zh-TW.json 2023-10-06 11:54:16 +08:00
RavelloH
7f5f3e815a
Update zh-CN.json 2023-10-06 11:48:17 +08:00
RavelloH
f4476c7e06
Update zh-CN.json 2023-10-06 11:21:58 +08:00
Mike Cao
1325abe31d Updated validations for websites. 2023-10-04 19:22:26 -07:00
Mike Cao
5c933d1c4a Fixed login redirect. 2023-10-04 16:36:47 -07:00
Mike Cao
367e0ecdf4 Removed toggle formatting. 2023-10-04 16:04:10 -07:00
Mike Cao
ab0a7bbb13 Merge remote-tracking branch 'origin/dev' into dev 2023-10-04 01:46:12 -07:00
Mike Cao
a14e11bae2 Updated add team website form. 2023-10-04 01:46:00 -07:00
Mike Cao
c990459238 Renamed (app) folder to (main). 2023-10-03 16:05:17 -07:00
Mike Cao
5c15778c9b Update minimum date. 2023-10-03 15:50:33 -07:00
Mike Cao
2826e561cf Fix for minimum date unit. 2023-10-03 12:21:28 -07:00
Mike Cao
d13f0bc5fe Fix for minimum date unit. 2023-10-03 11:06:58 -07:00
Mike Cao
c96f317487
Merge pull request #2319 from umami-software/feat/um-290-update-clickhouse-client
Feat/um 290 update clickhouse client
2023-10-03 10:24:16 -07:00
Mike Cao
476dd52875 Layout updates. 2023-10-03 09:45:02 -07:00
Mike Cao
e4c5f42189 CSS updates. 2023-10-02 23:51:26 -07:00
Francis Cao
8db43cd94b update yarn lock 2023-10-02 14:49:20 -07:00
Francis Cao
8e240af9e8 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-290-update-clickhouse-client 2023-10-02 11:22:33 -07:00
Francis Cao
a1edd4821c add date params back to session metrics 2023-10-02 10:50:14 -07:00
Mike Cao
9bb89c7e8b Replaced SettingsTable with DataTable. 2023-10-01 16:11:12 -07:00
Mike Cao
0d9b6e8355 Update useValidate calls. 2023-09-29 20:24:48 -07:00
Mike Cao
5e3c135388 Cleaned up pages. Fixed SSO page. 2023-09-29 20:19:27 -07:00
Mike Cao
3720a5a2fc Fix CSS. Updated pages. 2023-09-29 19:18:44 -07:00
Francis Cao
c6d0fde424 clean-up protocol, update getDatabaseType logic for CH 2023-09-29 11:22:13 -07:00
Francis Cao
98b7624e8f update CH rawquery and type 2023-09-29 11:00:06 -07:00
MHO
c61907ad1d Corrected error with port and hostname argument and added the extra empty array 2023-09-29 17:22:11 +02:00
Mike Cao
0f12226401 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 05:29:40 -07:00
Mike Cao
9a52cdd2e1 Refactored to use app folder. 2023-09-29 05:29:22 -07:00
Francis Cao
35d45334df update package 2023-09-28 16:45:25 -07:00
Brian Cao
49ad536f24 Auto stash before merge of "dev" and "origin/dev" 2023-09-28 13:14:15 -07:00
Mike Cao
40cfcd41e9 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/components/common/Pager.module.css
#	src/lib/constants.ts
#	src/lib/yup.ts
#	src/pages/api/teams/[id]/users/index.ts
#	src/pages/api/websites/[id]/reports.ts
2023-09-26 23:27:55 -07:00
Mike Cao
7e626dcd52 Added useFilterQuery. Converted websites and reports pages. 2023-09-26 23:20:29 -07:00
Francis Cao
8e8bf41eb3 css updates for pager / page 2023-09-26 13:29:49 -07:00
Brian Cao
febf085aca Fix yup. 2023-09-26 12:30:35 -07:00
Brian Cao
e6eb9a487e Create unit test. 2023-09-25 13:31:25 -07:00
Brian Cao
ce2a83a09f More yup validations. 2023-09-25 13:19:56 -07:00
Juanga Covas
ae01a50d11
Update es-ES.json
Missing translations, improvements
2023-09-23 20:25:37 +02:00
Mike Cao
b246fca031 Merge branch 'dev' into analytics 2023-09-22 18:29:41 -07:00
Mike Cao
4bbfb05255 Merge branch 'master' into analytics 2023-09-22 18:00:23 -07:00
Mike Cao
fd5d5c692e
Merge pull request #2302 from umami-software/dev
v2.7.0
2023-09-22 17:59:02 -07:00
Mike Cao
2ccb8d0a3c Bump version v2.7.0. 2023-09-22 17:24:15 -07:00
Mike Cao
bdf1de424a Merge branch 'master' into dev 2023-09-22 17:21:01 -07:00
Mike Cao
a34ccbbdcb
Merge pull request #2283 from Maxime-J/custom-range-day
Fix chart with a single day custom range
2023-09-22 17:17:56 -07:00
Mike Cao
5d0584319f
Merge pull request #2289 from AkashRajpurohit/fix/dont-stop-event-if-umami-fails-to-send-data
fix: 🐛 gulp error so that error in sending data does not affect the action triggering it
2023-09-22 17:16:13 -07:00
Mike Cao
6846355c63 DataTable refactor. 2023-09-22 00:59:00 -07:00
Mike Cao
92ccc64e47 Merge branch 'data-table' into dev
# Conflicts:
#	src/components/messages.js
2023-09-21 21:54:39 -07:00
Mike Cao
424f3e5323 Fixed login redirect. 2023-09-21 18:37:40 -07:00
Mike Cao
326bc9f8fa Merge remote-tracking branch 'origin/dev' into dev 2023-09-21 17:30:58 -07:00
Mike Cao
a3a24e76c9 Pass analyticsUrl prop. 2023-09-21 17:30:40 -07:00
Brian Cao
a3bba63b09 update ignore. 2023-09-21 16:45:46 -07:00
Mike Cao
7f1f3b685a Update redis package. 2023-09-21 16:30:15 -07:00
Francis Cao
55487ca725 Fix search on settings table from dissappearing 2023-09-21 13:51:16 -07:00
Mike Cao
6291654748 Merge remote-tracking branch 'origin/dev' into dev 2023-09-21 01:02:15 -07:00
Mike Cao
b3f9dfa01a Update packages. 2023-09-21 01:01:58 -07:00
Brian Cao
58a67512c9 Merge remote-tracking branch 'origin/dev' into dev 2023-09-20 15:26:50 -07:00
Brian Cao
f7b2f50e4f Fix TS error. 2023-09-20 15:26:49 -07:00
Francis Cao
e9ae4903d4 add regions to useFormat 2023-09-20 14:36:18 -07:00
Francis Cao
3f6fb4654b Fix resetAt date parsing error for CH 2023-09-20 12:43:59 -07:00
Brian Cao
84e13a2a10 Add external analytics url. 2023-09-18 09:51:43 -07:00
AkashRajpurohit
e73865b880 fix: 🐛 gulp error so that error in sending data does not affect the action triggering it 2023-09-17 19:34:35 +05:30
Brian Cao
7b97209d56 Fix CH script. 2023-09-13 13:27:07 -07:00
Maxime-J
d457e6ea16 localize single day calendar in date picker 2023-09-09 10:53:58 +00:00
Maxime-J
eec871dc4a use available dateLocale 2023-09-09 10:53:23 +00:00
Maxime-J
9b501d03e9 update date range parser and date picker 2023-09-09 09:38:16 +00:00
Brian Cao
36bae3f709 Fix default page size. 2023-09-06 12:52:08 -07:00
Brian Cao
6bd9916310 Merge remote-tracking branch 'origin/dev' into dev 2023-09-06 11:37:43 -07:00
Brian Cao
c5dd3390d6 Fix teamRole showing. 2023-09-06 11:37:41 -07:00
Francis Cao
0e0788b0a1 Fix v1 check error showing in postgres logs 2023-09-06 11:34:12 -07:00
Francis Cao
acb7fdcae8 add version endpoint 2023-09-05 14:27:06 -07:00
Francis Cao
da3cc9b065 fix isLoading param for SubmitButton 2023-09-05 13:53:58 -07:00
Francis Cao
99cfc68e88 exclude website domain from referrers table 2023-09-05 12:22:51 -07:00
Francis Cao
661fc92230 fix session metrics to show visitors instead of views 2023-09-05 11:09:27 -07:00
Mike Cao
ea43872dd0 Update message bundles. 2023-09-04 22:50:53 -07:00
Mike Cao
f3b10a20cc
Merge pull request #2270 from Maxime-J/lang
i18n updates
2023-09-04 19:47:46 -10:00
Mike Cao
4a7af85860
Merge branch 'dev' into lang 2023-09-04 19:47:31 -10:00
Mike Cao
6b7f658491
Merge pull request #2267 from timokoessler/master
i18n: update de-DE translations
2023-09-04 19:35:04 -10:00
Mike Cao
cec186e4c1 Added version to menu. 2023-09-04 13:42:39 -07:00
Mike Cao
4bce72350b Include HOSTNAME variable. 2023-09-02 16:53:26 -07:00
Maxime-J
a591eb867d follow-up: add missing new label in sl-SI 2023-09-02 12:50:18 +00:00
Maxime-J
105b3c1e31 restore lost translations 2023-09-02 12:39:23 +00:00
Maxime-J
e41a83316a update fr-FR 2023-09-02 11:05:06 +00:00
Maxime-J
f4f869f919 localize visitors in map tooltip 2023-09-02 08:58:25 +00:00
Maxime-J
ee6fcae152 fix typo 2023-09-01 15:27:17 +00:00
Maxime-J
5bec4f8690 localize date in retention report 2023-09-01 15:27:17 +00:00
Maxime-J
34d3d16641 display localized type in reports table 2023-09-01 12:25:13 +00:00
Maxime-J
aa341d1dd2 ensure translation of default report name 2023-09-01 09:45:59 +00:00
Maxime-J
440676ef21 add lang labels 2023-09-01 09:37:05 +00:00
Maxime-J
be886db0f2 update lang scripts 2023-09-01 09:37:05 +00:00
Timo Kössler
251a5e5a07
i18n: update de-DE translations 2023-09-01 09:26:10 +02:00
Mike Cao
c7275ef85b
Merge pull request #2262 from umami-software/dev
v2.6.2
2023-08-31 11:39:59 -10:00
Mike Cao
898bb51b68 Merge branch 'dev' of https://github.com/umami-software/umami into analytics 2023-08-31 14:34:44 -07:00
Mike Cao
b652ef3f73 Bump version v2.6.2. 2023-08-31 14:33:39 -07:00
Mike Cao
338d1c62ea Updated language files. 2023-08-31 14:32:59 -07:00
Mike Cao
7a75027988
Merge pull request #2256 from anzepintar/dev
Update sl-SI.json
2023-08-31 11:28:35 -10:00
Mike Cao
e3bf3e5dc2 Merge branch 'dev' into analytics 2023-08-31 10:13:57 -07:00
anzepintar
aa5c84a6ef Update sl-SI.json 2023-08-31 11:24:28 +02:00
Mike Cao
5b7cfe83b4 Fixed update notice. 2023-08-31 00:08:24 -07:00
Mike Cao
68ffa823f8 Fixed missing docker middleware. 2023-08-30 23:53:05 -07:00
Mike Cao
df4b57fc51 Merge branch 'dev' into analytics 2023-08-30 16:40:56 -07:00
Mike Cao
620011a837 Removed getJsonBody. 2023-08-30 16:40:32 -07:00
Mike Cao
6108e7cbc2 Merge branch 'dev' into analytics 2023-08-30 16:33:31 -07:00
Mike Cao
a7ea202785 Check for payload. 2023-08-30 16:33:06 -07:00
Mike Cao
19ec38a411
Merge pull request #2250 from umami-software/dev
v2.6.1
2023-08-30 13:16:32 -10:00
Mike Cao
fac306328d Updated language. 2023-08-30 16:13:05 -07:00
Mike Cao
ce54dafaca
Merge pull request #2246 from essesoul/essesoul-branch-1
Update zh-CN.json
2023-08-30 13:11:24 -10:00
Mike Cao
62434a3e0c Bump version v2.6.1. 2023-08-30 15:49:26 -07:00
Mike Cao
61df80112a Updated subdivision check. 2023-08-30 15:43:39 -07:00
Mike Cao
33ffa0b3d1 Added paging to dashboard. 2023-08-30 15:23:08 -07:00
Francis Cao
50b4ac9889 add optional check for subdivision 2023-08-30 09:52:24 -07:00
essesoul
e1909364d3
Update zh-CN.json
Update Chinese translation✍️
2023-08-30 23:36:39 +08:00
Francis Cao
69410f4a55 fix yup validation on password change 2023-08-29 13:56:40 -07:00
Francis Cao
c97d4037a6 update node.js version in readme for prisma 5.0 2023-08-29 13:02:51 -07:00
Mike Cao
e97fffbd83
Merge pull request #2234 from umami-software/dev
v2.6.0
2023-08-28 19:50:51 -10:00
Mike Cao
6e37a5b610 Merge branch 'dev' into analytics 2023-08-28 20:35:32 -07:00
Mike Cao
8ebd529409 Update lang build process. 2023-08-28 20:23:40 -07:00
Mike Cao
589f25f356 Merge branch 'master' into dev 2023-08-28 20:13:55 -07:00
Mike Cao
87f63de7c9
Merge pull request #2225 from err931/dev
Update ja-JP.json
2023-08-28 17:12:14 -10:00
Mike Cao
503fedd390
Merge pull request #2233 from PeterDaveHelloKitchen/update-zh-TW
Update and improve zh-TW translation
2023-08-28 17:11:33 -10:00
Mike Cao
401decaa25 Allow filtering same metric via API. 2023-08-28 20:09:54 -07:00
Mike Cao
53eb190f97 Updated Prisma to v5.2.0. 2023-08-28 19:43:54 -07:00
Mike Cao
44d428618d Merge branch 'dev' into analytics 2023-08-28 10:26:38 -07:00
Mike Cao
02efac63c5 Fix for bad region data. 2023-08-28 10:26:10 -07:00
Peter Dave Hello
5ebeb0a875 Update and improve zh-TW translation 2023-08-28 23:40:47 +08:00
Mike Cao
ff0dc45c0d Merge branch 'dev' into analytics 2023-08-27 23:31:19 -07:00
Mike Cao
684587f945 Handle country data for regions and cities. 2023-08-27 23:30:46 -07:00
Mike Cao
179568f399 Merge branch 'dev' into analytics 2023-08-27 23:02:40 -07:00
Mike Cao
8c9e473550 Update save event. 2023-08-27 23:02:16 -07:00
Mike Cao
235ab7f410 Merge branch 'dev' into analytics 2023-08-27 22:37:05 -07:00
Mike Cao
4b0118dce1 Ensure region code includes country. 2023-08-27 22:36:37 -07:00
Mike Cao
5b3a598593 Layout fixes. 2023-08-27 22:06:26 -07:00
Mike Cao
aaaa44ee16 Removed breadcrumbs. 2023-08-27 21:59:39 -07:00
Mike Cao
183dab3ddc Refactored useConfig. 2023-08-27 19:56:44 -07:00
Mike Cao
42b88388a3 Merge branch 'dev' into analytics 2023-08-27 14:19:27 -07:00
Mike Cao
cc574e6da4 Added settings redirect for cloud. 2023-08-27 14:15:02 -07:00
Mike Cao
0d10fd9a07 Merge branch 'dev' into analytics 2023-08-26 16:59:50 -07:00
Brian Cao
f2f5517051 fix type. 2023-08-26 16:35:43 -07:00
Brian Cao
fcd7fac2ce Re-add required. 2023-08-26 16:33:22 -07:00
Brian Cao
88d67c7b0b Remove required. 2023-08-26 16:27:29 -07:00
Mike Cao
2a2f239800 Merge branch 'analytics' of https://github.com/umami-software/umami into analytics 2023-08-26 15:54:04 -07:00
Mike Cao
1e36b6abe8 Merge branch 'dev' into analytics 2023-08-26 15:53:45 -07:00
Mike Cao
bb77c2ead6 Updated cities table. 2023-08-26 12:46:27 -07:00
Mike Cao
c22fefaa2d Revert regions rendering due to bad data. 2023-08-25 21:26:11 -07:00
Mike Cao
8e373f7444 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-25 21:22:17 -07:00
Brian Cao
5dd3aa6c67 Merge branch 'dev' into analytics 2023-08-25 18:40:40 -07:00
Brian Cao
bb4ecccbe5 Merge remote-tracking branch 'origin/dev' into dev 2023-08-25 18:40:10 -07:00
Brian Cao
e422fc1ecd Just use subdivision-1. 2023-08-25 18:40:02 -07:00
Mike Cao
aff63ed6e4 Fixed language rendering. 2023-08-25 17:52:44 -07:00
Mike Cao
0fdc8f7922 Fixed region rendering. 2023-08-25 17:44:16 -07:00
Mike Cao
1076b1003c Merge branch 'dev' into analytics 2023-08-25 17:20:56 -07:00
Mike Cao
befafaf1ee Fixed share page issue. 2023-08-25 17:20:28 -07:00
Mike Cao
ac43f55636 Merge branch 'dev' into analytics 2023-08-25 17:07:00 -07:00
Brian Cao
cf1dd422fe Disable filter on custom range. 2023-08-25 16:23:10 -07:00
Mike Cao
080eb34d57 Update date filter buttons. 2023-08-25 16:05:02 -07:00
Mike Cao
4fd3a66f07 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-25 15:08:07 -07:00
Mike Cao
35f80d9b00 Fixed scripts. 2023-08-25 15:06:47 -07:00
Brian Cao
88458e482c Remove tooltip. 2023-08-25 15:04:54 -07:00
Brian Cao
a6c52c210c update tooltip 2023-08-25 15:03:49 -07:00
Mike Cao
aa10956a58 Merge branch 'dev' into analytics 2023-08-25 14:54:11 -07:00
Mike Cao
8aaaa8dfd4 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-25 13:49:36 -07:00
Brian Cao
5f6138f05e Merge remote-tracking branch 'origin/dev' into dev 2023-08-25 13:39:00 -07:00
Brian Cao
236a26136d Add teamId. 2023-08-25 13:38:52 -07:00
Francis Cao
6d0b3934eb Fix LoadingButton isLoading property 2023-08-25 13:32:24 -07:00
Brian Cao
86515d6456 Merge remote-tracking branch 'origin/dev' into dev 2023-08-25 13:01:56 -07:00
Brian Cao
75861bda61 Fix insight. 2023-08-25 13:01:48 -07:00
Mike Cao
5f74818a18 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-25 11:55:41 -07:00
Mike Cao
d6a27b8e99 Initial dev on DataTable component. 2023-08-25 11:54:44 -07:00
Francis Cao
22aa53ac7e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-25 11:35:06 -07:00
Francis Cao
30c32dca7d remove required yup filters on insights report 2023-08-25 11:34:59 -07:00
Brian Cao
c67deb68e6 Remove enddate check. 2023-08-25 11:33:30 -07:00
Brian Cao
fe56ed35d5 Hide filter. 2023-08-25 11:21:16 -07:00
Brian Cao
1a47f594c2 Add dashboard filter. 2023-08-25 11:03:58 -07:00
Brian Cao
fb78202139 Remove mandatory validation. 2023-08-25 10:45:59 -07:00
Mike Cao
7107336b49 Added loading to event data. 2023-08-24 16:17:46 -07:00
Mike Cao
19269dae17 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-24 16:12:58 -07:00
Brian Cao
2683ff278a Fix event-data calls. 2023-08-24 12:55:15 -07:00
Maekawa Minoru
e0c00dece8
Update ja-JP.json 2023-08-24 18:00:00 +09:00
Mike Cao
bf8c891c41 Fixed mobile menu being hidden. 2023-08-23 21:29:16 -07:00
Brian Cao
9180a7008b Fix insights validation. 2023-08-23 16:24:14 -07:00
Brian Cao
d4be41a121 Fixed tsconfig. 2023-08-23 14:39:38 -07:00
Mike Cao
10f92d0178 Fixed tsconfig. 2023-08-23 13:10:12 -07:00
Mike Cao
3e71994767 Merge remote-tracking branch 'origin/dev' into dev 2023-08-23 12:50:30 -07:00
Mike Cao
89db57a380 Updated component library build. 2023-08-23 12:50:18 -07:00
Brian Cao
06de67ec55 Add 1 day cache limit to user/website/session 2023-08-23 12:17:32 -07:00
Brian Cao
d43ab3e559 Roll back session insert. 2023-08-23 11:55:45 -07:00
Brian Cao
f794b5674b Update team/website permission check. 2023-08-23 11:26:41 -07:00
Brian Cao
c5345b01bb Update tsconfig. 2023-08-23 10:25:57 -07:00
Brian Cao
280f6a9113 Add grant to create website/team. 2023-08-22 15:37:22 -07:00
Brian Cao
84236c0cd9 Fix date filter. 2023-08-22 12:32:36 -07:00
Mike Cao
f62d23c9bc Added alias for public folder. 2023-08-22 03:36:49 -07:00
Mike Cao
56ee52e349 Merge remote-tracking branch 'origin/dev' into dev 2023-08-21 19:32:32 -07:00
Mike Cao
51014f6ce6 Fixed path alias. 2023-08-21 19:32:17 -07:00
Brian Cao
af06f7ead5 Add Date filter. 2023-08-21 15:53:19 -07:00
Mike Cao
800731f3aa Fixed import. 2023-08-21 12:53:07 -07:00
Mike Cao
ae03501725 Downgrade rollup-plugin-dts package. 2023-08-21 12:24:41 -07:00
Mike Cao
821d4b36c3 Fixed imports. 2023-08-21 12:12:26 -07:00
Mike Cao
ede658771e Moved code into src folder. Added build for component library. 2023-08-21 02:06:09 -07:00
Brian Cao
7a7233ead4 Add api validations. 2023-08-19 22:23:15 -07:00
Mike Cao
7d5a24044a Code cleanup. 2023-08-18 21:52:59 -07:00
Mike Cao
21cdb06571
Merge pull request #2209 from iamyashkhandelwal/bugfix/user-website-error
Fixed error when opening user websites in the settings.
2023-08-18 13:32:48 -10:00
Mike Cao
907253926e
Merge branch 'dev' into bugfix/user-website-error 2023-08-18 13:32:21 -10:00
Brian Cao
c213b6414f Default list size. 2023-08-18 12:39:31 -07:00
Yash Khandelwal
a296ecb96b Fixed error when opening user websites in the settings. 2023-08-19 00:29:06 +05:30
Brian Cao
1aa407027e Remove password. 2023-08-18 11:16:03 -07:00
Brian Cao
cf14a7a04f Merge remote-tracking branch 'origin/dev' into dev 2023-08-18 11:10:50 -07:00
Brian Cao
87cf5d5298 Fix UserWebsites. 2023-08-18 11:10:44 -07:00
Mike Cao
7be4d56bf7
Merge pull request #2203 from umami-software/dev
v2.5.0
2023-08-17 18:54:26 -10:00
Mike Cao
be998083bc Merge branch 'dev' into analytics 2023-08-17 21:35:20 -07:00
Mike Cao
fefea8898b Update react-basics. 2023-08-17 21:34:52 -07:00
Brian Cao
bc7111a984 Re-add add reports button. 2023-08-17 21:31:51 -07:00
Brian Cao
e518d445fc Merge remote-tracking branch 'origin/dev' into dev 2023-08-17 21:25:23 -07:00
Brian Cao
d3e175a31d Hide edit button cloudMode. 2023-08-17 21:25:12 -07:00
Mike Cao
e4828604fa Updated my-MY lang files. 2023-08-17 18:20:38 -07:00
Mike Cao
2376163588
Merge pull request #2196 from zer0eXploit/master
Add Myanmar Translation
2023-08-17 15:17:58 -10:00
Mike Cao
b603ae294f Merge branch 'dev' into analytics 2023-08-17 17:43:30 -07:00
Mike Cao
1e7681fb15 Bump version v2.5.0. 2023-08-17 17:28:05 -07:00
Mike Cao
478235dde0 Updated messages. 2023-08-17 17:16:13 -07:00
Mike Cao
8bbc332902
Merge pull request #2195 from essesoul/essesoul
Update zh-CN.json
2023-08-17 14:09:49 -10:00
Mike Cao
e49b0c14f9
Merge branch 'dev' into essesoul 2023-08-17 14:09:24 -10:00
Brian Cao
530fc5dcd1 Merge remote-tracking branch 'origin/dev' into dev 2023-08-17 16:40:07 -07:00
Brian Cao
69389ebcd5 Add team reports. 2023-08-17 16:39:59 -07:00
Mike Cao
211ecf7edb Added formatMessage wrapper. Updated messages. 2023-08-17 16:28:26 -07:00
Mike Cao
b157ba540f Merge remote-tracking branch 'origin/dev' into dev 2023-08-17 14:03:56 -07:00
Mike Cao
e48610e83d Fixed filter select for insights. 2023-08-17 14:03:41 -07:00
Francis Cao
6a9f7ba0e5 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-17 13:40:01 -07:00
Francis Cao
e42fe5c996 fix event data stats 2023-08-17 13:39:53 -07:00
Brian Cao
f35a9f0950 Add page of intl. 2023-08-17 12:39:58 -07:00
Brian Cao
9a7fb1f36c Merge remote-tracking branch 'origin/dev' into dev 2023-08-17 11:57:32 -07:00
Brian Cao
58527c3c51 Set onfocus. 2023-08-17 11:57:29 -07:00
Mike Cao
2c8996b68f Retention report UI updates. 2023-08-17 03:21:20 -07:00
Mike Cao
9b8fa08d82 Fixed ugly navbar. 2023-08-17 01:33:10 -07:00
Mike Cao
bd878587e5
Merge pull request #2200 from umami-software/feat/um-311-relational-indexing
Feat/um 311 relational indexing
2023-08-16 19:15:55 -10:00
Francis Cao
6dba68c823 add metric performance indexes 2023-08-16 14:33:55 -07:00
Francis Cao
146650586b add normalize filters to clickhouse 2023-08-16 13:56:41 -07:00
Brian Cao
2e2b1411bf Merge remote-tracking branch 'origin/dev' into dev 2023-08-16 13:56:19 -07:00
Brian Cao
0dfa6c120c Remove add buttons for cloud mode. 2023-08-16 13:56:12 -07:00
Francis Cao
d6c8f3aa18 fix mapfilter / rawquery for relational 2023-08-16 13:47:43 -07:00
Francis Cao
7df142b02b reorder getfunnel where to match index 2023-08-16 12:12:45 -07:00
Mike Cao
927ebd7c39 Merge remote-tracking branch 'origin/dev' into dev 2023-08-16 10:58:16 -07:00
Mike Cao
3601cb63a5 Change day range for retention. 2023-08-16 10:58:07 -07:00
Mike Cao
d7bf793050 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	queries/analytics/reports/getRetention.ts
2023-08-16 10:52:20 -07:00
Francis Cao
b69a6bb613 stale-issues add ordering to look at old issues first 2023-08-16 10:52:01 -07:00
Mike Cao
c548267d91 Added month select component. 2023-08-16 10:50:28 -07:00
Francis Cao
c3e261fc50 Resolve issues in event data 2023-08-16 08:49:22 -07:00
Brian Cao
38445fce7a Fix test console. 2023-08-15 13:08:18 -07:00
Brian Cao
0b9987d9e9 Merge remote-tracking branch 'origin/dev' into dev 2023-08-15 13:01:59 -07:00
Brian Cao
c3d0a1a628 Fix noResultsFound. 2023-08-15 13:01:50 -07:00
Francis Cao
495b7f1f20 fix mysql retention query 2023-08-15 12:15:27 -07:00
Francis Cao
a16b0cef3a Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-15 10:59:02 -07:00
Francis Cao
979ea33d74 add daydiff function query 2023-08-15 10:58:55 -07:00
Brian Cao
14df1e5a29 Merge remote-tracking branch 'origin/dev' into dev 2023-08-15 10:57:34 -07:00
Brian Cao
203f4e8e03 Add search Mode for mysql. 2023-08-15 10:57:25 -07:00
Francis Cao
27226d1b0e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-08-14 23:07:45 -07:00
Francis Cao
1d78cc4950 fix UTC timezone for CH query 2023-08-14 23:07:39 -07:00
Mike Cao
6ef1f2e9f9 Merge remote-tracking branch 'origin/dev' into dev 2023-08-14 22:36:39 -07:00
Mike Cao
29a943df9c Add timezone to report queries. 2023-08-14 22:36:18 -07:00
Francis Cao
e45d014042 use functions to convert dates to string 2023-08-14 22:18:21 -07:00
Brian Cao
8f542ed998 Re-add message. 2023-08-14 15:47:37 -07:00
Brian Cao
5168cf2a1b Update language. Resolve loading reports error. 2023-08-14 10:39:24 -07:00
Brian Cao
743e7c0477 Update show website state. 2023-08-13 22:37:04 -07:00
Brian Cao
96d74783e0 Edit button states. 2023-08-13 22:32:25 -07:00
Brian Cao
f7eeaa622b Add website/reports to top nav. 2023-08-13 22:21:49 -07:00
Brian Cao
c2de8e4c0a Merge remote-tracking branch 'origin/dev' into dev 2023-08-13 16:42:14 -07:00
Brian Cao
6d43cb23dd Remove case sensitivity on search. 2023-08-13 16:42:11 -07:00
Mike Cao
820ad69d60 Retention report updates. 2023-08-12 20:13:11 -07:00
Francis Cao
b37a1fce63 fix day filter 2023-08-11 16:15:11 -07:00
Brian Cao
5e64eac396 Add no reports message. 2023-08-11 13:52:10 -07:00
Brian Cao
0a81a4a728 Merge remote-tracking branch 'origin/dev' into dev 2023-08-11 11:37:03 -07:00
Brian Cao
cbed961d01 Fix search results. 2023-08-11 11:37:01 -07:00
Mike Cao
1b4c5c80d3 Merge remote-tracking branch 'origin/dev' into dev 2023-08-11 09:06:06 -07:00
Mike Cao
9436efabc0 Insights report filtering. 2023-08-11 09:05:56 -07:00
Htet Oo Wai Yan
e6ab1e8b89 feat: add the rest of Myanmar translations 2023-08-11 21:39:43 +06:30
Yan Waipann
37f0e37417 feat: add some Myanmar translation 2023-08-11 21:00:59 +06:30
Brian Cao
937ff82d9f Merge remote-tracking branch 'origin/dev' into dev 2023-08-10 22:50:44 -07:00
Brian Cao
cbe1a21e67 Add query types. 2023-08-10 22:50:41 -07:00
Mike Cao
24669a3f70
Merge pull request #2192 from umami-software/feat/um-376-retention-report
Feat/um 376 retention report
2023-08-10 19:43:06 -10:00
Mike Cao
c87c59cdef
Merge pull request #2187 from Lonor/imgbot
Optimize images
2023-08-10 19:40:02 -10:00
Brian Cao
dcf8b2edaa Add Search Api/Components. 2023-08-10 13:26:33 -07:00
Mike Cao
45888fabe6 Merge remote-tracking branch 'origin/dev' into dev 2023-08-10 09:33:56 -07:00
Mike Cao
39fb4fdaf8 Added field types. 2023-08-10 09:31:25 -07:00
Francis Cao
50b3ad81e2 increase operation-per-run for stale issues 2023-08-09 15:33:06 -07:00
Mike Cao
5039349d57 Insights report filters. 2023-08-09 15:06:19 -07:00
Mike Cao
acbffed2ce Fixed incorrect labels. 2023-08-09 11:05:45 -07:00
Mike Cao
bbc19c67ad Replaced labels. 2023-08-09 11:01:16 -07:00
essesoul
c9e4c69ef1
Update zh-CN.json
Update Chinese translation✍️
2023-08-09 22:24:03 +08:00
Mike Cao
618c643a0a Insights report filtering. 2023-08-08 15:29:59 -07:00
Francis Cao
72248ff04f Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-08 12:04:00 -07:00
Francis Cao
577294191d remove retention chart 2023-08-08 12:03:03 -07:00
Francis Cao
bf507037c7 finish CH query and clean up objects 2023-08-08 11:57:58 -07:00
Mike Cao
77d170ea51 Fixed event data display. 2023-08-08 10:06:41 -07:00
Mike Cao
85c593416a Updated insights report rendering. 2023-08-07 23:02:38 -07:00
Mike Cao
c4bbcf37b7 Wrong column. 2023-08-07 15:05:53 -07:00
Mike Cao
2eee9c23c3 Added useFormat hook to format special values. 2023-08-07 15:02:50 -07:00
Francis Cao
15575d7783 fix column data in relational event data query 2023-08-07 14:41:41 -07:00
Francis Cao
fc5a1f458b Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-07 14:04:05 -07:00
Francis Cao
13530c9cdc add psql query for retention 2023-08-07 14:01:53 -07:00
Mike Cao
a71cf675ae Fixed event data query. 2023-08-07 13:43:44 -07:00
Mike Cao
7da7f58cbe Added "columns" to query options. Added events count to event data metrics. 2023-08-07 13:28:32 -07:00
Mike Cao
9d86385f5c Updated filtering logic. 2023-08-07 12:43:43 -07:00
Mike Cao
112005212e Fixed events query. 2023-08-06 23:04:19 -07:00
Mike Cao
f57fbe6ba1 Support Cloudflare headers for city and region. 2023-08-06 22:52:58 -07:00
Mike Cao
f48720c915 Breakdown feature for insights report. 2023-08-06 22:52:17 -07:00
Mike Cao
5e1111db5d Update to insights query. 2023-08-06 09:10:24 -07:00
Francis Cao
ff5884237c Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 15:32:09 -07:00
Mike Cao
91d2b596d6 Fixed event data display. 2023-08-04 15:31:46 -07:00
Francis Cao
1d1b9cf51c Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 15:27:54 -07:00
Mike Cao
89f7b39bfe Merge remote-tracking branch 'origin/dev' into dev 2023-08-04 15:21:21 -07:00
Mike Cao
e11766ca1c Fixed event data queries. 2023-08-04 15:21:14 -07:00
Francis Cao
cad3dd8847 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 14:38:44 -07:00
Francis Cao
dbdbc90ee7 fix if else in referrer filter 2023-08-04 14:30:10 -07:00
Mike Cao
0fd57aa7cf Merge remote-tracking branch 'origin/dev' into dev 2023-08-04 14:23:13 -07:00
Mike Cao
688705dbb3 Added query options. 2023-08-04 14:23:03 -07:00
Francis Cao
fab818e7c2 add referrer query inside undefine / ignore check 2023-08-04 14:09:45 -07:00
Mike Cao
2559263e91 Fixed session queries. 2023-08-04 14:00:37 -07:00
Francis Cao
9deda2b4f2 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 13:34:10 -07:00
Mike Cao
c0ef8dace4 Fixed session queries. 2023-08-04 13:33:41 -07:00
Francis Cao
74b5b140ae Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 13:18:58 -07:00
Mike Cao
7148f66d1a Refactored query parameter handling. 2023-08-04 13:18:30 -07:00
Francis Cao
8fff65728c Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report 2023-08-04 13:10:33 -07:00
Francis Cao
9cde107ddf build out retention reports 2023-08-04 13:10:03 -07:00
Mike Cao
157862834d Refactored query filters. 2023-08-04 00:51:52 -07:00
Mike Cao
dc834e4ff4 Merge branch 'master' into analytics 2023-08-03 20:24:09 -07:00
Mike Cao
b65c478689 Merge branch 'master' into dev 2023-08-03 11:35:13 -07:00
Mike Cao
3572df0a09 Restore github push. 2023-08-03 11:22:58 -07:00
Mike Cao
eb7e9023a9 Test docker hub push. 2023-08-03 11:13:15 -07:00
Mike Cao
146bc30a64 Push images to docker hub. 2023-08-03 10:55:30 -07:00
Mike Cao
2d04e46ded Insights progress update. 2023-08-03 10:44:35 -07:00
Mike Cao
4497951000 Split out session query. 2023-08-02 14:21:13 -07:00
Mike Cao
7b9c29e039 Check for DISABLE_LOGIN on api route. 2023-08-02 11:56:42 -07:00
Mike Cao
858d963c4b
Merge pull request #2176 from umami-software/dev
v2.4.1
2023-08-02 02:44:53 -07:00
Mike Cao
253a46460b Cleaned up language bundles. 2023-08-02 02:33:43 -07:00
Mike Cao
58904d160b Merge remote-tracking branch 'origin/dev' into dev 2023-08-02 00:57:00 -07:00
Mike Cao
d573def802 Layout updates. 2023-08-02 00:56:52 -07:00
Mike Cao
b192965756
Merge pull request #2171 from lucassdr/refactor/translate-to-pt-br
refactor: ♻️ More translations for Brazilian Portuguese.
2023-08-01 20:20:47 -07:00
ImgBotApp
d9f1cbfc23
[ImgBot] Optimize images
*Total -- 137.06kb -> 101.09kb (26.24%)

/public/images/browsers/aol.png -- 3.08kb -> 0.41kb (86.68%)
/public/images/os/ios.png -- 3.37kb -> 0.64kb (80.96%)
/public/images/browsers/curl.png -- 4.11kb -> 1.17kb (71.6%)
/public/images/os/os-2.png -- 4.15kb -> 1.20kb (71.23%)
/public/images/browsers/ios.png -- 4.30kb -> 1.25kb (71.03%)
/public/images/browsers/ios-webview.png -- 4.30kb -> 1.25kb (71.03%)
/public/images/browsers/beaker.png -- 3.41kb -> 1.03kb (69.74%)
/public/images/os/mac-os.png -- 4.62kb -> 1.43kb (69.07%)
/public/images/os/windows-8-1.png -- 3.36kb -> 1.38kb (58.92%)
/public/images/os/windows-8.png -- 3.36kb -> 1.38kb (58.92%)
/public/images/os/blackberry-os.png -- 3.07kb -> 1.89kb (38.37%)
/public/images/browsers/blackberry.png -- 2.06kb -> 1.40kb (31.85%)
/public/images/browsers/searchbot.png -- 1.56kb -> 1.23kb (21.37%)
/public/images/os/sun-os.png -- 2.66kb -> 2.24kb (15.79%)
/public/images/os/amazon-os.png -- 2.33kb -> 1.98kb (15%)
/public/images/os/windows-3-11.png -- 3.18kb -> 2.75kb (13.49%)
/public/images/os/windows-98.png -- 3.18kb -> 2.75kb (13.49%)
/public/images/os/windows-2000.png -- 3.18kb -> 2.75kb (13.49%)
/public/images/os/windows-95.png -- 3.18kb -> 2.75kb (13.49%)
/public/mstile-150x150.png -- 2.93kb -> 2.54kb (13.35%)
/public/images/os/windows-server-2003.png -- 2.66kb -> 2.37kb (10.87%)
/public/images/os/windows-me.png -- 2.66kb -> 2.37kb (10.87%)
/public/images/os/windows-7.png -- 2.66kb -> 2.37kb (10.87%)
/public/images/os/windows-vista.png -- 2.66kb -> 2.37kb (10.87%)
/public/images/os/windows-xp.png -- 2.66kb -> 2.37kb (10.87%)
/public/images/os/beos.png -- 2.86kb -> 2.57kb (10.24%)
/public/images/os/open-bsd.png -- 3.33kb -> 3.03kb (8.99%)
/public/images/browsers/android.png -- 1.61kb -> 1.47kb (8.26%)
/public/images/os/linux.png -- 1.90kb -> 1.74kb (8.18%)
/public/images/browsers/miui.png -- 1.77kb -> 1.65kb (6.89%)
/public/images/os/android-os.png -- 1.86kb -> 1.76kb (5.67%)
/public/images/browsers/edge.png -- 2.10kb -> 2.00kb (4.92%)
/public/images/os/qnx.png -- 2.39kb -> 2.28kb (4.81%)
/public/favicon-32x32.png -- 0.87kb -> 0.83kb (4.17%)
/public/apple-touch-icon.png -- 2.03kb -> 1.95kb (4%)
/public/safari-pinned-tab.svg -- 5.02kb -> 4.84kb (3.62%)
/public/android-chrome-512x512.png -- 22.16kb -> 21.47kb (3.09%)
/public/favicon-16x16.png -- 0.58kb -> 0.57kb (2.85%)
/public/android-chrome-192x192.png -- 7.71kb -> 7.53kb (2.38%)
/public/images/browsers/instagram.png -- 2.15kb -> 2.13kb (1.14%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2023-08-02 00:00:06 +00:00
Lucas
5ad2442033 refactor: ♻️ More translations for Brazilian Portuguese. 2023-08-01 18:26:06 -03:00
Mike Cao
64ebe8b307 Correct HTTP response. Fixes #2134 2023-07-31 23:08:28 -07:00
Francis Cao
2b06c4b4d1 remove console.log from reports 2023-07-31 12:59:56 -07:00
Francis Cao
75290c0186 remove console.log error 2023-07-31 12:56:43 -07:00
Francis Cao
ce95ae3bb3 fix mysql event data query 2023-07-31 12:23:01 -07:00
Francis Cao
82f9a42313 fix event data, remove field implementation for now 2023-07-31 12:13:10 -07:00
Francis Cao
7e112b8469 fix filter params 2023-07-31 11:42:47 -07:00
Mike Cao
2d3560f516
Merge pull request #2157 from umami-software/dev
v2.4.0
2023-07-30 23:27:37 -07:00
Mike Cao
5452ad437f Merge branch 'dev' into analytics 2023-07-30 00:12:49 -07:00
Mike Cao
95d824542f Added ability to delete reports. 2023-07-30 00:11:26 -07:00
Mike Cao
ad710cc86a Cleaned up auth. 2023-07-29 22:54:46 -07:00
Mike Cao
b8cb47a476 Fixed auth check. 2023-07-29 22:37:28 -07:00
Mike Cao
8904b7b4ed Refactored queries. 2023-07-29 22:03:34 -07:00
Mike Cao
f68cd970f6 Merge branch 'dev' into analytics 2023-07-29 00:00:42 -07:00
Mike Cao
f36a689817 Refactored payload validation. 2023-07-28 23:59:32 -07:00
Mike Cao
9d55d3ee28 Merge branch 'dev' into analytics 2023-07-28 23:25:00 -07:00
Mike Cao
f52df74faa Bump version v2.4.0. 2023-07-28 23:16:36 -07:00
Mike Cao
8584093bb4 Updated language files. 2023-07-28 23:11:40 -07:00
Mike Cao
b0ba08f16b Merge branch 'dev' into analytics 2023-07-28 22:52:45 -07:00
Mike Cao
3afafd50f3 Fixed realtime log issues. 2023-07-28 22:40:57 -07:00
Mike Cao
56ab099499 Should not check updates in cloud mode. Minor updates. 2023-07-28 22:28:06 -07:00
Mike Cao
8062d7f698 Update node versions in CI. 2023-07-28 20:04:30 -07:00
Mike Cao
0cc289b3cd Formatting. 2023-07-28 18:30:02 -07:00
Mike Cao
200e9b8bfa
Merge pull request #2149 from umami-software/bug/um-362-relational-funnels-query
Bug/um 362 relational funnels query
2023-07-28 18:20:26 -07:00
Mike Cao
ed86553ce2 Updated prisma to v5.0.0. 2023-07-28 17:56:02 -07:00
Mike Cao
21849ed0d1 Fixed uuid reference. 2023-07-28 17:52:57 -07:00
Mike Cao
001f80427c Updated next-basics package. 2023-07-28 17:49:49 -07:00
Mike Cao
bd9ff9a0df Revert uuid. 2023-07-28 17:21:34 -07:00
Mike Cao
1f2da530c9 Update uuid usage. 2023-07-28 15:52:21 -07:00
Mike Cao
22d6343b9c Updated packages. 2023-07-28 15:01:43 -07:00
Mike Cao
3e507421a1
Merge pull request #2151 from humbertleonardo/master
Feat: Add default_lang enviroment variable
2023-07-28 11:30:46 -07:00
Francis Cao
aae840ae33 resolving pr comments 2023-07-28 10:47:14 -07:00
Leonardo Humbert
a9413c586a refactor: Change the name of the environment variable 2023-07-28 10:18:48 -03:00
Leonardo Humbert
eeae168df1 Feat: Add default_lang enviroment variable 2023-07-27 20:03:58 -03:00
Francis Cao
cdf745b6b4 update funnel dynamic built query 2023-07-27 15:23:20 -07:00
Mike Cao
69c0fa0db9 Fix website nav menu for mobile. Fixes #2141. 2023-07-27 15:08:33 -07:00
Mike Cao
f35d0f65dc Refactored update notice. Fixes #2124. 2023-07-27 14:47:41 -07:00
Mike Cao
ba9ddcac38 Get basePath from router. 2023-07-27 14:14:55 -07:00
Mike Cao
c9e4003493
Merge pull request #2140 from nailuoGG/master
Include BASE_PATH in URL for Umami hosted under subdirectory
2023-07-27 14:13:13 -07:00
Mike Cao
362a469a11
Merge pull request #2138 from h0ek/patch-1
Update pl-PL.json
2023-07-27 14:09:47 -07:00
Mike Cao
6a526d8e1c
Merge branch 'dev' into patch-1 2023-07-27 14:09:40 -07:00
Mike Cao
9084c5dd5d
Merge pull request #2148 from 0xflotus/patch-2
chore: adjusted some german translations
2023-07-27 14:06:29 -07:00
Mike Cao
dbf3b83598
Merge branch 'dev' into patch-2 2023-07-27 14:06:21 -07:00
Francis Cao
a03574e8d4 Merge branch 'dev' into bug/um-362-relational-funnels-query 2023-07-27 13:53:49 -07:00
Mike Cao
a84d9a4c7c Return team websites under dashboard. 2023-07-27 13:20:22 -07:00
Mike Cao
f4aa8f9661 Added different methods to get user websites and teams. 2023-07-27 11:43:45 -07:00
Mike Cao
bc0beb0f49
Merge pull request from GHSA-8www-cffh-4q98
Change verification call to `canUpdateWebsite`
2023-07-27 09:45:34 -07:00
0xflotus
c79154b90b
chore: adjusted some german translations 2023-07-27 11:50:49 +02:00
Mike Cao
5189486d6f Merge remote-tracking branch 'origin/dev' into dev 2023-07-26 13:43:07 -07:00
Mike Cao
d06808985b Refactored functionality for all time date range. 2023-07-26 13:42:55 -07:00
Mike Cao
c3973f5fb5 Move active users status. 2023-07-26 13:27:18 -07:00
Mike Cao
cb86c0a4a9
Bump version v2.3.1 2023-07-26 11:23:08 -07:00
Brian Cao
e197e15ef0 Update reset website logic. 2023-07-26 10:51:57 -07:00
Brian Cao
499ba96348 Update reset website logic. 2023-07-26 10:50:23 -07:00
Brian Cao
81813d1d11 Merge remote-tracking branch 'origin/dev' into dev 2023-07-26 10:49:21 -07:00
Brian Cao
52fd652bba Update reset website logic. 2023-07-26 10:49:19 -07:00
Francis Cao
f8c767e4a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-07-26 10:24:22 -07:00
Francis Cao
0fe02894ab create stale issues workflow 2023-07-26 10:24:18 -07:00
Mike Cao
1648707fc7 Added parseDateRangeQuery function. 2023-07-26 09:55:54 -07:00
Guy Goldenberg
ec48a4e325
Change verification call to canUpdateWebsite 2023-07-26 14:36:58 +03:00
Mike Cao
09af33c77e Added parseDateRangeQuery function. 2023-07-25 23:59:08 -07:00
Mike Cao
a0aaeeeb57 Refactored startDate usage. 2023-07-25 22:50:55 -07:00
Mike Cao
0f98fb5959 Use dataStartDate for resetDate. 2023-07-25 15:17:50 -07:00
Francis Cao
70367ffcc4 build mysql funnel params 2023-07-25 14:54:56 -07:00
Francis Cao
5a0908964c align CH / postgres funnel queries 2023-07-25 13:23:44 -07:00
Mike Cao
ee8de858d1 Fixed export. 2023-07-25 09:55:38 -07:00
Mike Cao
7ec84ae7ea Fixed query. 2023-07-25 09:43:51 -07:00
Mike Cao
7764f0ee26 Updated query parameters. 2023-07-25 00:30:18 -07:00
Mike Cao
4bd3ef8e12 Refactored queries. 2023-07-24 23:06:16 -07:00
nailuoGG
7fa0d2b4ac
fix: basePath display in Website shareUrl 2023-07-25 14:00:25 +08:00
nailuoGG
e7336601a6
fix: shareUrl missing basePath 2023-07-25 13:50:51 +08:00
Francis Cao
711ad2bbcf remove dropoff calc from db query 2023-07-24 11:57:46 -07:00
hoek
0669f25cf7
Update pl-PL.json
Polish translation update.
2023-07-24 20:01:32 +02:00
Mike Cao
e4bd314bd6 Updates to insights, event data, telemetry. 2023-07-23 13:18:01 -07:00
Francis Cao
858f465566 add dropoff percentages to funnel report 2023-07-21 00:14:37 -07:00
Mike Cao
39562d4a64 Fixed destructure error. 2023-07-20 23:12:15 -07:00
Francis Cao
94967d45e1 update funnels relational query 2023-07-20 21:13:29 -07:00
Mike Cao
25feee662b Updated telemetry endpoint. 2023-07-19 04:06:49 -07:00
Mike Cao
a10d421e77 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-07-19 00:31:17 -07:00
Mike Cao
2e1e5e2616 Insights report updates. 2023-07-19 00:31:02 -07:00
Mike Cao
ccafb03c47 Check Cloudflare headers for country info. Closes #2129 2023-07-19 00:28:58 -07:00
Francis Cao
dc3f7d343f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-07-18 10:42:22 -07:00
Francis Cao
cc188ec759 CH set string_value to string 2023-07-18 10:42:15 -07:00
Mike Cao
1b5a714a5e
Merge pull request #2127 from tairosonloa/feat/better-event-data-dashboard
Feat: better event data dashboard
2023-07-14 22:42:43 -07:00
Mike Cao
d9dae74e02
Merge pull request #2126 from wangel13/fix-new-version-message
Fix: Bring back new release message
2023-07-14 22:32:53 -07:00
Mike Cao
c0d18192a8
Merge pull request #2120 from Maxime-J/none-referrers
Bring back none referrers in self hosted
2023-07-14 22:31:18 -07:00
Mike Cao
1b46888d6a
Merge pull request #2119 from AkashRajpurohit/feat/country-flag-on-realtime-page
feat:  Country flag added on real time page
2023-07-14 22:27:11 -07:00
Aitor Alonso
5b3996dc19
Merge branch 'dev' into feat/better-event-data-dashboard 2023-07-14 17:39:32 +02:00
Aitor Alonso
118e1a5b70
fix: query when seeing detail of field 2023-07-14 17:37:14 +02:00
Taras Protchenko
cf8735f6e2 Fix: Bring back new release message
- app crash, it says [@formatjs/intl] An id must be provided to format a message.
- issue reference - https://github.com/umami-software/umami/issues/2113
2023-07-14 18:22:45 +03:00
Aitor Alonso
8e5da12653
chore: adds es-Es language and updates existing ones 2023-07-14 17:13:20 +02:00
Aitor Alonso
145a490c5d
feat: event data dashboard now shows associated event 2023-07-14 16:58:15 +02:00
Aitor Alonso
92fc4e87c7
feat: API for event data now can return associated event name 2023-07-14 16:57:38 +02:00
Francis Cao
356a2fe747 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-07-13 16:30:14 -07:00
Francis Cao
74bd4d5366 add missing semi-colons 2023-07-13 16:30:10 -07:00
Mike Cao
b0b96b34a7
Merge pull request #2122 from Maxime-J/fr
Update fr-FR
2023-07-13 13:21:27 -07:00
Mike Cao
9fae1a9ba7
Merge pull request #2121 from Maxime-J/toggleCharts
Fix toggle charts in dashboard
2023-07-13 13:20:30 -07:00
Maxime-J
198c555d1e Update fr-FR 2023-07-13 19:41:35 +00:00
Francis Cao
31a11be1ac fix event data column order to match psql 2023-07-13 10:11:08 -07:00
AkashRajpurohit
d04d4ccf77 feat: added country flag on realtime page 2023-07-13 21:07:51 +05:30
Maxime-J
bdd941fd6b Fix toggle charts in dashboard 2023-07-13 10:02:35 +00:00
Maxime-J
8fbf9e33f4 Bring back none referrers in self hosted 2023-07-13 09:55:43 +00:00
Mike Cao
1f44351070
Merge pull request #2115 from RikoDEV/i18n-pl-update
i18n: update pl-PL translations
2023-07-12 21:58:36 -07:00
Mike Cao
682111aa88
Merge pull request #2114 from mikusaa/patch-1
Update zh-CN.json
2023-07-12 21:55:40 -07:00
Mike Cao
7fe1236a5f
Merge pull request #2117 from yumusb/patch-3
Check the hostname value for legality to eliminate dirty data
2023-07-12 21:54:40 -07:00
榆木
35cf149876
Check the hostname value for legality to eliminate dirty data
Check the hostname value for legality to eliminate dirty data
2023-07-13 12:27:38 +08:00
Jacek Maciejak
fe46671756
i18n: update pl-PL translations 2023-07-12 21:07:03 +02:00
Akash Rajpurohit
801218acb7
Merge branch 'umami-software:master' into master 2023-07-12 21:56:33 +05:30
mikusa
1bcee0a35e
Update zh-CN.json 2023-07-12 21:54:54 +08:00
Mike Cao
7bfbe26485
Merge pull request #2109 from umami-software/dev
v2.3.0
2023-07-11 19:57:30 -07:00
Mike Cao
7148ab6374 Merge branch 'dev' into analytics 2023-07-11 19:40:19 -07:00
Mike Cao
5eea66aa53 Hide links on share page. 2023-07-11 19:33:34 -07:00
Mike Cao
80d3bf6ab3 Fixed method. 2023-07-11 19:28:01 -07:00
Brian Cao
90e6f98d0d Merge branch 'dev' into analytics 2023-07-11 19:19:02 -07:00
Mike Cao
fc943b729c Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 19:06:03 -07:00
Mike Cao
e5f8b57d65 Bump version v2.3.0. 2023-07-11 19:05:46 -07:00
Mike Cao
7ac367f971 Updated lang files. 2023-07-11 19:02:46 -07:00
Brian Cao
a9617cb704 Remove bigint. 2023-07-11 18:52:52 -07:00
Brian Cao
4d41527f94 Use bigint. 2023-07-11 18:47:52 -07:00
Brian Cao
5390370b3d Add image?. 2023-07-11 18:35:01 -07:00
Mike Cao
f90631b3fb Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 18:23:41 -07:00
Mike Cao
7a5b5cc678 Fixed date filter. 2023-07-11 18:23:16 -07:00
Francis Cao
1b0cef08cf
Merge pull request #2108 from umami-software/feat/um-366-event-data-migration
Feat/um 366 event data migration
2023-07-11 17:37:20 -07:00
Brian Cao
00a2137d0d strict_increase 2023-07-11 12:43:43 -07:00
Francis Cao
3aa7565bf4 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-366-event-data-migration 2023-07-11 12:05:05 -07:00
Brian Cao
2baf952ab8 re-add strict-order. 2023-07-11 12:00:01 -07:00
Francis Cao
9726d02dcd remove ms from string date value, add mysql migration 2023-07-11 08:55:58 -07:00
Mike Cao
e7ff083a87 Fixed label. 2023-07-11 01:19:47 -07:00
Mike Cao
11009175f2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 01:16:38 -07:00
Mike Cao
55701c9e8c Event data updates. 2023-07-11 01:16:17 -07:00
Francis Cao
8abeba4c0d squash psql migration. add event_data migration 2023-07-10 23:08:57 -07:00
Brian Cao
1a793572e8 update backfill script. 2023-07-10 22:29:38 -07:00
Brian Cao
3749e2a70d update to isoutc string value. 2023-07-10 16:54:42 -07:00
Brian Cao
c7e79a0563 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 15:30:37 -07:00
Brian Cao
1bdaf4aca2 Always record string. 2023-07-10 15:30:34 -07:00
Mike Cao
d1e93b8e62
Merge pull request #2099 from orangecoloured/fix/grid-borders
Fix grid borders for narrow view
2023-07-10 11:08:12 -07:00
Mike Cao
bd1195ed1d Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 09:55:09 -07:00
Mike Cao
97c57696ff Hide other reports. 2023-07-10 09:54:51 -07:00
Mike Cao
29a2ca0c26
Merge pull request #2096 from IMS-Network/fix-1966-issue-IDN
fix DOMAIN_REGEX for .ישראל IDN's to work :)
2023-07-10 08:50:23 -07:00
Mike Cao
cabff7924e Show event data values. 2023-07-10 05:46:45 -07:00
Mike Cao
c865f43b11 Metrics components refactoring. New event data page. 2023-07-10 04:35:19 -07:00
Mike Cao
4e6d24e932 Removed naming from index pages. 2023-07-10 00:33:30 -07:00
Mike Cao
6b69f69c08 Added icons for browsers, OS and devices. 2023-07-09 21:30:37 -07:00
Mike Cao
f834ff3db4 New website nav menu. 2023-07-09 12:08:12 -07:00
Mike Cao
f9d09c8b54 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 20:39:56 -07:00
Mike Cao
827102d907 Scaffolding for insights report. 2023-07-07 20:38:43 -07:00
Brian Cao
9ec2701228 Add view-only user. 2023-07-06 23:02:16 -07:00
Brian Cao
0a3ee2277a Fix numeric to number. 2023-07-06 21:02:56 -07:00
Brian Cao
8e6620db53 Merge remote-tracking branch 'origin/dev' into dev 2023-07-05 21:09:19 -07:00
Brian Cao
be433cd0fd update CH migration. 2023-07-05 21:09:16 -07:00
Mike Cao
2f4d669836 More updates to event data report. 2023-07-04 22:51:23 -07:00
Alexander Petcoglo
0a3e6bf530 fix grid borders for narrow view 2023-07-04 12:41:09 +03:00
thefourCraft
ebe1fe169f
Merge branch 'dev' into fix-1966-issue-IDN 2023-07-02 21:28:53 +03:00
thefourCraft
7aee9aace8
fix git conflic with dev branch 2023-07-02 21:27:44 +03:00
thefourCraft
d472af277f
fix DOMAIN_REGEX for .ישראל IDN's to work :) 2023-07-02 21:14:24 +03:00
Mike Cao
7c467db27e Merge remote-tracking branch 'origin/dev' into dev 2023-07-01 22:03:01 -07:00
Mike Cao
9d7862cbd6 Event data report UI. 2023-07-01 22:02:49 -07:00
Mike Cao
f8ededb31e
Merge pull request #2044 from abhilakshbansal2001/abhilaksh
Fixed user delete error 500
2023-06-30 05:45:33 -07:00
Mike Cao
6316a0b917 Fixed CSP issue, renamed var to ALLOWED_FRAME_URLS. 2023-06-29 19:38:35 -07:00
Mike Cao
040420c5ec
Merge pull request #2080 from gander/master
Update PL and GB message.reset-website key translation
2023-06-29 17:10:17 -07:00
Mike Cao
500606159e
Merge branch 'dev' into master 2023-06-29 17:10:06 -07:00
Mike Cao
68caf59f80
Merge pull request #2089 from blyamur/master
Fixed translation in message lines for deleting a site and resetting statistics
2023-06-29 17:07:38 -07:00
Mike Cao
3d466bc54c
Merge branch 'dev' into master 2023-06-29 17:07:29 -07:00
Mike Cao
b8ef385dc6
Merge pull request #2090 from bdcorps/master
Allow embedding of "Share" dashboard as iframe
2023-06-29 17:06:46 -07:00
Mike Cao
7c392de8b1
Merge branch 'dev' into master 2023-06-29 17:05:57 -07:00
Mike Cao
67759cf743
Merge pull request #2083 from andlil/patch-1
Update sv-SE.json
2023-06-29 17:02:44 -07:00
Mike Cao
6125b05055
Merge branch 'dev' into patch-1 2023-06-29 17:02:36 -07:00
Mike Cao
71bb012cab
Merge pull request #2091 from umami-software/dependabot/npm_and_yarn/semver-7.5.2
Bump semver from 7.5.0 to 7.5.2
2023-06-29 16:54:02 -07:00
Francis Cao
ac42515e31 remove enhancement label from github issues 2023-06-28 18:50:47 -07:00
Francis Cao
c901358222 rename to job_id 2023-06-26 10:32:23 -07:00
Francis Cao
a5582416b3 update CH schema with upload_id 2023-06-26 08:19:52 -07:00
dependabot[bot]
217c64e9c4
Bump semver from 7.5.0 to 7.5.2
Bumps [semver](https://github.com/npm/node-semver) from 7.5.0 to 7.5.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.5.0...v7.5.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-24 06:12:19 +00:00
Sukhpal Saini
b4a26314ef
Add a comment for EMBED_HOSTED_URL 2023-06-23 09:57:07 -04:00
Sukhpal Saini
87a62fb614
Add EMBED_HOSTED_URL 2023-06-23 09:54:41 -04:00
Mike Cao
79856867fb Fixed report issues. 2023-06-23 01:19:08 -07:00
Blyamur
de9e5db0d6
Update ru-RU.json 2023-06-22 08:55:00 +03:00
Blyamur
3d0d29ec10
Update ru-RU.json 2023-06-22 08:54:17 +03:00
Brian Cao
414854b064 Fix funnel report. 2023-06-20 10:22:12 -07:00
Francis Cao
56f3134936 fix reset/delete website to english until proper translations. build language. 2023-06-19 08:59:17 -07:00
Anders
689c40a670
Update sv-SE.json 2023-06-18 18:25:21 +02:00
Anders
292fa8c7dd
Update sv-SE.json
Long overdue update of Swedish
2023-06-18 18:20:19 +02:00
Mike Cao
d950b2190f Upgrade prisma and next. 2023-06-15 20:46:51 -07:00
Mike Cao
bb2622b0cc Updated packages. 2023-06-15 20:23:11 -07:00
Mike Cao
ab0838e272 Fixed issue with hover tooltips. 2023-06-15 20:15:31 -07:00
Adam Gąsowski
d10dd9ed95
Update en-GB.json 2023-06-15 18:32:01 +02:00
Adam Gąsowski
8cf3a8ad42
Update pl-PL.json 2023-06-15 18:31:46 +02:00
Mike Cao
2b13002f1b New reports screens. 2023-06-15 03:27:41 -07:00
Mike Cao
293e84acab Merge remote-tracking branch 'origin/dev' into dev 2023-06-14 23:48:19 -07:00
Mike Cao
e7fef80d79 Report parameters. 2023-06-14 23:48:11 -07:00
Francis Cao
a00972748f remove >= website created at logic 2023-06-14 22:32:06 -07:00
Mike Cao
b10b490088 Merge remote-tracking branch 'origin/dev' into dev 2023-06-13 11:59:37 -07:00
Mike Cao
6ee27affc4 Added new react basics provider. 2023-06-13 11:59:12 -07:00
Akash Rajpurohit
1537ed7db7
fix: 🐛 tracker event data fixed 2023-06-12 22:08:09 +05:30
Mike Cao
79b728cc23
Merge pull request #2068 from cadesalaberry/chore/update-tracker-typing
chore(tracker): 🏷️ could not use `string` in `EventData`
2023-06-09 08:48:02 -07:00
Mike Cao
64c6d73b77 Update report parameters. 2023-06-05 03:08:43 -07:00
Mike Cao
22d477b98b Updates to reports. 2023-06-02 23:10:59 -07:00
C-A de Salaberry
d575b9c377 chore(tracker): 🏷️ could not use string in EventData
- EventData was incorrectly typed `Record<string, object>` which did not allow for the most common `string` attribute
- UmamiTracker is now exported to be used elsewhere if needed
- A note has been added on event names being truncated to 50 characters
2023-06-03 00:36:04 +02:00
Mike Cao
1869a809cf Fixed incorrect data field. 2023-06-01 19:30:07 -07:00
Brian Cao
7e587198dd Add incr on block. 2023-06-01 12:49:28 -07:00
Brian Cao
a3639d59a3 Add increment to usage. 2023-06-01 11:54:24 -07:00
Brian Cao
dc6da1e41f Update yarn. 2023-06-01 10:34:39 -07:00
Brian Cao
b484286523
Feat/um 305 unique session ch (#2065)
* Add session_data / session redis to CH.

* Add mysql migration.
2023-05-31 21:46:49 -07:00
Francis Cao
1038a54fe4 add mysql 02 migration 2023-05-31 12:01:16 -07:00
Mike Cao
77f758205b Fixed tracker config. 2023-05-30 19:58:28 -07:00
Mike Cao
450c11a1da Merge remote-tracking branch 'origin/dev' into dev 2023-05-30 16:53:12 -07:00
Mike Cao
43f5854f15 Update report parameters. 2023-05-30 16:49:22 -07:00
Francis Cao
0d567ebe60 Delete event_data on website reset 2023-05-29 21:19:53 -07:00
Mike Cao
e9b0d3f796 Updated date range handling. 2023-05-28 22:28:11 -07:00
Mike Cao
bfb52eb678 Added report context. Removed report store. 2023-05-28 21:37:34 -07:00
Mike Cao
bc37f5124e Update report migration. 2023-05-27 22:36:41 -07:00
Mike Cao
e8dda3952c Merge remote-tracking branch 'origin/dev' into dev 2023-05-27 13:29:24 -07:00
Mike Cao
0724201f69 Added indexes. Removed old migration. 2023-05-27 13:29:09 -07:00
Brian Cao
968574dda1 add ownerId to non-cache. 2023-05-25 22:02:21 -07:00
Brian Cao
9d936fe8e5 add ownerId to non-cache. 2023-05-25 20:07:58 -07:00
Brian Cao
4c06487b11 Merge remote-tracking branch 'origin/dev' into dev 2023-05-25 16:46:39 -07:00
Brian Cao
06e6cbec9a Add share_id validation. 2023-05-25 16:46:37 -07:00
Mike Cao
3ccdd95f49 Moved render functions into lib/charts. 2023-05-25 10:26:00 -07:00
Mike Cao
5a5127c921 Converted popup into modal. 2023-05-24 21:54:49 -07:00
Mike Cao
fb4dd75e18 Refactored funnel report. Made BarChart more generic. 2023-05-24 21:40:02 -07:00
Mike Cao
050cd2f5d9
Merge pull request #2047 from jclab-joseph/fix/tracking-code-base-path
Fix to add basePath to trackingCode generation
2023-05-22 21:17:56 -07:00
Brian Cao
f01a745aad Merge remote-tracking branch 'origin/dev' into dev 2023-05-22 15:38:05 -07:00
Brian Cao
1f799f17e9 Fix permissions. 2023-05-22 15:38:03 -07:00
Mike Cao
0fb93ff00b Report updates. 2023-05-20 09:02:08 -07:00
Brian Cao
40f53e8856 Merge branch 'feat/um-285-report-schema' into dev 2023-05-18 13:21:35 -07:00
Brian Cao
4df7d6a2a1 Add userReport api 2023-05-18 13:13:18 -07:00
Brian Cao
de509e7ccc checkpoint 2023-05-18 11:17:35 -07:00
Joseph Lee
55e91d5659 Fix to add basePath to trackingCode generation 2023-05-18 17:27:15 +09:00
Mike Cao
a5700d4a25 Added reports section. 2023-05-17 23:20:06 -07:00
Abhilaksh Bansal
416fee0f53 Fixed user delete error 500 2023-05-17 15:31:41 +05:30
Mike Cao
ad918c5bba Update CI workflow. 2023-05-16 21:19:39 -07:00
Mike Cao
9d4808f5ef Update check-env for CI build. 2023-05-16 21:13:17 -07:00
Mike Cao
2259d4fae5 Fixed script. 2023-05-16 20:46:15 -07:00
Mike Cao
19ac0fce36 Added check-env script. 2023-05-16 20:41:20 -07:00
Brian Cao
cb038a51f3 Merge branch 'dev' into feat/um-285-report-schema 2023-05-16 20:40:58 -07:00
Brian Cao
53a5312c22 Merge branch 'dev' into feat/um-285-report-schema 2023-05-16 20:19:54 -07:00
Mike Cao
c567eddff9 Fixed website undefined issue. 2023-05-16 19:40:02 -07:00
Mike Cao
b663146ad5 Fixed data being undefined. 2023-05-16 19:31:40 -07:00
Mike Cao
e98c0a62e3 Merge remote-tracking branch 'origin/dev' into dev 2023-05-16 19:17:28 -07:00
Mike Cao
b48efef38b Allow multiple filters. 2023-05-16 19:17:12 -07:00
Mike Cao
6abffe3e4b
Merge pull request #2043 from tairosonloa/fix/gui-events-date-all-time
Fix: `BarChar` to correctly show year instead of epoch when unit is year
2023-05-16 17:24:52 -07:00
Brian Cao
748ad84a52 Merge branch 'dev' into feat/um-285-report-schema 2023-05-16 14:12:39 -07:00
Francis Cao
f01668f4c8 add user role to login response 2023-05-16 12:17:51 -07:00
Aitor Alonso
2b5429aa1f
fix: show year instead of epoch 2023-05-16 21:02:56 +02:00
Francis Cao
f528fac7be fix teams api route and messaging 2023-05-16 11:06:42 -07:00
Brian Cao
178a95f008 Merge branch 'dev' into analytics 2023-05-15 20:41:28 -07:00
Brian Cao
2ce62c1023 Add usage. 2023-05-15 20:41:12 -07:00
Brian Cao
b5f84159d2 funnel checkpoint 2023-05-15 14:03:42 -07:00
Brian Cao
ebc8cb488a Merge branch 'dev' into feat/um-285-report-schema 2023-05-14 21:38:14 -07:00
Brian Cao
07cb9f621d Funnel Table/Chart hooked up. 2023-05-14 21:38:03 -07:00
Mike Cao
345dee5720
Merge pull request #2038 from AkashRajpurohit/fix/filter-null-values-on-metric-table
fix: 🩹 null value check for metric data
2023-05-12 18:57:38 -07:00
Mike Cao
c167ccbbfb
Merge pull request #2027 from theshamuel/patch-2
delete a redundant volume mapping
2023-05-12 18:57:08 -07:00
Mike Cao
db7aff3ef0
Merge pull request #2026 from theshamuel/patch-1
add health-check for db container
2023-05-12 18:56:13 -07:00
Mike Cao
f564d36dae
Merge pull request #2034 from ammar-madni/ammar-madni-fix-websiteId-undefined
Fix undefined websiteId in dynamic realtime page api request.
2023-05-12 18:54:06 -07:00
AkashRajpurohit
c8ebb7695c fix: 🩹 null value check for metric data 2023-05-12 22:38:12 +05:30
Brian Cao
1130bca195 Funnel form. 2023-05-11 16:42:58 -07:00
Ammar
97f4a3bccc
Update index.js 2023-05-11 17:27:37 +01:00
Brian Cao
dd2db308ee Merge branch 'dev' into feat/um-285-report-schema 2023-05-08 23:47:25 -07:00
Brian Cao
d01aa5cd52 Add funnel queries 2023-05-08 23:46:58 -07:00
Francis Cao
d827bf1417 update CH kafka engine tables for error handling 2023-05-07 23:13:40 -07:00
Mike Cao
e92d958b24 Updated redis client. Soft deletes reset username. 2023-05-05 21:16:13 -07:00
theshamuel
e773451679
delete a redundant volume mapping
I'd like to propose to delete from docker-compose a redundant volume mapping. As I see that `sql` directory had been deleted and now umami-app is responsible for migration.
2023-05-05 23:57:58 +01:00
theshamuel
98e58581e2
add health-check for db container
I'd like to propose a minor changes that can bring more stability in launching the umami server with docker-compose by adding a certain healthcheck for db container and a certain condition for depends_on directive for umami-app container
2023-05-05 23:53:16 +01:00
Mike Cao
37b94e5b96 Updated message bundles. 2023-05-04 14:54:05 -07:00
Mike Cao
2cd293726a
Merge pull request #2019 from cadesalaberry/chore/add-tracker-types
chore(tracker): 🏷️ add types for tracker
2023-05-04 14:25:44 -07:00
Mike Cao
bfa662c24a
Merge pull request #1998 from valtlfelipe/patch-2
Update pt-BR.json translations
2023-05-04 14:24:26 -07:00
Mike Cao
7306e35591
Merge pull request #1997 from bilguun0203/master
Update mn-MN.json
2023-05-04 14:23:37 -07:00
Mike Cao
3f90c34f94
Merge pull request #2003 from Maxime-J/cleanup-check-db
Cleanup check-db
2023-05-04 14:23:09 -07:00
Mike Cao
f02142eb8c
Merge pull request #2010 from RohrerF/swiss-german-translations
update de-* translations
2023-05-04 14:21:19 -07:00
Mike Cao
016407773f
Merge pull request #2020 from MarcHagen/update/lang/nl
Update NL language
2023-05-04 14:20:21 -07:00
Brian Cao
4ab121a368 Merge branch 'dev' into analytics 2023-05-04 09:48:45 -07:00
Brian Cao
183c80539a Merge remote-tracking branch 'origin/dev' into dev 2023-05-03 17:18:00 -07:00
Brian Cao
9e2a478001 Add user usage. 2023-05-03 17:17:57 -07:00
Marc Hagen
d5b413eb90
Update NL language 2023-05-04 01:44:17 +02:00
C-A de Salaberry
d00d4f7343
chore(tracker): 🏷️ add types for tracker 2023-05-03 19:52:59 +02:00
Francis Cao
5692c0e07d add formatted message to reset website 2023-05-02 23:44:42 -07:00
Mike Cao
c41fb5ee1b Updated packages. 2023-05-02 08:32:04 -07:00
Mike Cao
f01e3ad502 Update Next.js 13.2.4. 2023-05-02 08:22:43 -07:00
Francis Cao
714a331cd2 remove navbar logo pointer 2023-05-01 11:33:08 -07:00
Brian Cao
65ebb26a70 Fix boolean event data. 2023-04-30 22:55:54 -07:00
Florian Roher
004e5a954a fix message.share-url 2023-04-28 23:15:40 +02:00
Florian Roher
0a1ed145af swiss german translations 2023-04-28 23:01:37 +02:00
Mike Cao
586529a5ca
Merge pull request #2009 from franciscao633/master
Github Issues Organizational Templates
2023-04-28 12:49:29 -07:00
Francis Cao
22e2f79bff re order required fields 2023-04-28 11:35:01 -07:00
Francis Cao
6f4cc9e84c typo correction 2023-04-28 11:34:03 -07:00
Francis Cao
e77e030f2c update bug report 2023-04-28 11:31:54 -07:00
Francis Cao
a43bbc51f6 update feature name 2023-04-28 11:24:31 -07:00
Francis Cao
bf26874965 clean up templates 2023-04-28 11:18:53 -07:00
Francis Cao
6cdf9a68d1 fix config and clean up feature request 2023-04-28 11:06:25 -07:00
Francis Cao
402acf563e fix bug report template 2023-04-28 11:01:40 -07:00
Francis Cao
2d6077fe16 clean-up template 2023-04-28 10:59:35 -07:00
Francis Cao
c9ec055996 introduce templates 2023-04-28 10:04:23 -07:00
Francis Cao
3f0815855c issues template 2023-04-28 09:52:42 -07:00
Maxime-J
ac0efb29aa Cleanup check-db 2023-04-27 13:38:07 +00:00
Felipe Valtl de Mello
f5cb18b9b5
Update pt-BR.json 2023-04-26 10:55:12 -03:00
Felipe Valtl de Mello
d38dc1b5ab
Update pt-BR.json translations 2023-04-26 10:53:25 -03:00
Bilguun Ochirbat
c954bb2ce7
Update mn-MN.json 2023-04-26 17:07:19 +08:00
Francis Cao
dcb9f69c43 Fix Title filters 2023-04-25 23:25:51 -07:00
Francis Cao
9b349b53c4 limit realtime record set to 15 2023-04-25 22:52:53 -07:00
Mike Cao
46615fe7eb
Merge pull request #1994 from umami-software/dev
v2.2.0
2023-04-25 21:49:42 -07:00
Mike Cao
388917b6e4 Merge branch 'dev' into analytics 2023-04-25 21:37:57 -07:00
Mike Cao
9345c9ac9e Apply CSS to flag icons. 2023-04-25 21:18:03 -07:00
Mike Cao
1522606e22 Merge branch 'dev' into analytics 2023-04-25 21:04:59 -07:00
Mike Cao
938047ce45 Revert tracker logic. Bump search depth. 2023-04-25 21:03:26 -07:00
Mike Cao
34757e7b2a Bump version v2.2.0. 2023-04-25 20:52:05 -07:00
Mike Cao
01fe8b44a3 Updated packages. 2023-04-25 20:34:56 -07:00
Mike Cao
ae85bf696b Allow tracker to traverse all levels to find anchor. 2023-04-25 19:12:17 -07:00
Mike Cao
13e6bd46a3 Merge branch 'dev' into analytics 2023-04-25 16:57:06 -07:00
Mike Cao
f450fc35fb Fixed city showing undefined. 2023-04-25 16:56:31 -07:00
Mike Cao
6f2c2d9aa8 Merge branch 'dev' into analytics 2023-04-25 16:52:47 -07:00
Mike Cao
4c544361fd Fixed vercel again. 2023-04-25 16:51:42 -07:00
Mike Cao
50f114bea2 Merge branch 'dev' into analytics 2023-04-25 16:31:10 -07:00
Mike Cao
4ea3eec98c Fixed vercel region issues. 2023-04-25 16:29:47 -07:00
Mike Cao
5864aee043 Fixed vercel issues. 2023-04-25 15:58:52 -07:00
Mike Cao
c49e2c6974 Fixed Vercel geolocation. 2023-04-25 14:52:29 -07:00
Mike Cao
02f031bde1 Separate CLOUD_MODE and DISABLE_LOGIN. 2023-04-25 14:48:50 -07:00
Mike Cao
3f1ed750f0 Added error boundary. Fixed #1976. 2023-04-25 14:41:54 -07:00
Mike Cao
d73def80c7 Update message bundles. 2023-04-25 12:46:19 -07:00
Mike Cao
4b72918a91 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-25 12:45:12 -07:00
Mike Cao
44a1c7fa10
Merge pull request #1963 from RikoDEV/patch-1
i18n: update pl-PL translations
2023-04-25 12:44:51 -07:00
Mike Cao
c47d246a79
Merge pull request #1974 from atmonshi/update-lang-ar
update AR phrases
2023-04-25 12:44:01 -07:00
Mike Cao
89d37e0045
Merge pull request #1975 from atmonshi/refresh-after-delete-user
small improve to Users List
2023-04-25 12:43:30 -07:00
Mike Cao
4045cfd039
Merge pull request #1980 from juangacovas/patch-3
Update es-MX.json
2023-04-25 12:42:25 -07:00
Mike Cao
c3beb10e3b
Merge pull request #1992 from Truimo/dev
fix for #1940: check if there is no parent element
2023-04-25 12:36:26 -07:00
Mike Cao
b6f3f57455 Added fallback in case country code not found. 2023-04-25 12:35:09 -07:00
Truimo
4876684461 fix: added check if there is no parent element 2023-04-26 00:10:33 +08:00
Mike Cao
9e11866ddd Remove password from logging. 2023-04-24 22:00:40 -07:00
Mike Cao
1e9a4ad08f Added login debugging. 2023-04-24 21:35:09 -07:00
Mike Cao
92ab391ef8 Use Vercel headers for location. 2023-04-24 19:29:31 -07:00
Mike Cao
c23373d164 Check page title exists first. 2023-04-24 18:07:27 -07:00
Juanga Covas
1b8c2c4dde
Update es-MX.json
Update missing translations
2023-04-24 21:27:53 +02:00
Mike Cao
135c4aacc0 Merge remote-tracking branch 'origin/dev' into analytics 2023-04-23 19:56:04 -07:00
Mike Cao
26a9cb67d8 Merge remote-tracking branch 'origin/dev' 2023-04-23 19:55:35 -07:00
Mike Cao
4a51a5db3f Added country flags. 2023-04-23 19:52:44 -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
Ash Monsh
ff9a6335d1 update AR phrases 2023-04-23 05:39:35 +03:00
Mike Cao
c5bffb97cc Improved error handling for useSession middleware. 2023-04-22 14:17:57 -07:00
RikoDEV
2e3d2924e7
Update pl-PL.json 2023-04-22 10:10:50 +02:00
Mike Cao
8666965930 Updated lang files. 2023-04-22 00:55:55 -07:00
Mike Cao
5027d9d945 Merge branch 'dev' 2023-04-21 22:05:38 -07:00
Mike Cao
6cb2429ee1 Bump version v2.1.1. 2023-04-21 22:05:06 -07:00
Mike Cao
fec284c904 Merge branch 'dev' into analytics 2023-04-21 21:29:42 -07:00
Mike Cao
ef59e93adc Merge branch 'dev' 2023-04-21 21:29:17 -07:00
Mike Cao
47f63d80c4 Fix tracker. 2023-04-21 21:28:02 -07:00
Mike Cao
36b767af75
Merge pull request #1955 from umami-software/dev
v2.1.0
2023-04-21 18:20:48 -07:00
Mike Cao
00d0421623 Make title optional. 2023-04-21 17:59:03 -07:00
Mike Cao
987e3aabbd Fix tracking code form. 2023-04-21 17:21:44 -07:00
Mike Cao
a2bce7ae2c Revert next for vercel build. 2023-04-21 17:01:31 -07:00
Mike Cao
6469dd296d Revert tsconfig.json. 2023-04-21 16:06:49 -07:00
Mike Cao
71fcad26a5 Updated .track method functionality. 2023-04-21 15:55:52 -07:00
Mike Cao
80438bf84c Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-21 15:16:39 -07:00
Mike Cao
eaaf3a0a5c Merge branch 'master' into dev 2023-04-21 15:16:26 -07:00
Mike Cao
a7e6c32460 Updated page titles. 2023-04-21 15:14:30 -07:00
Mike Cao
39f630400f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-21 15:02:25 -07:00
Mike Cao
3ba75a6737
Merge pull request #1944 from atmonshi/page-titles
add page titles
2023-04-21 15:02:18 -07:00
Mike Cao
71628bec90
Merge pull request #1945 from yumusb/patch-1
Fix "x-umami-cache: undefined"
2023-04-21 14:59:39 -07:00
Mike Cao
6f80908160 Updated message bundles. 2023-04-21 14:58:37 -07:00
Mike Cao
21c4ec068d
Merge pull request #1948 from Maxime-J/dev
restore login localization
2023-04-21 14:57:16 -07:00
Mike Cao
115a2560a7
Merge branch 'dev' into dev 2023-04-21 14:57:04 -07:00
Mike Cao
f246183094
Merge pull request #1951 from ym-project/master
update ru-RU locale
2023-04-21 14:55:20 -07:00
Mike Cao
edce62eede
Merge pull request #1953 from winterrific/master
Update lang de-DE
2023-04-21 14:54:43 -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
5b4bd67455 Updated packages. 2023-04-21 14:39:06 -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
Ruben
65c07f5034 Update lang de-DE 2023-04-21 22:10:14 +02:00
Mike Cao
b9a0f0442e Updated next to 13.3.0. 2023-04-21 12:52:09 -07:00
Mike Cao
a0894866b9 POC for exporting components. 2023-04-21 12:43:37 -07:00
ym-project
39cafafd76
fix label.data translation 2023-04-21 19:32:04 +03:00
ym-project
31df0f7f07
update ru-RU locale 2023-04-21 19:27:09 +03: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
榆木
5d8fb2f791
Update index.js
Do not send the x-umami-cache request header when the cache is not defined (the first request sent to the umami server when the visitor opens the page)
2023-04-21 12:04:30 +08:00
Ash Monsh
3039ad9315 add page titles 2023-04-21 05:58:16 +03:00
Mike Cao
1baf4d5571 Code style fix. 2023-04-20 15:19:09 -07: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
5bfbc71e7f Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-20 11:53:45 -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
c4d3d6fb09 Updated language bundle. 2023-04-20 11:36:30 -07:00
Mike Cao
288f77d6ff
Merge pull request #1940 from MexHigh/master
Adjusted tracking script to find parent a-tag for click tracking
2023-04-20 11:34:18 -07: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
Leon Schmidt
a84d2181e7
Adjusted tracking script to find parent a-tag for click tracking 2023-04-20 17:14:41 +02:00
MBRjun
981abd5966
fix: get tracking code correctly 2023-04-20 22:41:25 +08:00
MBRjun
136f962218
i18n: update zh-CN translations 2023-04-20 21:29:58 +08:00
Ash Monsh
aba523cbee rotate arrows in rtl 2023-04-20 12:41:06 +03:00
Mike Cao
d2c9c45461 Allow slashes in tracker names. 2023-04-20 01:52:49 -07:00
Mike Cao
dbc19e4ffd Allow multiple tracker names. 2023-04-20 01:12:43 -07:00
Mike Cao
f0d13efc7a Fix typo. 2023-04-19 22:11:00 -07:00
Mike Cao
03ba225587 More resetDate conversion. 2023-04-19 21:16:56 -07:00
Mike Cao
e63591e35d resetDate should be a Date object. 2023-04-19 21:08:52 -07:00
Mike Cao
98028f1756 Add version info. 2023-04-19 19:33:24 -07:00
Mike Cao
3b6c6846b1 Fixed lang references. 2023-04-19 18:42:29 -07:00
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
Mike Cao
2bd970ba2b
Merge pull request #1883 from screendriver/noindex
Prevent indexing content by search engines
2023-04-17 10:23:08 -07:00
Mike Cao
23b98314d6
Merge pull request #1831 from vidschofelix/master
Upgrade Postgres to 15
2023-04-17 10:10:27 -07:00
Francis Cao
01559c4c63 update docker-compose to 15-alpine 2023-04-17 10:10:05 -07:00
Francis Cao
43499eb4fd fix region / city filters 2023-04-17 00:10:51 -07:00
Francis Cao
672608b2f5 re-add pgcrypto extension 2023-04-16 21:13:51 -07:00
Francis Cao
b1074c893a 01_init schema changes 2023-04-16 21:07:36 -07:00
Mike Cao
561770a469 Add selected state. 2023-04-16 20:46:38 -07:00
Mike Cao
7e79711900 Merge remote-tracking branch 'origin/dev' into dev 2023-04-16 16:35:28 -07:00
Mike Cao
061d8cd174 Fixed incorrect messages. 2023-04-16 16:34:49 -07:00
Francis Cao
b7d64a91bd fix check-db workflow 2023-04-14 10:24:48 -07:00
Mike Cao
54b018f7ba Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-13 23:37:50 -07:00
Mike Cao
43a4357729 Updated subdivision save. 2023-04-13 23:32:28 -07:00
Mike Cao
fa52e6c83f Merge remote-tracking branch 'origin/dev' into dev 2023-04-13 23:06:04 -07:00
Mike Cao
b183fc1600 Fixed map issue. 2023-04-13 23:05:54 -07:00
Francis Cao
06649c2e31 at null check for subdivision save 2023-04-13 22:59:04 -07:00
Brian Cao
7e096336ce Merge remote-tracking branch 'origin/dev' into dev 2023-04-13 22:52:44 -07:00
Brian Cao
3461342601 Clean up api. 2023-04-13 22:52:41 -07:00
Mike Cao
2890cb4419 Merge remote-tracking branch 'origin/dev' into dev 2023-04-13 22:44:49 -07:00
Mike Cao
35fbb7321e Added districts for Bangladesh. 2023-04-13 22:44:43 -07:00
Francis Cao
42df7695e8 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-13 22:40:54 -07:00
Francis Cao
9dd9ab1325 concatenate subdivision saves 2023-04-13 22:40:48 -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
44e37ece2d add PH to iso-3166-2 json 2023-04-13 22:17:36 -07:00
Mike Cao
ad3ee5e953 Added entries for PH. 2023-04-13 22:13:30 -07:00
Brian Cao
0335fd3529 Remove webisite.teamId related code. Clean up queries. 2023-04-13 20:57:22 -07:00
Brian Cao
081a126c01 Merge remote-tracking branch 'origin/dev' into dev 2023-04-13 20:33:24 -07:00
Brian Cao
baa6d8486b Remove unused code. 2023-04-13 20:33:21 -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
Christian Rackerseder
ab44150532
Prevent indexing content by search engines 2023-04-13 08:44:34 +02:00
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
Mike Cao
f56374b259 Migrate changes from cloud. 2023-04-05 09:55:21 -07:00
Mike Cao
0217f19d99 Merge branch 'dev' into analytics 2023-04-04 23:41:58 -07:00
Mike Cao
6dd90ce9ca Refactored SSO process. 2023-04-04 23:29:54 -07:00
Mike Cao
dea4b4766c Merge branch 'dev' into analytics 2023-04-04 00:36:11 -07:00
Mike Cao
2631f00598 Merge remote-tracking branch 'origin/dev' into dev 2023-04-04 00:34:15 -07:00
Mike Cao
84894a5b80 Updated tracker to handle links. 2023-04-04 00:34:07 -07:00
Mike Cao
d851a9e88b Fixed test console error. 2023-04-04 00:27:25 -07:00
Brian Cao
c0e79f5e9d Merge branch 'dev' into analytics 2023-04-04 00:24:10 -07:00
Brian Cao
dee58f8a55 Fix date function. 2023-04-04 00:24:03 -07:00
Brian Cao
4c92da6fc6 Merge branch 'dev' into analytics 2023-04-03 23:22:25 -07:00
Brian Cao
76296bc2ee Fix realtime. 2023-04-03 23:22:20 -07:00
Brian Cao
329df22a5d Fix realtime. 2023-04-03 23:21:29 -07:00
Mike Cao
b4f6dfedda Merge branch 'dev' into analytics 2023-04-03 20:32:12 -07:00
Mike Cao
c30aa4c0b6 Merge remote-tracking branch 'origin/dev' into dev 2023-04-03 20:22:53 -07:00
Mike Cao
8276a769e6 Remove www from domain. 2023-04-03 20:22:23 -07:00
Mike Cao
005b14b629
Merge pull request #1864 from umami-software/dev
Dev into analytics
2023-04-03 19:40:20 -07:00
Francis Cao
58197116dd remove getPath from initial referrer 2023-04-03 19:34:41 -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
31f28125dc Revert font. 2023-04-02 23:12:43 -07:00
Mike Cao
ae772f048c Fix referrer lookup. 2023-04-02 22:41:24 -07:00
Mike Cao
ba71f5cafc Fix location lookup. 2023-04-02 22:36:52 -07:00
Mike Cao
7464bd2521 Fixed types. 2023-04-02 17:28:25 -07:00
Mike Cao
9001361e4c Fix session lookup. 2023-04-02 17:23:12 -07:00
Mike Cao
bbdb672063 Removed middleware. 2023-04-02 16:51:00 -07:00
Mike Cao
b77657faa6 Updated error message. 2023-04-02 16:33:44 -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
728e4cff5b Updated queries to use cache. 2023-04-01 17:38:35 -07:00
Mike Cao
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Mike Cao
2b395f252d
Merge pull request #1851 from seanghay/master
Add Khmer language of Cambodia (km-KH)
2023-03-31 22:20:02 -07:00
Mike Cao
479dc06d36
Merge pull request #1832 from BE-CH/master
ARM Docker support
2023-03-31 22:17:00 -07:00
Mike Cao
e31ee89fee
Merge pull request #1854 from BennyDeeDev/patch-1
README: docker compose detach as default
2023-03-31 22:14:37 -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
Brian Cao
91100393eb Merge remote-tracking branch 'origin/dev' into dev 2023-03-31 14:53:50 -07:00
Brian Cao
d2687b6580 Fix metrics. 2023-03-31 14:53:48 -07:00
Mike Cao
e2b95f2235 Merge remote-tracking branch 'origin/dev' into dev 2023-03-31 05:56:01 -07:00
Mike Cao
9dd35b3766 Fixed metrics display. 2023-03-31 05:55:28 -07:00
Francis Cao
b7c3b58072 fix to page title collect 2023-03-30 23:13:03 -07:00
Benjamin Derksen
ead831bb3c
detach as default 2023-03-30 20:34:11 +02:00
Brian Cao
2172dddd1c Convert send to TS. 2023-03-30 11:18:57 -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
64b040c865 Fixed query parameter filter. 2023-03-30 09:44:04 -07:00
Mike Cao
358519dddd Removed filters from pages. 2023-03-29 23:29:37 -07:00
Mike Cao
a026fc97fc Prevent blank urls. 2023-03-29 23:14:09 -07:00
Mike Cao
14a8ae2b81 Merge remote-tracking branch 'origin/dev' into dev 2023-03-29 23:08:38 -07:00
Mike Cao
d471d05217 Added config to open websites in new tab. 2023-03-29 23:08:26 -07:00
Brian Cao
055e7f04fc Merge remote-tracking branch 'origin/dev' into dev 2023-03-29 20:54:58 -07:00
Brian Cao
44e6bff6b1 Remove sensitive user information. 2023-03-29 20:54:54 -07:00
Francis Cao
964ef1c92e
Merge pull request #1853 from umami-software/feat/um-219-squash-postgres-init-migration
Feat/um 219 squash postgres init migration
2023-03-29 16:36:34 -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
Francis Cao
96d25721da add pgcrypto back 2023-03-29 14:22:14 -07:00
Francis Cao
f984d80c42 squash 01_init postgresql 2023-03-29 11:38:08 -07:00
Francis Cao
a22d50a597
Merge pull request #1852 from umami-software/feat/um-218-update-ch-website-event
update CH event to website_event
2023-03-29 11:26:51 -07:00
Francis Cao
3b7000a436 fix active bug 2023-03-29 11:16:02 -07:00
Francis Cao
95ed8a09aa update CH event to website_event 2023-03-29 11:06:12 -07:00
Seanghay Yath
9e865ecdf3
feat: add km-KH locale 2023-03-29 11:43:19 +07:00
Mike Cao
05933ff1d2 Use new geo folder. 2023-03-28 19:24:36 -07:00
Mike Cao
23d02e5aac Try reverting to country database. 2023-03-28 19:10:11 -07:00
Francis Cao
33bf2ccb5e add referrer to saveEvent 2023-03-28 16:34:14 -07:00
Mike Cao
f3e146d0fb Added vercel.json. 2023-03-28 16:02:36 -07:00
Francis Cao
f2d86f9307
Merge pull request #1848 from umami-software/feat/um-209-implement-reset-date
Feat/um 209 implement reset date
2023-03-27 16:27:07 -07:00
Francis Cao
4d6abc4529 remove unused ref columns 2023-03-27 15:54:37 -07:00
Francis Cao
17c8cc07e4 we Merge branch 'dev' into feat/um-209-implement-reset-date 2023-03-27 15:51:54 -07:00
Francis Cao
077fad20ea update skip_broken_messages 2023-03-27 12:44:59 -07:00
Francis Cao
c38da5bfd7 readd system user insert for mysql 2023-03-27 12:15:22 -07:00
Francis Cao
fbe35f4c97 fixed relational query to get reset_at 2023-03-27 12:11:06 -07:00
Francis Cao
cb79d806e8 update postgres / mysql migrations 2023-03-27 11:36:21 -07:00
Francis Cao
14e4a090bb update schema and queries to implement reset_at 2023-03-27 11:25:16 -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
be2fc0de8d Fix ch schema. 2023-03-23 14:17:32 -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
1666e5e3af
Merge pull request #1840 from umami-software/feat/um-207-add-event-data-relational-db
Feat/um 207 add event data relational db
2023-03-22 23:49:16 -07:00
Francis Cao
87545a5648 add system user insert back for MySQL 2023-03-22 23:07:01 -07:00
Francis Cao
ea39f5b431 add new event data schema 2023-03-22 23:02:37 -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
8532c673fe Merge remote-tracking branch 'origin/dev' into dev 2023-03-21 21:28:52 -07:00
Mike Cao
fc2a8f3d9f Updated navigation. 2023-03-21 21:28:36 -07:00
Francis Cao
a8cd0932d8 fixed send message for new url/referrer columns 2023-03-21 11:30:11 -07:00
Mike Cao
611169c65f Fix referrers table. 2023-03-20 13:39:40 -07:00
Mike Cao
7b0b97afb9
Merge pull request #1838 from umami-software/bug/um-200-fix-referrer-filters
Split url / referrer columns in db schema
2023-03-20 13:22:58 -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
0b20885772 Merge remote-tracking branch 'origin/dev' into dev 2023-03-16 15:56:32 -07:00
Mike Cao
c62e2e9cc7 Update tooltip date formats. 2023-03-16 15:56:05 -07:00
Francis Cao
434ef3eb9e Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-16 10:52:36 -07:00
Francis Cao
9c8cb8247e update gitignore to new script name 2023-03-16 10:36:30 -07:00
Mike Cao
afec08b355 Fixed grid lines on bar chart. 2023-03-16 02:05:56 -07:00
Francis Cao
790e71cc14 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-15 16:40:13 -07:00
Francis Cao
f569f6ac91 fix null ip lookup error 2023-03-15 16:39:55 -07:00
Mike Cao
54051d7204 Updated tracker script name and endpoint. 2023-03-15 16:27:05 -07:00
Francis Cao
275e7d3df6 update send 2023-03-15 16:06:51 -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
Francis Cao
7596f42545 update pageview, event save 2023-03-14 18:59:19 -07:00
Francis Cao
cfa36d1802 clean-up migrations 2023-03-14 17:43:36 -07:00
Francis Cao
9321401297 schema changes to CH, Postgres, MySQL 2023-03-14 17:27:17 -07:00
Mike Cao
3823705fc6 Added HoverTooltip component. Removed react-tooltip. 2023-03-14 11:35:24 -07:00
BE-CH
3a18e79d45 Updated lockfile to support ^ 2023-03-12 23:37:54 +01:00
BE-CH
403144eb30 Added ^ to Prisma version package.json 2023-03-12 23:36:16 +01:00
BE-CH
61732f391e Updated Prisma version to support ARM64 2023-03-12 23:32:44 +01:00
BE-CH
0ec20d42cf Removed platform issues 2023-03-12 21:03:14 +01:00
BE-CH
e31f882333 Prisma requires linux/amd64.... 2023-03-12 20:45:46 +01:00
BE-CH
c07a561eda Made the builder run as amd64 to avoid prisma arm problems 2023-03-12 19:53:49 +01:00
BE-CH
7df58a921f Added network timeout for yarn 2023-03-12 18:35:36 +01:00
BE-CH
4362be44e0 updated manual cd action 2023-03-12 18:08:13 +01:00
BE-CH
91bcbec2af + v6 and arm platform 2023-03-12 18:06:06 +01: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
Felix
2470fb4c7c
Upgrade Postgres to 15 2023-03-10 22:52:54 +01: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
7a3443cd06
Merge pull request #1775 from EffakT/country_fallback
Adding registered_country fallback to getCountry
2023-03-09 15:55:38 -08:00
Mike Cao
23ea2e9e93
Merge pull request #1784 from juangacovas/patch-1
Update es-MX.json
2023-03-09 15:53:31 -08:00
Mike Cao
c3426a67ee Add messages for devices. 2023-03-09 15:18:54 -08:00
Mike Cao
e2c801439d
Merge pull request #1774 from ppnplus/patch-1
Update th-TH.json
2023-03-09 15:17:21 -08:00
Mike Cao
49402924aa
Merge pull request #1792 from d19dotca/patch-1
Stylized macOS + sorted Desktop & Mobile OS names
2023-03-09 15:16:05 -08:00
Mike Cao
0d6da743b9 Updated react-basics. 2023-03-09 14:34:22 -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
9b90036401 Upgrade prisma. 2023-03-08 17:21:53 -08:00
Mike Cao
178d780ab7 Updated minor packages. 2023-03-08 17:16:13 -08:00
Mike Cao
cb55cec342 Fixed rewrite config. 2023-03-08 16:48:44 -08:00
Mike Cao
fcf51d9727 Merge remote-tracking branch 'origin/dev' into dev 2023-03-08 16:38:12 -08:00
Mike Cao
696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -08:00
Francis Cao
bb2cd93ad4 undo 01_init change 2023-03-06 11:25:05 -08:00
Brian Cao
7b9abd72f8 Limit metrics. 2023-03-05 13:30:21 -08:00
Mike Cao
3fc5f5151b Touch up footer. 2023-03-03 21:26:39 -08:00
Brian Cao
05f01cd09e Merge remote-tracking branch 'origin/dev' into dev 2023-03-03 13:15:19 -08:00
Brian Cao
b41a2a4e56 Rename migration. 2023-03-03 13:15:12 -08:00
Mike Cao
19662abcd8
Merge pull request #1808 from umami-software/bug/um-191-fix-redis-auth-misc-bug
Bug/um 191 fix redis auth misc bug
2023-03-03 13:15:10 -08:00
Mike Cao
ab8296235f Updated next-basics. 2023-03-03 12:42:28 -08:00
Mike Cao
0119f7bcde Merge remote-tracking branch 'origin/dev' into dev 2023-03-03 12:39:16 -08:00
Mike Cao
fd1006a299 Updated react-basics. 2023-03-03 12:39:10 -08:00
Mike Cao
bb99b3eba5 Fixed sticky header scrolling. Updated settings button. 2023-03-03 12:37:26 -08:00
Francis Cao
448d2b2241 fix redis auth issue 2023-03-03 12:30:12 -08:00
Francis Cao
3325df0d84 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-191-fix-redis-auth-misc-bug 2023-03-03 10:38:34 -08:00
Francis Cao
65691f5912 fix referrer domain on tracker load 2023-03-03 10:38:14 -08:00
Brian Cao
8684781624 Clean up teams on user delete. 2023-03-02 22:48:30 -08:00
Francis Cao
c9cacbb0e2 add types back to event / pageview. fix non-redis auth 2023-03-02 12:56:38 -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
94165ca5ad
Merge pull request #1803 from umami-software/feat/um-171-cloud-mode-env-variable
Cities, Subdivisions, Page Title
2023-03-01 16:14:29 -08:00
Francis Cao
e5645cfb00 revert tsconfig 2023-03-01 12:19:41 -08:00
Francis Cao
ad28d69d27 update ts config to ignore js files 2023-03-01 12:09:37 -08:00
Francis Cao
37e98c9751 remove lint rule 2023-03-01 11:57:13 -08:00
Francis Cao
a777b2916f Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable 2023-03-01 11:40:34 -08:00
Francis Cao
93650a2f66 add pagetitle to queries 2023-03-01 10:53:57 -08:00
Mike Cao
4cb5a14de9 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-28 20:04:17 -08:00
Mike Cao
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Francis Cao
6c302a7325 collect pagetitle, update subdivision2 data type 2023-02-28 17:40:18 -08:00
Brian Cao
84430e38eb
Check deletedAt. (#1796) 2023-02-27 16:01:34 -08:00
Mike Cao
5657a64c77 Pass domain to realtime components. 2023-02-24 02:41:02 -08:00
Mike Cao
25f44b84df
Merge pull request #1789 from umami-software/dependabot/npm_and_yarn/undici-5.19.1
Bump undici from 5.16.0 to 5.19.1
2023-02-24 02:30:16 -08:00
Mike Cao
b853255c23
Merge pull request #1793 from slawiko/add-be-by-locale
Add be-BY locale (belarusian language)
2023-02-24 02:29:51 -08:00
Mike Cao
7d3334ccce Fixed realtime logs. 2023-02-22 20:59:59 -08:00
slawiko
02272d3909 Adds locale mapping 2023-02-22 12:25:13 +01:00
slawiko
982d47c7e9 Adds translations for be-BY locale 2023-02-22 12:23:21 +01:00
Dustin Dauncey
b8f72660d9
Stylized macOS + sorted Desktop & Mobile OS names
Since iOS was stylized, I thought it was consistent if we also stylized macOS (it's not Mac OS anymore, it's (macOS)[https://en.wikipedia.org/wiki/MacOS]). 

Also took a quick moment to sort the values for Desktop and Mobile OS names in order to more easily locate at a glance the item being looked for.
2023-02-20 21:21:05 -08:00
Francis Cao
55a586fe27 add subdivision1/2, cities to query logic 2023-02-20 09:04:20 -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
Francis Cao
6bacfa5892 add city, subdivision1, subdivison2 2023-02-16 18:55:51 -08:00
dependabot[bot]
7e091c5d40
Bump undici from 5.16.0 to 5.19.1
Bumps [undici](https://github.com/nodejs/undici) from 5.16.0 to 5.19.1.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.16.0...v5.19.1)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 23:27:31 +00:00
Francis Cao
074fa2c5fc add subdivision2 to schema 2023-02-16 09:52:07 -08:00
Francis Cao
b6cc6cb655 update CH, postgres, MySQL schemas 2023-02-15 09:40:49 -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
Francis Cao
4351ef37f8 update to GeoLite2-City 2023-02-14 12:06:41 -08:00
Francis Cao
eea01b21cf Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable 2023-02-14 10:59:36 -08:00
Enrico Paulini
90db2239a2
Remove formatted message from placeholder 2023-02-12 22:58:59 -03:00
Enrico Paulini
1b44c5f826
Label Incrementions and pt-BR update 2023-02-12 20:40:03 -03:00
Mike Cao
638a674e99 Fixed filter tags. Added clear all option. 2023-02-11 22:10:14 -08:00
Juanga Covas
2c36eaad5c
Update es-MX.json
Translated some new strings from English to Spanish and assorted fixes
2023-02-11 17:51:21 +01: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
Francis Cao
9f8ea060b6 implement cloud mode logic 2023-02-09 10:13:50 -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
a7cad0190c Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-07 16:29:38 -08:00
Mike Cao
ad5e34a894 Fixed lint issues. 2023-02-07 16:29:25 -08:00
Mike Cao
94726239aa Added /me/websites. 2023-02-07 16:28:55 -08:00
Mike Cao
423f26c7fb Fix lint issues. 2023-02-07 16:26:58 -08:00
Mike Cao
54d5af5cbb Progress check-in. 2023-02-04 08:59:52 -08:00
Mike Cao
30274a07fd
Merge pull request #1773 from umami-software/feat/um-121-v2-migration-script
Update MySQL db prisma files to 2.0
2023-02-03 12:40:34 -08:00
effakt
6b3eb7617d Adding registered_country fallback to getCountry 2023-02-04 08:46:32 +13:00
ppnplus
e2e6c2cb8d
Update th-TH.json
1. Removed trailing full stops, as we don't use full stops in our language.
2. Changed the string for "Pages" from "หน้าเพจ" to "หน้า". The current string "หน้าเพจ" has two words with the same, overlapping meaning. "หน้า" is a proper translation for the word "page", while "เพจ" is a transliteration from the English pronunciation "page" which is more commonly used to refer to Facebook Pages in our language.
2023-02-03 12:13:59 +07:00
Mike Cao
0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Francis Cao
6457ddfec1 update 01_init to latest 2023-02-02 10:18:06 -08:00
Francis Cao
9078444ca5 update mysql to latest schema 2023-02-02 10:12:25 -08:00
Francis Cao
0b16d06d8c move migrate-db to own repo 2023-02-02 10:04:21 -08:00
Francis Cao
d6e17fe982 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-121-v2-migration-script 2023-02-02 10:00:53 -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
e5b57f63cd Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-01 18:40:04 -08:00
Mike Cao
656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
Mike Cao
9e4a5159ba
Merge pull request #1772 from umami-software/feat/um-169-team-website-db-update
add schema changes for TeamWebsite, update deleted logic for team tables
2023-02-01 18:38:16 -08:00
Francis Cao
5fd946cfde add schema changes for TeamWebsite, update deleted logic for team tables 2023-02-01 17:08:16 -08:00
Mike Cao
89f2fd601e Fix user logic. 2023-01-30 23:03:08 -08:00
Mike Cao
689bb94898
Merge pull request #1770 from umami-software/bug/planetscale-create-db
update schema.mysql.sql for planetscale install
2023-01-30 22:49:44 -08:00
Francis Cao
318dd7de74 update mysql from planetscale install 2023-01-30 22:07:30 -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
cc2be9f47a
Merge pull request #1765 from umami-software/app
v1.40.0
2023-01-25 19:55:08 -08:00
Mike Cao
b3c41786ba Bump version v1.40.0. 2023-01-25 19:47:03 -08:00
Mike Cao
219641a633 Updated language files. 2023-01-25 13:57:49 -08:00
Mike Cao
765833b357 Merge branch 'app' of https://github.com/umami-software/umami into app 2023-01-25 13:15:02 -08:00
Mike Cao
54eb8a19d4
Merge pull request #1760 from mbos2/croatian-translation-fix
Croatian translations update
2023-01-25 13:14:53 -08:00
Mike Cao
a430eae12b Merged #1752. 2023-01-25 08:47:13 -08:00
Mike Cao
3acff56a59 Upgrade Prisma to 4.9.0. 2023-01-25 08:46:56 -08:00
Mike Cao
4b1013c8c6
Merge pull request #1752 from sdvcrx/add-cors-cache
Add maxAge config to cache CORS preflight request
2023-01-25 08:44:49 -08:00
Mike Cao
58a380d6e7
Merge pull request #1761 from umami-software/bug/um-165-rename-index-fix
add current database filter  when querying index
2023-01-25 08:37:06 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Francis Cao
51e79be23d add current databasefilter when querying index 2023-01-24 10:35:36 -08:00
Mike Cao
fbccf4d3af Merge remote-tracking branch 'origin/dev' into dev 2023-01-23 15:32:47 -08:00
Mike Cao
cdd54df8f6 Refactored user components. 2023-01-23 15:32:35 -08:00
Francis Cao
11ffd1cf4c
Merge pull request #1755 from umami-software/feat/um-143-check-db-v2
update check-db, add pgcrypto extension if not exists on init migration
2023-01-23 10:11:45 -08:00
Francis Cao
5bd8608918 fix checkDatabaseVersion message typo 2023-01-23 10:06:52 -08:00
Matej Bošnjak
1b6653c35c croatian translations fix 2023-01-23 18:54:35 +01:00
Mike Cao
91af593ff5 Updated settings components. 2023-01-20 17:12:53 -08:00
Francis Cao
7c0db0633f update check-db, add pgcrypto extension if not exists on init migration 2023-01-20 14:21:11 -08:00
Brian Cao
451fbc84a4 Even out calendar. 2023-01-20 12:45:45 -08:00
Brian Cao
d9ba4097ee Fix calendar. 2023-01-20 12:33:21 -08:00
Brian Cao
5c683f9103
Fix share url update. (#1754) 2023-01-19 11:15:33 -08:00
sdvcrx
86aaa5519e
Add maxAge config to cache CORS preflight request 2023-01-19 18:06:18 +08:00
Brian Cao
cd400bcef2 Fix regex. 2023-01-18 16:36:28 -08:00
Brian Cao
922c3acab3
Fix share URL permissions. (#1745)
* Fix share URL permissions.

* Add sql param logic.

* Add permissions to edit website.

* Update permissions.

* Move parameters to param injection.

* Sanitize eventdata.

* Remove caret.

* Fix avg.
2023-01-18 15:09:49 -08:00
Mike Cao
1d9c3133f0 Refactored layout. Added NavBar component. 2023-01-18 15:05:39 -08:00
Mike Cao
558ce268a0
Merge pull request #1742 from SamAsEnd/master
Created a file for am-ET language
2023-01-17 12:49:56 -08:00
Francis Cao
529b7a35c3 add pgcrypto to postgres via extension preview 2023-01-17 10:36:16 -08:00
Francis Cao
1bb33f7aff clean-up migrate data param 2023-01-16 12:14:50 -08:00
Francis Cao
aba5b9362e refactor migrate-db 2023-01-16 11:59:55 -08:00
Samson Endale
5c134f3a2e Created a file for am-ET language 2023-01-14 12:56:06 +03:00
Mike Cao
05c7196bc6
Merge pull request #1734 from kiprasmel/lt-lang-upd-1
update lt-LT lang + create README how to update translations
2023-01-13 17:38:12 -08:00
Mike Cao
1758ae782d
Merge pull request #1736 from umami-software/dependabot/npm_and_yarn/json5-1.0.2
Bump json5 from 1.0.1 to 1.0.2
2023-01-13 17:36:56 -08:00
Mike Cao
92398c04f7
Merge pull request #1738 from lnxd/th-language-update
Updates to th-TH translation
2023-01-13 17:36:14 -08:00
Mike Cao
48286ec1ce
Merge pull request #1737 from stoXmod/add-sinhala-language
Added sinhala language
2023-01-13 16:56:58 -08:00
Francis Cao
65fe29c385 add mysql migration_v2 file, refactor migrate-db 2023-01-13 11:54:22 -08:00
Brian Cao
fad38dc180 Merge remote-tracking branch 'origin/dev' into dev 2023-01-12 00:02:17 -08:00
Brian Cao
1eb9e10d94 Re-write CH queries to use query params. 2023-01-12 00:02:12 -08:00
lnxd
fabe90d99d
Translated label.search 2023-01-12 18:31:01 +11:00
lnxd
2492b0b9ad
Translated label.yesterday 2023-01-12 18:25:15 +11:00
lnxd
17d37fb15b
Translated label.add-column
Using สร้างคอลัมน์ as it appears in Google Sheets for a button with the same function
2023-01-12 18:22:43 +11:00
lnxd
38ebf49827
Translated label.add-filter
Added "สร้างตัวกรอง" as this is the translation they use for the same button in gmail.
2023-01-12 18:15:54 +11:00
lnxd
434b86cf19
Translated metrics.query-parameters
The technical term "Query" doesn't seem to exist in Thai, and Thai developers refer to this feature as a "URL Parameter".

I was unsure between "พารามิเตอร์ URL" and "มาตรวัด URL", but I'm going with "พารามิเตอร์ URL" as it exists in documentation by Meta/Facebook.
2023-01-12 18:00:27 +11:00
lnxd
4419a25f97
Translated message.edit-dashboard 2023-01-12 17:43:02 +11:00
lnxd
c9c384871f
Corrected spelling to more standard version
Changed รีเซต to รีเซ็ต (more standardised spelling)
2023-01-12 16:34:14 +11:00
lnxd
613bf86014
Corrected word choice
Changed from "ต้องการ" sounding more like "wanted" to "จำเป็น" meaning "necessary"
2023-01-12 16:29:20 +11:00
Francis Cao
96de650a67 add logic for database type 2023-01-11 16:19:20 -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
Francis Cao
ac2b79c5cf move migrateData into its own function 2023-01-10 16:03:44 -08:00
Francis Cao
b05b18e736 update checkV1Tables check 2023-01-10 15:01:41 -08:00
Francis Cao
9cc0588175 fix transaction bug 2023-01-10 09:54:16 -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
stoXmod
d199065d3a Improve sinhala font and added to language select menu 2023-01-10 12:38:57 +05:30
Francis Cao
0cb33a9c73 add check migration, use prisma transaction 2023-01-09 13:14:30 -08:00
stoXmod
c40c2e15c3 Added sinhala language 2023-01-09 18:13:50 +05:30
dependabot[bot]
4c79c7054e
Bump json5 from 1.0.1 to 1.0.2
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-08 08:42:34 +00: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
Kipras Melnikovas
d7920543c3 update lt-LT lang
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2023-01-06 05:10:37 +02:00
Kipras Melnikovas
ecc4e0b889 create README for lang/ - how to update translations
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2023-01-06 05:10:37 +02:00
Francis Cao
19166e580e add mysql schema file 2023-01-05 14:40:34 -08:00
Francis Cao
f10694d07e create new mysql schema file 2023-01-05 11:13:49 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Francis Cao
5f159ed5ce add final success prompt 2023-01-04 11:15:19 -08:00
Francis Cao
b845ae547d fix v1 replace bug 2023-01-04 11:03:28 -08:00
Francis Cao
1cd195d895 add delete v1 table prompt 2023-01-04 10:07:58 -08:00
Francis Cao
3cf0617366 add warning message during data transfer 2023-01-04 00:26:31 -08:00
Francis Cao
c24f8cb985 add data migration script 2023-01-03 13:16:29 -08:00
Francis Cao
0a731e3408 run rawsql for 01_init 2023-01-03 12:50:08 -08:00
Mike Cao
170b30b391 CSS fix. 2023-01-03 12:31:55 -08:00
Francis Cao
2a5927e345 update migrations 2023-01-03 09:32:32 -08:00
Francis Cao
8f686db116 fix rename to v1_ 2023-01-02 16:58:52 -08:00
Francis Cao
82e6728e1e fix index drop 2023-01-02 16:53:20 -08:00
Francis Cao
660c810ec1 add prisma table PK 2023-01-02 16:47:48 -08:00
Francis Cao
b46a0c179f add migration node script 2023-01-02 16:34:58 -08:00
Mike Cao
f3879c92e1 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	lib/middleware.ts
#	pages/api/users/[id]/index.ts
#	pages/api/users/index.ts
#	pages/api/websites/[id]/active.ts
#	pages/api/websites/[id]/eventdata.ts
#	pages/api/websites/[id]/events.ts
#	pages/api/websites/[id]/index.ts
#	pages/api/websites/[id]/metrics.ts
#	pages/api/websites/[id]/pageviews.ts
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/[id]/stats.ts
#	yarn.lock
2022-12-31 13:54:44 -08:00
Francis Cao
f42cab8d83
Merge pull request #1719 from umami-software/feat/um-138-remove-prisma-foreign-key
Feat/um 138 remove prisma foreign key
2022-12-29 15:12:34 -08:00
Brian Cao
eb2f07c105 Event Data maximum size. 2022-12-29 14:51:51 -08:00
Mike Cao
db6a6d6055 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	components/forms/UserPasswordForm.js
#	components/pages/Dashboard.js
2022-12-28 15:49:28 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Brian Cao
b243f0a319 Fix Icon. 2022-12-28 12:56:22 -08:00
Brian Cao
74d2cd8d03
Feat/um 140 password modal (#1718)
* Change password to modal.

* Close on save.
2022-12-28 12:37:09 -08:00
Mike Cao
7bbed0e12b Changed HASH_SALT to APP_SECRET. 2022-12-27 21:38:23 -08:00
Mike Cao
cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -08:00
Francis Cao
1472e205a3 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-138-remove-prisma-foreign-key 2022-12-27 16:52:04 -08:00
Francis Cao
8ee7172ea0 drop foreign keys, add missing indexes 2022-12-27 16:26:25 -08:00
Brian Cao
561cde6e7e
Add admin check. (#1716)
* Add admin check.

* Fix teamId check.
2022-12-27 15:18:58 -08:00
Mike Cao
c90bd941b5 Merge remote-tracking branch 'origin/dev' into dev 2022-12-27 00:00:42 -08:00
Mike Cao
aef7326f4c Added access_code column to teams. 2022-12-27 00:00:31 -08:00
Brian Cao
ef9d915592 Fix event var names. 2022-12-26 23:21:54 -08:00
Mike Cao
dff105c747 Updated prisma and redis clients. 2022-12-26 21:51:16 -08:00
Mike Cao
c05d116875 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2022-12-26 20:51:08 -08:00
Mike Cao
ad15466028 Updated packages. 2022-12-26 20:50:55 -08:00
Mike Cao
677566b5f3
Merge pull request #1714 from umami-software/feat/um-136-camel-case
Remove snake_case.
2022-12-26 20:49:38 -08:00
Brian Cao
a91386434d Remove snake_case. 2022-12-26 17:36:48 -08:00
Brian Cao
e1f99a7d01
Rewrite admin. (#1713)
* Rewrite admin.

* Clean up password forms.

* Fix naming issues.

* CSS Naming.
2022-12-26 16:57:59 -08:00
mike
f4db04c3c6 Update to react-basics v0.40. 2022-12-20 23:01:47 -08:00
mike
1d36a8a46b Update to react-basics v0.39. 2022-12-20 16:38:00 -08:00
Mike Cao
1fcaa1c9fc Updated log messages. 2022-12-14 23:13:57 -08:00
Mike Cao
4c202741c2 Fixed share page. 2022-12-13 11:27:55 -08:00
Mike Cao
cb4c8accea Fixed admin checks. 2022-12-13 08:41:13 -08:00
Mike Cao
da49543b91 Merge branch 'dev' into analytics 2022-12-12 20:51:12 -08:00
Mike Cao
4cc22fcc95 Fix event data check. 2022-12-12 20:46:43 -08:00
Brian Cao
8732d056dd
Dev (#1702)
* Initial Typescript models.

* Re-add realtime data

* get distinct sessions for session metrics

* Add queries for new schema.

* Fix Typo.

* Add some api/team endpoints.

* Fix destructure error.

* Fix getWebsites call.

* Ignore typescript build errors.

* Fix enum issue.

* add clickhouse route to deleteWebsite

* Fix Website auth.

* Updated lint-staged config.

* Add permission checks.

* Add user role api.

* Fix error when updating website.

* Fix isAdmin check.  Fix Schema.

* Initial conversion to react-basics.

* Remove user/team transfer from website update.

* delete website in relational query

* Fix login secure token creation.

* Add event type to event.

* Allow user to be added to team with role.

* Updated login form.

* Add Role to TeamUser.

* Add database migration.

* Refactored permissions check. Updated redis lib.

* Feat/um 114 roles and permissions (#1683)

* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions

* Add 02 migration.

* Added lib/types.

* Updated schema.

* Updated roles and permissions logic.

* Implement react-basics styles. Fix queries.

* Update website details layout.

* Add 01 migration.

* Fix admin create.

* Update react-basics.

Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>
2022-12-12 19:45:38 -08:00
Brian Cao
e4fe22233c Update react-basics. 2022-12-12 16:46:46 -08:00
Brian Cao
4501951336 Fix admin create. 2022-12-12 12:31:56 -08:00
Brian Cao
8097428a4b Add 01 migration. 2022-12-12 12:04:31 -08:00
Mike Cao
e8e90a5451 Update website details layout. 2022-12-10 14:26:52 -08:00
Mike Cao
0a6ecfe3d2 Implement react-basics styles. Fix queries. 2022-12-08 23:43:43 -08:00
Mike Cao
b57ecf33e6 Updated roles and permissions logic. 2022-12-06 18:36:41 -08:00
Mike Cao
4eb3140e43 Updated schema. 2022-12-05 13:03:02 -08:00
Mike Cao
849c0f9bc8 Merge remote-tracking branch 'origin/dev' into dev 2022-12-02 14:15:45 -08:00
Mike Cao
4781a0cc8c Added lib/types. 2022-12-02 14:15:24 -08:00
Brian Cao
b40630f9d4 Merge remote-tracking branch 'origin/dev' into dev 2022-12-01 22:06:39 -08:00
Brian Cao
4ef48a8f4b Add 02 migration. 2022-12-01 22:06:36 -08:00
Brian Cao
06bebadbb9
Feat/um 114 roles and permissions (#1683)
* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions
2022-12-01 20:53:37 -08:00
Mike Cao
a4e80ca3e5 Refactored permissions check. Updated redis lib. 2022-12-01 10:58:50 -08:00
Brian Cao
1a7369e1f6 Merge branch 'feat/um-114-roles-and-permissions' into dev 2022-11-30 09:35:23 -08:00
Brian Cao
77b739870e Add database migration. 2022-11-29 21:56:43 -08:00
Brian Cao
0a9089a463 Merge remote-tracking branch 'origin/dev' into dev 2022-11-28 13:08:49 -08:00
Brian Cao
d5437c895e Add Role to TeamUser. 2022-11-28 13:08:48 -08:00
Mike Cao
fe01574b16 Updated login form. 2022-11-28 11:14:24 -08:00
Brian Cao
502facd426 Allow user to be added to team with role. 2022-11-22 22:17:49 -08:00
Brian Cao
d85b2be5f8 Add event type to event. 2022-11-22 15:06:52 -08:00
Brian Cao
c90194dad4 Merge remote-tracking branch 'origin/dev' into dev 2022-11-21 23:23:20 -08:00
Brian Cao
9172098fa7 Fix login secure token creation. 2022-11-21 23:23:16 -08:00
Francis Cao
9e6dae2e55 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 22:51:28 -08:00
Francis Cao
5da7a208a8 delete website in relational query 2022-11-21 22:51:23 -08:00
Mike Cao
f98a97ef83 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 22:33:13 -08:00
Brian Cao
3efd2a5b10 Remove user/team transfer from website update. 2022-11-21 22:32:59 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Brian Cao
d60ad1c782 Fix isAdmin check. Fix Schema. 2022-11-21 16:44:42 -08:00
Brian Cao
371425ab60 Fix error when updating website. 2022-11-21 11:39:59 -08:00
Mike Cao
c0a18e13fa Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-21 10:08:14 -08:00
Brian Cao
82d1f1ba2c Merge branch 'feat/um-23-new-schema' into dev 2022-11-20 22:24:51 -08:00
Brian Cao
6719f5b37c Merge branch 'dev' into feat/um-23-new-schema 2022-11-20 22:24:48 -08:00
Brian Cao
8fc6e99aa8 Add user role api. 2022-11-20 22:24:31 -08:00
Mike Cao
1e5174c211 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:09:40 -08:00
Mike Cao
8bc3b288db
Merge pull request #1668 from umami-software/feat/um-23-new-schema
Feat/um 23 new schema
2022-11-20 21:09:32 -08:00
Mike Cao
df50d9cefc Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-20 21:04:53 -08:00
Brian Cao
78225691df Add permission checks. 2022-11-20 00:48:13 -08:00
Mike Cao
817880b511 Updated lint-staged config. 2022-11-19 18:28:46 -08:00
Brian Cao
51e2331315 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 18:50:19 -08:00
Brian Cao
2e01226b46 Merge branch 'feat/um-23-new-schema' into dev 2022-11-18 18:50:11 -08:00
Brian Cao
e28ee6597a Fix Website auth. 2022-11-18 18:49:58 -08:00
Francis Cao
3eb1d783de Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-11-18 12:08:23 -08:00
Francis Cao
eaa208652d add clickhouse route to deleteWebsite 2022-11-18 12:08:13 -08:00
Brian Cao
1af93a17a3 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 11:22:22 -08:00
Brian Cao
90fbe9abee Merge branch 'feat/um-23-new-schema' into dev 2022-11-18 11:22:10 -08:00
Brian Cao
ce02958bc2 Fix enum issue. 2022-11-18 11:22:03 -08:00
Brian Cao
ac5ec730d2 Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 10:34:17 -08:00
Mike Cao
21072c712c Ignore typescript build errors. 2022-11-18 10:00:12 -08:00
Mike Cao
2b10802e07 Fix getWebsites call. 2022-11-18 09:47:06 -08:00
Mike Cao
4fd12c6c93
Merge pull request #1664 from umami-software/feat/um-23-new-schema
Feat/um 23 new schema
2022-11-18 03:22:59 -08:00
Mike Cao
4bc3d46efb Merge branch 'dev' into feat/um-23-new-schema 2022-11-18 03:21:55 -08:00
Mike Cao
803ce54fef Merge remote-tracking branch 'origin/dev' into dev 2022-11-18 03:21:13 -08:00
Mike Cao
bba8876522 Fix destructure error. 2022-11-18 03:20:45 -08:00
Brian Cao
25279271ce Add some api/team endpoints. 2022-11-18 00:27:42 -08:00
Brian Cao
f5eb974d8d Fix Typo. 2022-11-17 22:46:05 -08:00
Brian Cao
5aa8187e42 Add queries for new schema. 2022-11-17 22:27:33 -08:00
Francis Cao
e3142e93f0 get distinct sessions for session metrics 2022-11-17 18:09:03 -08:00
Brian Cao
b0c7980a20 Merge branch 'dev' into feat/um-23-new-schema 2022-11-16 18:34:03 -08:00
Mike Cao
94848cc41b Merge branch 'dev' into analytics 2022-11-16 11:59:31 -08:00
Mike Cao
592c3fa6e6 Merge remote-tracking branch 'origin/dev' into dev 2022-11-16 11:45:04 -08:00
Mike Cao
8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Francis Cao
106dd25594 clickhosue: validate string being sent into event_data 2022-11-16 11:42:02 -08:00
Brian Cao
f3726e5abf Re-add realtime data 2022-11-16 10:32:02 -08:00
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Brian Cao
04e9f06e93 Merge branch 'dev' into feat/um-23-new-schema 2022-11-15 13:20:47 -08:00
Mike Cao
f0a072ca9b
Merge pull request #1653 from umami-software/dev
merge dev to analytics
2022-11-15 11:52:14 -08:00
Mike Cao
9ee6fb994c
Merge pull request #1650 from umami-software/app
v1.39.5
2022-11-13 17:56:07 -08:00
Mike Cao
545f1f901d Bump version 1.39.5. 2022-11-13 17:43:19 -08:00
Mike Cao
6145b31ce5 Make bot check return 200. Closes #1555 2022-11-12 21:11:07 -08:00
Mike Cao
2555ee09d1 Added Croatian language. 2022-11-12 21:03:47 -08:00
Mike Cao
091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao
e9b1869eb8 Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 09:44:08 -08:00
Mike Cao
1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Brian Cao
7271951871 Merge branch 'dev' into analytics 2022-11-10 12:27:36 -08:00
Brian Cao
563589393a Update schema table names. 2022-11-10 11:58:43 -08:00
Brian Cao
73a57cd2cf fix casing 2022-11-10 11:08:40 -08:00
Mike Cao
c443d83654
Merge pull request #1637 from ariaieboy/fa-update
Update fa-IR.json
2022-11-10 04:49:32 -08:00
Mike Cao
7b0b44b18d
Merge pull request #1640 from Maxime-J/fr-fr-date-format
custom fr-FR date format
2022-11-10 04:48:58 -08:00
Mike Cao
d1bc42f1b5
Merge pull request #1647 from ShizuMilof/patch-1
Create hr-HR.json
2022-11-10 04:48:13 -08:00
Mike Cao
cd9036adaf Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 04:47:24 -08:00
Mike Cao
c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Brian Cao
30743feb0e Add Reset / Delete functionality. 2022-11-09 22:46:50 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Brian Cao
6ee27a7e53 Fix typo on getMetrics. 2022-11-09 16:10:20 -08:00
Brian Cao
7bf12cc552 Assign user to userStore 2022-11-09 13:54:09 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Brian Cao
df84a16b95 Add external uuid to user create. 2022-11-09 10:59:03 -08:00
Mike Cao
d2100c33b7 Update auth logic. 2022-11-09 10:16:50 -08:00
Mike Cao
76cad96a24 Updated auth to check for uuid. 2022-11-09 10:15:21 -08:00
Mike Cao
8a74138e17 Fixed website create. 2022-11-09 07:40:17 -08:00
Mike Cao
3b705e6cb4 Fetch user inside useAuth. 2022-11-09 06:40:36 -08:00
ShizuMilof
6a2ea9f7cc
Create hr-HR.json 2022-11-09 09:42:02 +01:00
Mike Cao
1bce4f2174 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 22:59:01 -08:00
Mike Cao
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Brian Cao
9067d51172 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 17:47:23 -08:00
Brian Cao
4fbcf68b22 fix save event/pageview for CH 2022-11-08 17:47:19 -08:00
Mike Cao
1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Brian Cao
e9c8d16d5b pass in correct arguments to save pageview/event 2022-11-08 16:45:23 -08:00
Brian Cao
c2df477374 skip session check if using clickhouse 2022-11-08 15:50:34 -08:00
Brian Cao
224e9b3718 fix session get 2022-11-08 15:42:46 -08:00
Brian Cao
648a5341e5 fix useAuth 2022-11-08 12:51:04 -08:00
Mike Cao
208fcb8418 Added redis check to verify. 2022-11-08 12:28:45 -08:00
Brian Cao
13fd3ccd16
api and lib fixes (#1643) 2022-11-08 11:55:02 -08:00
Mike Cao
168283bf11 Merge remote-tracking branch 'origin/dev' into dev 2022-11-07 22:35:59 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Francis Cao
6a0d5ee1e6 add rev_id to CH schema 2022-11-07 18:03:27 -08:00
Mike Cao
3485b6268b Added rev_id column. Updated redis calls. 2022-11-07 16:22:49 -08:00
Maxime-J
268c036632 custom fr-FR date format 2022-11-07 18:38:43 +00:00
Mike Cao
a9112f39ec Updated schema. 2022-11-04 16:15:26 -07:00
Mike Cao
6b13d3eaa3 Added eslint declarations. 2022-11-03 21:33:37 -07:00
AriaieBOY
e241008cd5
Update fa-IR.json 2022-11-03 21:18:23 +03:30
Mike Cao
990d76ff45
Update docker server url. 2022-11-03 08:52:47 -07:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -07:00
Mike Cao
05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Mike Cao
cb3895e565
Merge pull request #1628 from umami-software/feat/um-23-v2-schema-init
Feat/um 23 v2 schema init
2022-11-01 10:41:16 -07:00
Brian Cao
075d77abac change const 2022-11-01 09:56:43 -07:00
Mike Cao
0d897e957a
Merge pull request #1629 from umami-software/app
v1.39.4
2022-11-01 08:12:09 -07:00
Brian Cao
689b732829 Merge branch 'dev' into feat/um-23-v2-schema-init 2022-10-31 23:48:12 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
d5fd333633 Bump version v2.0.0-beta.1. 2022-10-31 20:33:06 -07:00
Mike Cao
486ac3fad1 Merge branch 'app' into dev 2022-10-31 20:31:54 -07:00
Mike Cao
dbe6884016 Bump version v1.39.4. Updated packages, languages. 2022-10-31 20:30:02 -07:00
Mike Cao
5d73a9c4b4 Merge remote-tracking branch 'origin/app' into dev 2022-10-31 20:21:19 -07:00
Mike Cao
1c69577683
Merge pull request #1627 from umami-software/bug/um-92-delete-account
fix account delete bug
2022-10-31 20:05:28 -07:00
Brian Cao
3a617b7bfa fix account delete bug 2022-10-31 18:50:05 -07:00
Mike Cao
c58e037a7e Updated useConfig. Added SSO page. 2022-10-31 11:02:37 -07:00
Mike Cao
e558192790
Merge pull request #1617 from umami-software/bug/um-90-owner-not-updating
change owner by id
2022-10-31 10:46:22 -07:00
Brian Cao
572df48667 assign backup 2022-10-31 10:38:37 -07:00
Mike Cao
be677cf962
Merge pull request #1611 from RikoDEV/patch-1
Update pl-PL.json
2022-10-30 10:18:57 -07:00
Mike Cao
a632ef39b3
Merge pull request #1613 from enricopaulini/master
Update pt-BR
2022-10-30 10:18:28 -07:00
Brian Cao
d32d5e75e9 change owner by id 2022-10-29 15:50:29 -07:00
Mike Cao
f10c8ba9e2 Merge branch 'app' into dev 2022-10-28 20:49:55 -07:00
Mike Cao
246e4e5f4f Fix disable checks. 2022-10-28 10:34:50 -07:00
Mike Cao
98835bbc78 Define uiDisabled at build time. 2022-10-27 17:02:54 -07:00
Mike Cao
fc9584eb44 Refactor env check. 2022-10-27 16:42:57 -07:00
enricopaulini
5d07681ab9 Update pt-BR
Update the messages/pt-BR.json file
2022-10-27 20:18:16 -03:00
Mike Cao
ba63991a92
Merge pull request #1612 from umami-software/feat/um-76-turn-off-ui
Feat/um 76 turn off UI
2022-10-27 16:00:18 -07:00
Brian Cao
08ec801fdc remove GSS from 404 2022-10-27 14:48:21 -07:00
Brian Cao
99c975c329 add DISABLE_UI, DISABLE_ADMIN 2022-10-27 12:14:34 -07:00
RikoDEV
bea9870200
Update pl-PL.json 2022-10-27 19:01:36 +02:00
Brian Cao
736f06442c Merge branch 'dev' into feat/um-76-turn-off-ui 2022-10-26 22:39:39 -07:00
Mike Cao
ab4a60f814
Merge pull request #1605 from umami-software/app
v1.39.3
2022-10-26 16:02:00 -07:00
Brian Cao
34791c3f14 bump version 1.39.3 2022-10-26 15:56:37 -07:00
Mike Cao
ee8d689cd1
Merge branch 'master' into app 2022-10-26 15:20:08 -07:00
Mike Cao
168a55b73a
Merge pull request #1594 from aidanm1999/feature/2022-10/netlify-nextjs-runtime
Adding the Next.js runtime to Netlify
2022-10-26 15:11:43 -07:00
Brian Cao
18e7462fe8 Merge branch 'dev' into app 2022-10-26 13:09:42 -07:00
Brian Cao
a49638b4c7 Merge branch 'feat/um-86-fix-website-update' into dev 2022-10-26 11:38:41 -07:00
Brian Cao
7eb9bf46e1 Merge branch 'feat/um-86-fix-website-update' into app 2022-10-26 11:37:16 -07:00
Brian Cao
1d6f158509 fix id/uuid 2022-10-26 11:36:58 -07:00
Mike Cao
72b4cbf406
Merge branch 'dev' into feature/2022-10/netlify-nextjs-runtime 2022-10-25 22:53:10 -07:00
Mike Cao
d05fd2bd3d Refactor redis calls. 2022-10-25 20:17:13 -07:00
Mike Cao
aceb904398
v1.39.2 (#1599)
* Fixed issue with realtime page rendering.

* fix auth, add pg extension (#1596)

* Fixed change password issue. API refactoring. Closes #1592.

* Fixed account lookup.

* Fixed issue with accessing user dashboards. Closes #1590

* fix sort on dashboard (#1600)

Co-authored-by: Brian Cao <brian@umami.is>
2022-10-25 16:50:12 -07:00
Brian Cao
7f3db334f5
fix sort on dashboard (#1600) 2022-10-25 16:48:39 -07:00
Brian Cao
1d808f1b1f Merge branch 'dev' into feat/um-76-turn-off-ui 2022-10-25 16:24:47 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
Mike Cao
46a18f2918 Fixed account lookup. 2022-10-25 11:01:28 -07:00
Mike Cao
2ad5cd9335 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/auth.js
2022-10-25 10:46:32 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Brian Cao
ebf439c598
fix auth, add pg extension (#1596) 2022-10-25 10:27:43 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Aidan Marshall
574dbff07e Adds @netlify/plugin-nextjs package & fixed dashboard link id 2022-10-25 15:01:49 +01:00
Mike Cao
94dc915272
Merge pull request #1582 from umami-software/dev
Fixed share page issue.
2022-10-24 19:50:34 -07:00
Mike Cao
2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -07:00
Mike Cao
80f22313f6
Merge pull request #1580 from umami-software/dev
v1.39
2022-10-24 18:03:43 -07:00
Mike Cao
fc879bbb7d Bump version 1.39.0. 2022-10-24 16:37:47 -07:00
Mike Cao
59fdaf580f Fixed share page. 2022-10-24 16:28:20 -07:00
Mike Cao
5429ffc1a6 Bump version. 2022-10-24 15:47:02 -07:00
Mike Cao
99c8752aa5 Add guard around location redirect. 2022-10-24 15:25:07 -07:00
Mike Cao
4bad94f436 Upgraded Next and Prisma. 2022-10-24 15:21:30 -07:00
Mike Cao
3e550f8f14 Updated language bundles. 2022-10-24 12:17:21 -07:00
Mike Cao
abe5bb5b84
Merge pull request #1576 from mikusaa/master
Update zh-CN.json
2022-10-24 12:12:41 -07:00
mikusa
35d57f4b79
Update zh-CN.json
Add translations for Yesterday date-range option.
2022-10-24 10:46:37 +08:00
Brian Cao
500a2b9663 fix column names 2022-10-21 22:30:52 -07:00
Brian Cao
a320d65652 default column/filters 2022-10-21 22:19:51 -07:00
Brian Cao
ba31f48f1a
Feat/um 49 query builder api (#1573)
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
2022-10-21 21:33:23 -07:00
mike
9c36dc485e Removed update-db step. 2022-10-18 14:23:17 -07:00
Mike Cao
6147c3502a
Merge pull request #1567 from umami-software/feat/um-69-nice
add cloud_mode
2022-10-12 17:33:54 -07:00
Brian Cao
9e8748e2f3 checkpoint 2022-10-12 16:29:44 -07:00
Mike Cao
e429abc08e Added error conditions for website updates. 2022-10-12 15:52:31 -07:00
Brian Cao
db1ae3f2c7 add cloud_mode 2022-10-12 15:35:33 -07:00
Mike Cao
4e756727ed Merge remote-tracking branch 'origin/dev' into dev 2022-10-12 13:11:55 -07:00
Mike Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -07:00
Brian Cao
9147415761 add index to uuid 2022-10-12 12:20:20 -07:00
Mike Cao
c33729e185 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-10-11 23:48:05 -07:00
Mike Cao
71badb8d52
Merge pull request #1566 from umami-software/feat/um-66-update-clickhouse-schema-uuid
Feat/um 66 update clickhouse schema UUID
2022-10-11 23:29:22 -07:00
Brian Cao
249f02d073 fix schema 2022-10-11 23:10:32 -07:00
Brian Cao
07d003e858 fix collect 2022-10-11 23:09:06 -07:00
Mike Cao
8627782137 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/settings/WebsiteSettings.js
#	pages/api/websites/[id]/index.js
2022-10-11 21:51:47 -07:00
Brian Cao
61df707765 Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 21:51:20 -07:00
Mike Cao
5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -07:00
Mike Cao
9a90d2e88f
Merge pull request #1563 from umami-software/feat/um-66-update-clickhouse-schema-uuid
Feat/um 66 update clickhouse schema UUID
2022-10-11 21:46:16 -07:00
Brian Cao
317d3c6637 fix schema script 2022-10-11 21:02:15 -07:00
Brian Cao
bce4476d12 fix reset/delete 2022-10-11 19:43:02 -07:00
Brian Cao
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Brian Cao
b0bed5e73a Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 10:31:15 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
4073d57e64 roll back id adds 2022-10-10 17:01:48 -07:00
Brian Cao
ec6454aead Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-10 16:20:07 -07:00
Brian Cao
78338205a3
Feat/um 62 prisma property names (#1562)
* checkpoint

* fix pg schema

* fix mysql schema

* change property names
2022-10-10 13:42:18 -07:00
Francis Cao
96add409b6 update api to new CH columns 2022-10-08 16:12:33 -07:00
Mike Cao
36edbe2f4c
Merge pull request #1554 from SeesawLiu/patch-1
Update Website id from getWebsiteByUuid.js
2022-10-08 10:18:42 -07:00
刘岗
6f6cbaa098
Update getWebsiteByUuid.js
if redis website set from getWebsiteByUuid,the value is 1 forever
2022-10-08 13:46:50 +08:00
Mike Cao
aa64b76518 Merge remote-tracking branch 'origin/dev' into dev 2022-10-07 17:13:32 -07:00
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
73e7f647c0
Merge pull request #1551 from sergiomensing/fix-color-dots-in-realtime-logs
Fix unique dot colors in the realtime logs
2022-10-07 16:34:51 -07:00
Brian Cao
dcf16e1411 fix redis init 2022-10-06 16:41:37 -07:00
Mike Cao
e442617421 Add connect methods to libraries. 2022-10-06 15:00:16 -07:00
Mike Cao
186f484ff1 Merge branch 'dev' into analytics 2022-10-06 14:19:19 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Brian Cao
6bb61d7a53 Revert "remove postgres collect"
This reverts commit 86bd9a7793.
2022-10-06 13:48:24 -07:00
Brian Cao
0e10470c02 Revert "break CH fetch"
This reverts commit 5dd395918f.
2022-10-06 13:47:40 -07:00
Brian Cao
f53ea06c23 Revert "reject"
This reverts commit 5fd3ba3809.
2022-10-06 13:47:34 -07:00
Brian Cao
76c0057d2e Revert "do not collect"
This reverts commit 75cba808e3.
2022-10-06 13:47:22 -07:00
Brian Cao
75cba808e3 do not collect 2022-10-06 13:44:23 -07:00
Brian Cao
5fd3ba3809 reject 2022-10-06 13:35:38 -07:00
Brian Cao
5dd395918f break CH fetch 2022-10-06 13:29:55 -07:00
Brian Cao
86bd9a7793 remove postgres collect 2022-10-06 13:13:44 -07:00
Brian Cao
ae46520930 Merge branch 'dev' into analytics 2022-10-06 13:07:08 -07:00
Brian Cao
0387cf0da0 remove CH import 2022-10-06 12:49:49 -07:00
Brian Cao
46b3da1b07 Merge branch 'dev' into analytics 2022-10-05 16:08:45 -07:00
Sergio Mensing
e8a30e7251 use slice instead of substring for desired result 2022-10-05 14:44:49 +02:00
Mike Cao
f3135ee867 Get account by uuid for cloud operations. 2022-10-04 20:16:09 -07:00
Mike Cao
d784b2a8db Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	pages/api/account/index.js
2022-10-03 17:17:53 -07:00
Mike Cao
d6854d4ff9
Merge pull request #1548 from umami-software/feat/um-58-account-uuid
Feat/um 58 account UUID
2022-10-03 11:40:51 -07:00
Brian Cao
a2ce1d833d update check-db 2022-10-03 11:14:19 -07:00
Brian Cao
6de634f0b4 add mysql changes 2022-10-02 20:42:32 -07:00
Brian Cao
adb0a06006 add uuid to account 2022-09-30 22:27:47 -07:00
Mike Cao
5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -07:00
Brian Cao
d4abe51331 remove database_type from prisma getdb function 2022-09-28 15:36:41 -07:00
Brian Cao
b3d7d49448
Fix timezone bug (#1543) 2022-09-27 17:18:16 -07:00
Mike Cao
add7c5ebe9
Merge pull request #1531 from userdehghani/pr-blank-target
open update links in new tab
2022-09-24 18:36:18 -07:00
Brian Cao
78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Mike Cao
dfac7e1af5 Updated Kafka loading process. 2022-09-22 10:36:23 -07:00
Mike Cao
0b163274ba Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-21 21:59:46 -07:00
Francis Cao
55218d1ddd
Francis/uc 37 secure kafka (#1532)
* add ssl encryption to kafka client

* fix missing columns in getPageview CH. fix Kafka SSL Pathing
2022-09-21 11:31:52 -07:00
Mohammad Amin Dehghani
e92cb29025 open update links in new tab 2022-09-21 17:49:18 +04:30
Mike Cao
3932583bc9
Merge pull request #1529 from ariaieboy/patch-1
Update RealtimeLog to decode the urls
2022-09-19 17:39:34 -07:00
AriaieBOY
d8eb22932b
Update RealtimeLog.js 2022-09-19 19:28:52 +04:30
Mike Cao
b12bfb2f2f
Merge pull request #1515 from umami-software/brian/uc-35-merge-tables-ch
Brian/uc 35 merge tables ch
2022-09-13 10:32:32 -07:00
Brian Cao
dd54fb3d2c combine logic 2022-09-13 09:18:58 -07:00
Brian Cao
c73d07d329 clarified var 2022-09-13 09:16:21 -07:00
Mike Cao
ea427f9366 Merge branch 'master' into dev 2022-09-12 14:38:50 -07:00
Mike Cao
0cb14f3f6c
Merge pull request #1508 from roywangdev/patch-1
Update package.json
2022-09-12 14:38:10 -07:00
Mike Cao
fb6aabaf06 Updated language bundles. 2022-09-12 14:36:27 -07:00
Brian Cao
8e068310b8 remove CH migration 2022-09-12 10:12:17 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
ROYWANG
a4a3cdeb9f
Update package.json 2022-09-09 22:33:39 +08:00
Mike Cao
6941efa26d
Merge pull request #1499 from AliMickey/patch-1
Update README.md
2022-09-07 14:04:32 -07:00
Micky
04c028697f
Update README.md
Change docker-compose to docker compose as per latest changes with Docker packaging.
2022-09-07 12:55:15 +10:00
Brian Cao
d377ef86e7 Merge branch 'dev' into brian/uc-35-merge-tables-ch 2022-09-06 12:13:47 -07:00
Mike Cao
24b2322987 Merge branch 'master' into dev 2022-09-06 12:04:37 -07:00
Mike Cao
405d264ad6 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-06 12:04:34 -07:00
Mike Cao
bf8ebde0b1 Bump version. 2022-09-06 12:04:08 -07:00
Mike Cao
d469a42189
Merge pull request #1492 from bilguun0203/master
Update mn-MN
2022-09-06 12:03:38 -07:00
Mike Cao
e2de28bbe2
Merge pull request #1493 from rebron1900/patch-1
Update zh-CN.json
2022-09-06 12:03:08 -07:00
Mike Cao
39803274aa
Merge pull request #1494 from umami-software/brian/um-38-redis-reconnect
Add retry connection to redis.  Clean up up redis/session logic
2022-09-06 11:55:36 -07:00
Brian Cao
99914d6e98 Add retry connection to redis. Clean up up redis/session logic 2022-09-05 22:47:45 -07:00
1900
73b0981788
Update zh-CN.json 2022-09-06 13:41:52 +08:00
Bilguun Ochirbat
4282b1fa28 Update mn-MN 2022-09-06 03:04:53 +00:00
Mike Cao
9916265150
Merge pull request #1479 from umami-software/dev
Merge Dev into Master
2022-09-05 18:40:21 -07:00
Mike Cao
81ca9c9665 Bump version. 2022-09-05 16:44:44 -07:00
Mike Cao
b829d84fc1 Merge remote-tracking branch 'origin/dev' into dev 2022-09-05 15:36:10 -07:00
Mike Cao
13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Mike Cao
52bbc3692d Fix issue with generating URLs. 2022-09-05 12:04:30 -07:00
Brian Cao
42bdfccdf4 Fix website get during collection/session check 2022-09-05 11:36:57 -07:00
Mike Cao
912b63da82 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-05 10:44:28 -07:00
Mike Cao
44e017c14a
Merge branch 'master' into dev 2022-09-03 23:19:08 -07:00
Mike Cao
9f6834925b
Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning
Admins can assign websites to non-admins
2022-09-03 23:17:06 -07:00
Mike Cao
8175791576
Merge pull request #1478 from Dhravya/patch-1
Fixed `TypeError: Cannot read properties of undefined (reading 'website_id')`
2022-09-03 23:15:11 -07:00
Mike Cao
ee3c9debb2
Merge branch 'dev' into patch-1 2022-09-03 23:15:03 -07:00
mike
935143d499 Updated language bundles. 2022-09-03 21:28:25 -07:00
Mike Cao
edfe3ad163
Merge pull request #1476 from umami-software/dependabot/npm_and_yarn/moment-timezone-0.5.35
Bump moment-timezone from 0.5.34 to 0.5.35
2022-09-03 21:24:47 -07:00
Mike Cao
0bbfbc04c3
Merge pull request #1463 from guigrpa/add-yesterday
Add yesterday option
2022-09-03 21:23:51 -07:00
Mike Cao
825daeee32
Merge pull request #1484 from Maxime-J/fr
Update fr-FR
2022-09-03 21:21:52 -07:00
Maxime-J
b37918acbb Update fr-FR 2022-09-03 14:45:08 +00:00
Brian Cao
0c33bb9e2d fix schema file. 2022-09-01 14:54:25 -07:00
Brian Cao
afe6d8994b fix redis connection. fix delete account 2022-09-01 11:11:11 -07:00
Mike Cao
04e9061dcf Updated language bundle. 2022-09-01 10:58:01 -07:00
Dhravya Shah
aaf0effcbb
Fixed TypeError: Cannot read properties of undefined (reading 'website_id') 2022-09-01 19:48:21 +05:30
Brian Cao
12704c81e5 set experiment. 2022-08-31 21:44:49 -07:00
dependabot[bot]
8bcdc54f93
Bump moment-timezone from 0.5.34 to 0.5.35
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.34 to 0.5.35.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.34...0.5.35)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 05:34:17 +00:00
Brian Cao
7c05a54ffe allow event data CH 2022-08-30 17:29:30 -07:00
Brian Cao
f3312732dc fix redis.client call 2022-08-30 15:54:33 -07:00
Brian Cao
f18b5a20e3 remove bigint 2022-08-30 13:56:37 -07:00
Mike Cao
2f21bb351e
Merge pull request #1474 from umami-software/brian/big-int-rollback
roll back bigint. add loading
2022-08-30 02:06:19 -05:00
Brian Cao
d53b4a8895 roll back bigint. add loading 2022-08-30 00:03:22 -07:00
Mike Cao
2da51ee931 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 20:57:58 -07:00
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Mike Cao
4cae9b261e
Merge pull request #1466 from guigrpa/bugfix-metric-card-keep-sign
Fixed bug in MetricCard: plus sign disappears on click.
2022-08-29 22:39:49 -05:00
Mike Cao
d4eddaa636
Merge pull request #1472 from wangyang0210/patch-2
Update zh-TW.json
2022-08-29 22:31:32 -05:00
Brian Cao
45e928c3a0 remove bigint convert 2022-08-29 16:46:28 -07:00
Brian Cao
727631a879 remove key 2022-08-29 16:35:50 -07:00
wangyang0210
cb1d355cad
Update zh-TW.json 2022-08-30 05:00:56 +08:00
Brian Cao
92acd8c1a7 fix CH query 2022-08-29 13:32:30 -07:00
Brian Cao
b6cd9f305b add db call as fallback 2022-08-29 13:04:58 -07:00
Brian Cao
9ddbd12060 re-add log 2022-08-29 10:47:31 -07:00
Brian Cao
48fe6ebcc5 configure redis 2022-08-29 10:47:01 -07:00
Mike Cao
efb52f5ff1 Fix crypto errors. 2022-08-29 08:31:16 -07:00
Mike Cao
5f07cecc95 Rename method to transaction. 2022-08-29 00:02:38 -07:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Mike Cao
1a6af8fc41 Update tracker to use no dependencies. 2022-08-28 15:55:18 -07:00
Mike Cao
8eef88ed1d Updated packages. 2022-08-27 22:51:52 -07:00
Mike Cao
467c7f289f Database refactoring. 2022-08-27 21:38:35 -07:00
Mike Cao
bb184dc2cc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/relational.js
2022-08-26 22:45:37 -07:00
Mike Cao
3327bcf5a3 Refactor get database type logic. 2022-08-26 22:43:31 -07:00
Brian Cao
5f7b6e8ccf add type 2022-08-26 22:01:40 -07:00
Brian Cao
b29cece7ef fix relational 2022-08-26 21:29:26 -07:00
Brian Cao
1ba7b76072 Merge branch 'brian/uc-33-kafka-optimizations' into dev 2022-08-26 21:10:53 -07:00
Brian Cao
54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao
8933150a9c Merge branch 'brian/uc-33-kafka-optimizations' into dev 2022-08-26 20:22:01 -07:00
Brian Cao
818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07:00
Mike Cao
a484a78261 Updated Next v.12.2.5 and Prisma v4.2.1. 2022-08-26 09:05:24 -07:00
Aidan Marshall
b388961b8b Features:
- Removes spellcheck for domain entry field
- Adds the ability to assign websites to other users if you are an admin
2022-08-26 17:22:46 +02:00
Guillermo Grau
e91bfed6be Fixed bug in MetricCard: plus sign disappears on click. 2022-08-26 16:40:32 +02:00
Guillermo Grau
166ab61e5d Updated public language files. 2022-08-26 10:50:48 +02:00
Guillermo Grau
66c60176c7 Add translations for Yesterday date-range option. 2022-08-26 10:44:47 +02:00
Guillermo Grau
b5c9690780 Added yesterday option in date range selector. 2022-08-26 10:36:46 +02:00
Brian Cao
10cc6616c5 add redis placeholder 2022-08-25 23:12:47 -07:00
Brian Cao
f1e0814f4b Merge branch 'dev' into brian/uc-33-kafka-optimizations 2022-08-25 22:43:33 -07:00
Brian Cao
f499af5491 fix refs 2022-08-25 22:43:22 -07:00
Brian Cao
7e9ed704cc fix ref 2022-08-25 22:23:19 -07:00
Brian Cao
c811577460 fix folders 2022-08-25 22:20:30 -07:00
Brian Cao
f69bd36223 fix migration 2022-08-25 22:05:34 -07:00
Brian Cao
bb50753704 split db files 2022-08-25 22:04:32 -07:00
Brian Cao
46b4b98d40 update kafka messaging 2022-08-25 11:07:47 -07:00
Mike Cao
8234b4264c Skip database check during CI. 2022-08-25 00:49:47 -07:00
Mike Cao
7ef4718c4e
Merge pull request #1446 from AkashRajpurohit/master
feat:  customize theme and locale based on query params
2022-08-25 02:38:03 -05:00
Brian Cao
9fea2fc77c Merge remote-tracking branch 'origin/dev' into dev 2022-08-23 14:26:47 -07:00
Brian Cao
c875096aa7 remove event_old drop 2022-08-23 14:26:44 -07:00
Mike Cao
39c0ea11c3 Updated request-ip package. 2022-08-23 12:12:28 -07:00
Mike Cao
f9e4838d88 Fix geo lookup for Vercel. 2022-08-23 12:09:03 -07:00
Mike Cao
d3f5f42d02 Fix geo lookup for Netlify. 2022-08-23 11:52:55 -07:00
Mike Cao
131a0968dd Added check-db back. 2022-08-23 11:41:35 -07:00
Mike Cao
09379ae501 Remove check-db for Netlify. 2022-08-23 11:25:59 -07:00
Brian Cao
dba44a4f93 Merge remote-tracking branch 'origin/dev' into dev 2022-08-23 10:49:53 -07:00
Brian Cao
3d7b3aa588 Run migration on build 2022-08-23 10:49:45 -07:00
Mike Cao
7e84da3a80 Updated Netlify config. 2022-08-23 10:01:51 -07:00
Mike Cao
549ef0295f Remove EXISTS causing migration failure. 2022-08-23 01:00:01 -07:00
Mike Cao
3137436588 Updated message bundles. 2022-08-23 00:51:37 -07:00
Mike Cao
700158f5f6 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-08-23 00:48:57 -07:00
Mike Cao
f75603025c
Merge pull request #1453 from umami-software/francis/uc-24-kafka-test
Francis/uc 24 kafka test
2022-08-23 02:08:36 -05:00
Mike Cao
c94cfb6441
Merge pull request #1449 from umami-software/brian/um-32-cascading-delete
Brian/um 32 cascading delete
2022-08-23 01:36:59 -05:00
Brian Cao
537ddde189 remove allow_agent 2022-08-22 23:21:44 -07:00
Brian Cao
18b7fc8626 fix dupes 2022-08-22 23:18:48 -07:00
Francis Cao
71c1b979da Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-22 23:05:45 -07:00
Francis Cao
2715a124de ch init formatting 2022-08-22 23:05:22 -07:00
Brian Cao
724ca6dc24 remove logging 2022-08-22 22:45:35 -07:00
Brian Cao
e418f86f35 logging 2022-08-22 22:44:48 -07:00
Brian Cao
4924a616f9 cascading deletes mysql 2022-08-22 16:00:26 -07:00
Francis Cao
e522293130 fixed event_uuid logic 2022-08-22 12:24:57 -07:00
Francis Cao
0a898354a4 remove extra compose files 2022-08-22 12:17:06 -07:00
Francis Cao
57d37381d9 remove test files 2022-08-22 12:15:47 -07:00
Brian Cao
26cca8ffac Merge branch 'dev' into brian/um-32-cascading-delete 2022-08-21 23:48:30 -07:00
Mike Cao
864acda388
Merge pull request #1440 from umami-software/brian/um-30-bigint
big int
2022-08-22 01:47:58 -05:00
Brian Cao
0066e8dbcb roll back check/update 2022-08-21 23:47:11 -07:00
akashrajpurohit_postman
ec7bc92497 feat: customize theme and locale based on query params 2022-08-21 17:00:40 +05:30
Brian Cao
41d4b4c402 allow agent 2022-08-18 23:25:45 -07:00
Brian Cao
135f0ac4b3 Merge branch 'dev' into francis/uc-24-kafka-test 2022-08-18 20:59:16 -07:00
Brian Cao
207c1224ed checkpoint 2022-08-18 17:10:45 -07:00
Francis Cao
295ce2487d Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-18 16:54:57 -07:00
Francis Cao
0beedb0e1c add properties to kafka client 2022-08-18 11:07:30 -07:00
Brian Cao
3003371752 remove cascading delete 2022-08-17 17:35:52 -07:00
Mike Cao
6ce193d2e7
Merge pull request #1424 from zx900930/dev
Update zh-CN.json
2022-08-17 10:29:12 -05:00
Mike Cao
997a560e54
Merge pull request #1433 from the-lazy-fox/patch-1
Update fr-FR.json
2022-08-17 10:28:51 -05:00
Brian Cao
acf28a7d2f Merge branch 'brian/um-30-bigint' into brian/um-32-cascading-delete 2022-08-16 22:30:13 -07:00
Brian Cao
d3f3e610a6 big int 2022-08-16 21:03:02 -07:00
Francis Cao
508e23c52e update clickhouse schema 2022-08-16 15:27:59 -07:00
TheLazyFox
5cd9bfe2eb
Update fr-FR.json 2022-08-15 21:16:44 +02:00
zx900930
066170c1dd
Update zh-CN.json 2022-08-12 20:42:09 +02:00
Francis Cao
e12d25677d update kafka saves 2022-08-12 10:34:34 -07:00
Francis Cao
192dd218cb move kafka logic into own file 2022-08-12 09:21:43 -07:00
Mike Cao
0f976be5d8
Updated docker urls. 2022-08-11 22:29:18 -07:00
Mike Cao
8f0e84ff4a
Merge pull request #1417 from umami-software/dev
Script for fixing DB schema inconsistencies
2022-08-11 14:17:55 -05:00
Mike Cao
3414cb6a87
Merge pull request #1415 from umami-software/brian/um-31-migration-bug
align index names if error
2022-08-11 14:14:27 -05:00
Mike Cao
c0276db6e3 Fixed session check logic. Closes #1340. 2022-08-11 12:11:43 -07:00
Brian Cao
e269ace88f add logic to mysql migration 2022-08-11 11:33:21 -07:00
Brian Cao
8c504ff923 align index names if error 2022-08-11 10:07:26 -07:00
Mike Cao
f8be633e24
Merge pull request #1397 from clem3109/patch-2
Update fr-FR.json
2022-08-10 22:01:52 -05:00
Mike Cao
3cc3d79302
Merge pull request #1399 from MagicLike/master
Added new German translations
2022-08-10 22:00:16 -05:00
Mike Cao
2181ca4ec8
Merge pull request #1394 from umami-software/um-31-prisma-deploy-bug
Prisma Deploy 01_init already completed #1393
2022-08-10 11:00:08 -05:00
MagicLike
a34de10844
Update de-DE.json
Added translations for "query-parameters" and "edit-dashboard"
2022-08-10 13:54:49 +02:00
Clément Radenac
8068b26df7
Update fr-FR.json 2022-08-10 11:32:11 +02:00
Brian Cao
b426bbd812 add console log. look for 01 last applied 2022-08-10 00:01:00 -07:00
Francis Cao
34e9ab811b add session_uuid to token 2022-08-09 23:32:02 -07:00
Mike Cao
2f24a8775e
Merge pull request #1387 from umami-software/dev
v1.37.0
2022-08-09 17:13:39 -05:00
Mike Cao
5873a56fff Updated check updates logic. 2022-08-09 14:58:27 -07:00
Mike Cao
d556806c64 Updated docker tracker update. 2022-08-09 13:36:24 -07:00
Mike Cao
6cfe910ba9 Added update-tracker script. Updated docker build. 2022-08-09 13:09:41 -07:00
Mike Cao
bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -07:00
Francis Cao
085b6b4071 fix event metrics 2022-08-09 00:43:47 -07:00
Francis Cao
55ba7d95ab fix clickhouse date timezone issues 2022-08-08 22:09:18 -07:00
Mike Cao
8aa9941ca7 Show custom tracker script name. 2022-08-08 11:50:27 -07:00
Mike Cao
9b7e472410 Added CURRENT_VERSION constant. 2022-08-08 11:31:36 -07:00
Francis Cao
fc3c39be3c Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-08 08:36:21 -07:00
Mike Cao
fb14514a65 Updated Next 12.2.4 and Prisma 4.1.1. 2022-08-08 01:31:02 -07:00
Mike Cao
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Mike Cao
69962eb08d Bump version 1.37.0. 2022-08-05 13:10:44 -07:00
Mike Cao
7ae457669b Fix event table. 2022-08-05 13:07:20 -07:00
Francis Cao
9dbbf3e86d update event producer test 2022-08-04 22:13:28 -07:00
Mike Cao
62b032ab19 Refactored dashboard sort logic. 2022-08-04 21:37:18 -07:00
Francis Cao
1a84608e2b add Clickhouse migration files. update saveEvent to include event_uuid 2022-08-04 20:15:21 -07:00
Francis Cao
1ffd5775f8 Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-04 17:48:00 -07:00
Francis Cao
1ab1e58cb1 create kafka save queries 2022-08-04 17:43:47 -07:00
Mike Cao
42e87a4691 Fixed cancel of dashboard edit. 2022-08-04 14:30:09 -07:00
Mike Cao
1d4aa7c535 Refactored website ordering feature. 2022-08-04 03:56:30 -07:00
Mike Cao
c9e966d5a1
Merge pull request #1272 from Maxime-J/tracker-fetch
tracker updates
2022-08-04 00:45:37 -05:00
Mike Cao
62dce0a8d1 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 20:32:34 -07:00
Mike Cao
c37554214d Moved geo database location. 2022-08-03 19:20:13 -07:00
Mike Cao
48dc02c2d4 Update message bundle. 2022-08-03 19:17:17 -07:00
Mike Cao
4de1858950
Merge pull request #1338 from cywio/reorder-websites
Add ability to reorder websites on dashboard
2022-08-03 18:05:42 -05:00
Mike Cao
11fd958f15
Merge pull request #1381 from winterrific/master
Updated de-DE
2022-08-03 16:04:20 -05:00
Ruben
59a949cce7 Updated de-DE
UTM strings has been translatede as well label.none
2022-08-03 14:46:36 +02:00
Mike Cao
0bcada761b
Merge pull request #1380 from H0rn0chse/master
Fix Heroku deployment
2022-08-02 14:58:54 -05:00
H0rn0chse
f89960ca88 Removing the Procfile and adding cacheDirectories
Heroku started the server twice which led to wrong port assignments and
runtime errors.
2022-08-02 19:52:50 +02:00
Francis Cao
b0a36f18b4 docker kafka auto-create topics 2022-08-02 09:29:24 -07:00
Mike Cao
1662b66fbb Cleaned up script. 2022-08-02 00:52:08 -07:00
Mike Cao
9969c9b6b1 Forgot the actual check. 2022-08-02 00:32:28 -07:00
Mike Cao
a4a6888248 Moved telemetry code to script. 2022-08-02 00:24:17 -07:00
Mike Cao
3d7e9392f0 Merge remote-tracking branch 'origin/dev' into dev 2022-08-01 23:05:24 -07:00
Mike Cao
50e491af06 Added endpoint for fetching server-side variables. 2022-08-01 23:04:47 -07:00
Mike Cao
df1c203c38
Merge pull request #1376 from umami-software/brian/um-24-event-data
Brian/um 24 event data
2022-08-01 23:50:08 -05:00
Brian Cao
daf3978970 address PR comments. line up PSQL / MYSQL 2022-08-01 20:50:14 -07:00
Mike Cao
b04e03b4d3
Merge pull request #1356 from biqette/master
Fix UTM request
2022-08-01 20:42:56 -05:00
Mike Cao
68d35c0fc4 Moved DISABLE_LOGIN check to getServerSideProps. 2022-08-01 18:42:07 -07:00
Mike Cao
ab1e49e703 Added Bengali and Thai languages. 2022-08-01 17:14:36 -07:00
Mike Cao
e4e3e74ec2
Merge pull request #1372 from max180643/master
Add Thai language (th-TH)
2022-08-01 18:33:11 -05:00
Brian Cao
01b517f68e remove event_old from schema 2022-08-01 13:49:56 -07:00
Brian Cao
7b0d6af147 refactor table drop 2022-08-01 12:22:17 -07:00
Francis Cao
7627f97c09 ignore process.env 2022-08-01 00:29:02 -07:00
Francis Cao
d952214536 check in producer test logic 2022-08-01 00:28:38 -07:00
Mike Cao
adb069babc Added content security policy. 2022-07-31 23:29:47 -07:00
Francis Cao
6f4824582d create kafka docker files 2022-07-31 15:40:22 -07:00
max180643
32458b51ac Add Thai language 2022-07-31 04:33:34 +07:00
Brian Cao
8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Mike Cao
2b7da339e2
Merge pull request #1371 from mahmudz/master
Added Bengali language support
2022-07-29 22:29:44 -05:00
Mahmudul Hasan
9a91a23bdd Create bn-BD.json 2022-07-30 08:43:03 +06:00
Chris Walsh
88d1c19454
Fix graphical bugs when dragging 2022-07-28 17:16:03 -07:00
Chris Walsh
934d569bb2
Rename "change order" to "edit dashboard" 2022-07-28 16:59:44 -07:00
Brian Cao
3e2c098c05 create mysql migration 2022-07-27 23:16:16 -07:00
Brian Cao
6fbd566b29 add prisma migration 2022-07-27 17:13:53 -07:00
Mike Cao
7d94243a71
Merge pull request #1364 from nfn/master
Update pt-PT translations
2022-07-27 16:30:42 -05:00
Brian Cao
b415892b7d restart migration. refresh schema 2022-07-27 12:03:12 -07:00
Nuno
b77d344e7b
Update pt-PT.json 2022-07-27 19:18:31 +01:00
Nuno
232c97ceed
Update lang-ignore.json 2022-07-27 19:16:08 +01:00
Mike Cao
f261933edf
Merge pull request #1359 from umarhadi/master
update translation id-ID.json
2022-07-27 09:30:52 -05:00
umarhadi
5c8c205bc5
update translation id-ID.json 2022-07-27 12:40:47 +08:00
Brian Cao
c7476aa59e add deploy if missing migrations. add logic to hand 01_init 2022-07-26 11:01:43 -07:00
biqette
c8302390c5 Fix utm request 2022-07-26 18:49:38 +02:00
Brian Cao
689091212e update migration 2022-07-26 00:33:52 -07:00
Brian Cao
79ae5b0571 add migration prisma 4 2022-07-25 23:52:59 -07:00
Mike Cao
d755a7fa24
Merge pull request #1343 from umami-software/brian/session-fix
fix collection bug
2022-07-25 16:00:33 -07:00
Mike Cao
82d8551f51
Merge pull request #1351 from wangyang0210/patch-1
Update zh-TW.json
2022-07-25 15:58:15 -07:00
wangyang0210
c03d5bf678
Update zh-TW.json 2022-07-26 02:58:37 +08:00
Brian Cao
f189035a73 fix CH return. 2022-07-25 09:47:11 -07:00
Chris Walsh
137ff97c07
Move reordering of websites onto dashboard 2022-07-24 23:25:04 -07:00
Brian Cao
af7c6f73b0 Merge branch 'dev' into brian/session-fix 2022-07-24 23:11:46 -07:00
Chris Walsh
765add71a9
Restore table component and website settings page 2022-07-24 23:07:56 -07:00
mike
f1717ce533 Bump version v1.36.1. 2022-07-25 00:29:20 -05:00
Mike Cao
d0c997c35e
Merge pull request #1345 from umami-software/dev
v1.36.1
2022-07-24 22:27:05 -07:00
Mike Cao
49ca84636c
Merge pull request #1337 from Lemonawa/patch-1
Update zh-CN Translations
2022-07-24 22:10:18 -07:00
Mike Cao
905b2dbfa0
Merge pull request #1339 from RikoDEV/patch-1
Update pl-PL.json
2022-07-24 22:09:45 -07:00
Mike Cao
1cb452b233
Merge pull request #1344 from KevinVR/bugfix/duplicate-session
#1340 : Fix when session received is not an array, but the direct object
2022-07-24 21:58:30 -07:00
Kevin Van Ryckegem
5ef979d61d #1340 : Fix when session received is not an array, but the direct object 2022-07-25 00:44:53 +02:00
Brian Cao
5cfee79b01 update CH session logic 2022-07-24 14:48:10 -07:00
Brian Cao
8471db695b fix collection bug 2022-07-24 14:31:43 -07:00
RikoDEV
1ecad384fb
Update pl-PL.json 2022-07-24 09:24:12 +02:00
Chris Walsh
76bdb6b1d6
Add reset order button to website settings 2022-07-23 23:07:53 -07:00
Chris Walsh
ef4bf8282a
Fix bug where toggle charts would reset ordering 2022-07-23 23:04:07 -07:00
Chris Walsh
5bd83b8127
Change dashboard websites to use ordered list 2022-07-23 23:02:47 -07:00
Chris Walsh
3926d3fe93
Add website ordering to state and settings page 2022-07-23 23:01:59 -07:00
Chris Walsh
70c6211e2c
Add draggable rows to table component 2022-07-23 22:56:13 -07:00
Lemonawa
3d06dc9ca6
Update zh-CN.json 2022-07-24 08:48:00 +08:00
Mike Cao
bcabc25300
Merge pull request #1332 from umami-software/dev
v1.36.0
2022-07-23 14:07:54 -07:00
Mike Cao
97a774a3fd Bump version 1.36.0 2022-07-23 09:39:27 -07:00
Mike Cao
ba1e28f082 Fix filter issue for metrics. Closes #1268 2022-07-22 23:56:29 -07:00
Mike Cao
25d97fca95
Merge pull request #1330 from umami-software/brian/um-16-clickhouse-support
Brian/um 16 clickhouse support
2022-07-22 22:53:09 -07:00
Mike Cao
c0bc282193
Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 22:47:53 -07:00
Brian Cao
f569055771 PR comments 2022-07-22 22:42:01 -07:00
Mike Cao
374ce6bdb3 Removed subquery. 2022-07-22 22:20:40 -07:00
Brian Cao
1c26581cd1 fix parseFilters 2022-07-22 19:50:43 -07:00
Brian Cao
aa8057f9fe fix stats query 2022-07-22 17:47:26 -07:00
Brian Cao
810ae101ed fix timer 2022-07-22 17:24:45 -07:00
Brian Cao
f2d720680e Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 17:03:50 -07:00
Brian Cao
304314fff0 Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 17:03:42 -07:00
Mike Cao
bf774b97fb Updated language bundles. 2022-07-22 15:09:55 -07:00
Brian Cao
65910c7348 clickhouse inserts 2022-07-22 14:43:19 -07:00
Mike Cao
6f92677f10
Merge pull request #1329 from Maxime-J/mysql-fix
follow-up - reverted getDateQuery logic
2022-07-22 14:18:18 -07:00
Mike Cao
2aa62ba999
Merge pull request #1323 from cywio/utm-tracking
Add UTM parameters to dashboard
2022-07-22 14:17:00 -07:00
Maxime-J
bb1d17a5e2 follow-up - reverted getDateQuery logic 2022-07-22 12:35:37 +00:00
Mike Cao
1a1faed8ec
Merge pull request #1315 from Lemonawa/patch-1
Update zh-CN Translations
2022-07-22 00:32:13 -07:00
Chris Walsh
7f853c87f0
Add MySQL support for SQL replacer function 2022-07-22 00:09:29 -07:00
Lemonawa
a3377f31c7
Update zh-CN.json 2022-07-22 14:28:32 +08:00
Mike Cao
15ae4569c5
Bump version v1.35.0 2022-07-21 22:52:25 -07:00
Mike Cao
b8d65a6910
Merge pull request #1319 from orhun/chore/update_repo_link
Update the links for current repository
2022-07-21 21:45:55 -07:00
Mike Cao
afc2b85e75
Merge pull request #1324 from umami-software/dev
v1.35.0
2022-07-21 21:35:42 -07:00
Mike Cao
07d276106e Fixed date query for MySQL. 2022-07-21 21:21:48 -07:00
Mike Cao
34bdea8a4f Update language bundles. 2022-07-21 21:04:04 -07:00
Mike Cao
cef1ab43a1
Merge pull request #1316 from clem3109/patch-1
Some french language updates
2022-07-21 20:42:30 -07:00
Mike Cao
5fecba2acc
Merge pull request #1317 from jenspots/master
New Dutch translation.
2022-07-21 20:42:01 -07:00
Chris Walsh
8d5c9c9711
Remove unused prop on UTM table 2022-07-21 19:52:32 -07:00
Mike Cao
c47b244dc5 Fix tracker build for COLLECT_API_ENDPOINT. 2022-07-21 19:38:24 -07:00
Chris Walsh
7d1f8ea77b
Fix UTM query, move filters to proper place 2022-07-21 16:56:57 -07:00
Chris Walsh
c3d6467b99
Add UTM params to website details page 2022-07-21 16:22:43 -07:00
Chris Walsh
92b009fa1e
Add UTM pageview metrics to API 2022-07-21 14:57:29 -07:00
Mike Cao
250cdce306 Reverted getDateQuery logic. 2022-07-21 13:21:33 -07:00
Lemonawa
0ad83f828d
Update zh-CN.json 2022-07-21 22:30:25 +08:00
Orhun Parmaksız
900e3e5734
Update the links for current repository 2022-07-21 14:31:09 +02:00
Jens Pots
e949da347f
Update nl-NL.json
Some missing translations have been added.
2022-07-21 14:01:02 +02:00
Clément Radenac
f4d10ff353
Update fr-FR.json
Some french language updates
2022-07-21 13:15:11 +02:00
Lemonawa
6930570594
Update zh-CN.json 2022-07-21 18:24:58 +08:00
Mike Cao
16046a50a4
Merge pull request #1312 from umami-software/dev
v1.34.0
2022-07-21 02:31:38 -07:00
Mike Cao
358c725828 Fix issue with unicode filtering. Closes #1258 2022-07-21 01:35:14 -07:00
Mike Cao
be8291c856 Refactored referrer logic. Display stats for no referrers. 2022-07-21 01:11:10 -07:00
Brian Cao
6ea2282f82 convert analytics queries 2022-07-20 21:31:26 -07:00
Mike Cao
0026b4b1ea Updated language bundle. 2022-07-20 16:43:58 -07:00
Mike Cao
b6ba4dee03 Updated packages. Prisma 4.1.0. 2022-07-20 16:42:31 -07:00
Mike Cao
d495d9e7fe
Merge pull request #1311 from umami-software/dependabot/npm_and_yarn/terser-5.14.2
Bump terser from 5.12.0 to 5.14.2
2022-07-20 16:38:26 -07:00
Mike Cao
59d5a4fc32
Merge branch 'dev' into dependabot/npm_and_yarn/terser-5.14.2 2022-07-20 16:38:20 -07:00
dependabot[bot]
d24b4b2646
Bump terser from 5.12.0 to 5.14.2
Bumps [terser](https://github.com/terser/terser) from 5.12.0 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-20 23:16:20 +00:00
Mike Cao
ae354ba676
Merge pull request #1283 from njfdev/master
Add Filter to Have Direct Referrer
2022-07-20 14:25:14 -07:00
Mike Cao
b57713ba9f
Merge pull request #1308 from sifferhans/master
fix(i18n): update norwegian translation
2022-07-19 17:41:41 -07:00
Sigve Hansen
ebeeffe432 fix(i18n): update norwegian translation 2022-07-18 23:18:54 +02:00
Mike Cao
c8f7220f4c Updated language bundles. 2022-07-18 00:39:53 -07:00
Mike Cao
d95b53143e
Merge pull request #1304 from thueske/feature/screensize
Feature: Add screensize to UI
2022-07-18 00:37:07 -07:00
Mike Cao
8c848e3000
Merge pull request #1307 from liaohongxing/patch-1
Update zh-CN.json
2022-07-18 00:36:19 -07:00
liaohongxing
19d971d9b2
Update zh-CN.json 2022-07-18 14:12:20 +08:00
Mike Cao
a6a5389467 Added missing package. 2022-07-16 22:28:05 -07:00
Mike Cao
07e549882e Updated packages. Bump version v1.34.0. 2022-07-16 22:23:43 -07:00
Mike Cao
b290f95b85
Update docker urls. 2022-07-16 22:04:53 -07:00
Mike Cao
6245c24e5f Update lang. Remove node 12 test. 2022-07-15 23:57:44 -07:00
Mike Cao
e71b9edcd6 Merge remote-tracking branch 'origin/dev' into dev 2022-07-15 23:53:56 -07:00
Mike Cao
e4c4019e25 Allow custom release URL. 2022-07-15 23:53:31 -07:00
Mike Cao
ff18a596ee
Merge pull request #1303 from umami-software/brian/um-19-bigint-breaking-ui
fix bigint ui
2022-07-15 23:38:39 -07:00
Tobias Hüske
8d358ccb9d Feature: Add screensize to UI 2022-07-16 07:29:55 +02:00
Brian Cao
08cd778177 fix bigint ui 2022-07-15 22:23:57 -07:00
Brian Cao
4f12933f42 checkpoint 2022-07-15 22:21:37 -07:00
Brian Cao
44f3bd3698 Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-15 16:48:02 -07:00
Brian Cao
20b8337e35 checkpoint 2022-07-15 16:47:38 -07:00
Mike Cao
64f1841ae4 Upgrade to Prisma 4. 2022-07-14 22:57:38 -07:00
Mike Cao
9b3105cefd Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-07-13 08:21:36 -07:00
Mike Cao
cef365bb55
Merge pull request #1294 from umami-software/brian/um-22-query-folder-structure
um-22 query folder structure
2022-07-13 08:21:25 -07:00
Brian Cao
0b7db02103 add query optimizations from um-13 2022-07-12 22:39:16 -07:00
Brian Cao
9803d4b5ee Merge branch 'dev' into brian/um-22-query-folder-structure 2022-07-12 22:34:05 -07:00
Brian Cao
2950343f94 fix import 2022-07-12 19:50:47 -07:00
Brian Cao
8c43dc67b7 remove unused index 2022-07-12 15:14:54 -07:00
Brian Cao
f327b5c0f7 fix imports 2022-07-12 15:14:27 -07:00
Brian Cao
8aec6d7406 move queries 2022-07-12 14:14:36 -07:00
Mike Cao
5d511421cf
Merge pull request #1290 from fredrikj31/master
Changed some senteces in the Danish translation.
2022-07-12 09:35:48 -07:00
Fredrik Johansen
26ab92ad96 Missed a couple of words 2022-07-11 17:15:14 +02:00
Fredrik Johansen
bff9fd9ffb Changed a big letter to a small 2022-07-11 17:13:08 +02:00
Fredrik Johansen
15964a89e9 Updated & Fixed Danish Language
I have changed some sentences which were not correcly translated, and not even translated.
2022-07-11 17:11:38 +02:00
Nicholas Fasching
448a62d884
Update Blank Referrer Text
I think this capitalization and spacing looks better after looking at it again.
2022-07-09 08:53:06 -04:00
Nicholas Fasching
b90b2b9bb2
Update lib/filters.js
Co-authored-by: Rohan Deb Sarkar <rohandebsarkar+git@gmail.com>
2022-07-09 07:46:45 -04:00
Nicholas Fasching
fbc33ce746 Add Filter to Have Direct Referrer 2022-07-08 19:36:19 -04:00
Mike Cao
2d03cf7b54 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-07-08 10:38:10 -07:00
mike
846afad0a4 Moved middleware. 2022-07-07 09:24:32 -07:00
mike
ba5c149c48 Upgraded Next to 12.2.0. 2022-07-07 09:06:40 -07:00
mike
a1d0235416 Added handling for BigInt values. 2022-07-07 05:55:43 -07:00
mike
5e0c5643c6 Unify database changes. Closes #1264 2022-07-06 20:45:53 -07:00
Maxime-J
24ddf41331 tracker: collect in one place with fetch 2022-07-06 14:06:28 +00:00
mike
af44380ea4 Merge branch 'master' into dev 2022-07-05 00:07:46 -07:00
Mike Cao
eb538259fa
Merge pull request #1257 from rohandebsarkar/custom-endpoint
Adds suport custom collect API endpoint
2022-07-04 23:56:39 -07:00
Mike Cao
b2f1dd4386
Merge pull request #1245 from umami-software/brian/um-13-query-optimizations
Brian/um 13 query optimizations
2022-07-04 17:35:41 -07:00
Mike Cao
910f165103
Merge pull request #1263 from njfdev/patch-1
Create a Robots.txt File
2022-07-04 17:34:09 -07:00
Nicholas Fasching
db67127df3
Create a Robots.txt File
This is a very simple addition of the robots.txt file which disallows indexing of the entire website. #1262
2022-07-04 13:12:05 -04:00
rohandebsarkar
ce6fd12f9f
Change API_COLLECT_ENDPOINT to COLLECT_API_ENDPOINT 2022-07-04 15:52:59 +05:30
rohandebsarkar
1b60ca440e
Better logic 2022-07-03 22:33:20 +05:30
rohandebsarkar
c60ec2fb8b
Replace /api/collect with collectEndpoint 2022-07-03 11:35:29 +05:30
rohandebsarkar
ae48ff0e68
Adds support for customCollectEndpoint 2022-07-03 11:33:49 +05:30
Mike Cao
8259fce669 Merge branch 'master' into dev 2022-06-30 10:31:13 -07:00
Mike Cao
5358e28a68 Change registry entry in workflows. 2022-06-30 10:31:01 -07:00
Mike Cao
26ca6a3d87 Revert change. 2022-06-30 01:51:53 -07:00
Mike Cao
1bb30c81a2 Change ghcr login method. 2022-06-30 01:42:28 -07:00
Brian Cao
cca99b71b5 fix comments 2022-06-30 00:23:51 -07:00
Brian Cao
3023890cba optimize queries 2022-06-30 00:22:23 -07:00
Mike Cao
43f89a1cdc Merge branch 'master' into dev 2022-06-29 23:32:08 -07:00
Mike Cao
3139fe0c6d Change github.actor to repository_owner. 2022-06-29 23:31:05 -07:00
Mike Cao
aabcdb5297 Merge branch 'master' into dev 2022-06-28 10:25:10 -07:00
Mike Cao
16c723a9cb Added missing migration step. 2022-06-28 09:20:51 -07:00
Mike Cao
6d6c12a29f Updated language bundle. 2022-06-28 09:18:35 -07:00
Mike Cao
508e1ae1ec Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-06-28 09:18:18 -07:00
Mike Cao
c84bf926fc Updated packages. 2022-06-28 09:17:56 -07:00
Mike Cao
42d035c908
Merge pull request #1236 from MarcHagen/update/nl
Update dutch language
2022-06-28 08:05:29 -07:00
Mike Cao
e0144398e2 Clean-up. 2022-06-27 23:08:58 -07:00
Mike Cao
9aa3946ed4 Fix check criteria. 2022-06-27 23:00:14 -07:00
Mike Cao
1141b6b7b0 Bump version v1.31.1. 2022-06-27 22:17:02 -07:00
Mike Cao
1adb50f54b
Merge pull request #1238 from mikecao/dev
Updated migration process.
2022-06-27 22:12:50 -07:00
Mike Cao
eda40d2336 Updated migration process. 2022-06-27 22:09:47 -07:00
Mike Cao
6b0401a040 Add latest tag to manual build. 2022-06-27 15:50:24 -07:00
Marc Hagen
04c6e4edeb Update NL language 2022-06-27 22:43:06 +02:00
Mike Cao
3061c3166c Removed bad migration file. 2022-06-27 13:24:08 -07:00
Mike Cao
c47b466a2e Updated language bundle. 2022-06-27 13:23:14 -07:00
Mike Cao
07ebbab51f Merge branch 'master' of https://github.com/mikecao/umami 2022-06-27 13:21:01 -07:00
Mike Cao
8670324637
Merge pull request #1230 from saosangmo/master
Update vi-VN.json
2022-06-27 13:20:44 -07:00
Mike Cao
661bf2863c
Merge pull request #1235 from franciscao633/um-12-mysql-match-init-migration-with-schema-file
update mysql schema and init migration file
2022-06-27 13:20:19 -07:00
Francis Cao
921f52ab9e update mysql schema and init migration file 2022-06-27 11:48:50 -07:00
Mike Cao
4818eb844e Fix mysql schema. 2022-06-27 11:19:55 -07:00
Mike Cao
37653aa5b5 Renamed init folder. 2022-06-27 11:10:27 -07:00
Mike Cao
77da21ac3e Updated mysql migration file. 2022-06-27 11:07:45 -07:00
Mike Cao
7c752eeeee Merge branch 'master' of https://github.com/mikecao/umami 2022-06-27 11:02:30 -07:00
Mike Cao
9ae7355ff3
Merge pull request #1234 from franciscao633/um-12-postgres-match-init-migration-with-schema-file
match init and postgres prisma schema
2022-06-27 11:02:17 -07:00
Mike Cao
6541ba1ab4 Update docker build. 2022-06-27 10:34:03 -07:00
Francis Cao
cca344881a match init and postgres prisma schema 2022-06-27 10:30:38 -07:00
Dzung Do
6f19574ac6
Update vi-VN.json 2022-06-27 16:55:16 +07:00
Mike Cao
a37dd6180b Fixed README. Remove Railway mention. 2022-06-27 02:41:31 -07:00
Mike Cao
4246d4fa50
Merge pull request #1227 from mikecao/dev
v1.33
2022-06-27 02:20:22 -07:00
Mike Cao
34387168d0 Version bump v1.33. 2022-06-27 02:11:58 -07:00
Mike Cao
08a078a692 Updated luanguage bundles. 2022-06-27 02:10:42 -07:00
Mike Cao
a78eebede6
Merge pull request #1222 from Maxime-J/translation
Update fr-FR.json
2022-06-27 02:10:18 -07:00
Mike Cao
680f0facbc Update deploy github action. 2022-06-27 02:01:15 -07:00
Mike Cao
8175f13f96 Added IGNORE_HOSTNAME environment variable. Closes #1151. 2022-06-27 01:46:21 -07:00
Mike Cao
ca385af8c4 Removed password from accounts query. Closes #1153. 2022-06-26 23:09:34 -07:00
Mike Cao
4fa3c1a0f6 Updated download scripts. 2022-06-26 21:00:29 -07:00
Mike Cao
5e094cd6ab Added Galacian language. 2022-06-26 20:56:24 -07:00
Maxime-J
28a899e91a Update fr-FR.json 2022-06-25 14:23:15 +00:00
Mike Cao
5732f2daf6 Add option to include latest tag. 2022-06-24 09:05:15 -07:00
Mike Cao
22a31bfe97 Merge branch 'master' into dev 2022-06-24 02:30:43 -07:00
Mike Cao
f27959ef72 Removed default latest tag. 2022-06-24 02:29:10 -07:00
Mike Cao
fb4f5a29b9 Switch to manual workflow. 2022-06-24 02:27:08 -07:00
Mike Cao
87bcd85b71 Remove console.log. 2022-06-24 02:01:55 -07:00
Mike Cao
c8ca0a0a56 Updated version checking. 2022-06-24 01:54:55 -07:00
Mike Cao
1bfb26ab44 Fix display of encoded characters. Closes #1171. 2022-06-23 13:44:30 -07:00
Mike Cao
11ae382209 Added SQL files for docker-compose. 2022-06-22 17:40:05 -07:00
Mike Cao
89fb62a50a Updated to prisma 3.15.2. Updated check-db script. 2022-06-22 12:12:22 -07:00
Mike Cao
c246b88329 Removed HASH_SALT requirement. 2022-06-22 11:02:40 -07:00
Mike Cao
50aa26e3fc Updated build order. 2022-06-22 09:34:03 -07:00
Mike Cao
3c1308890a Remove prisma dir before copying files. 2022-06-22 09:32:58 -07:00
Mike Cao
60ab144fc2
Merge pull request #1216 from saosangmo/master
Update vi-VN.json
2022-06-22 09:22:13 -07:00
Mike Cao
c3dcef9ae4
Merge pull request #1219 from mikecao/migration
Migration scripts
2022-06-22 09:21:27 -07:00
Mike Cao
5a5a278d9e Removed DISABLE_LOGIN from middleware. 2022-06-22 02:28:23 -07:00
Mike Cao
0f37c17cb5 Added logging to test Vercel issue. 2022-06-22 02:08:13 -07:00
Mike Cao
c3bcf46dd3 Remove check-db from build step. 2022-06-22 01:53:52 -07:00
Mike Cao
ac3017b2e4 Added database check. 2022-06-22 01:50:33 -07:00
Mike Cao
3122bab419 Refactor migrations. 2022-06-19 00:07:01 -07:00
Dzung Do
b66f4e973b
Update vi-VN.json 2022-06-19 04:05:51 +07:00
Mike Cao
5899a8d45c
Merge pull request #1203 from anbraten/apply-migrations
feat: run migrations on start
2022-06-14 17:23:31 -07:00
Mike Cao
c45fe2bdb2 Updated language bundles. 2022-06-14 14:43:11 -07:00
Mike Cao
53437cadbf Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-06-14 14:42:32 -07:00
Mike Cao
b2c70ef236
Merge pull request #1210 from valtlfelipe/patch-1
Improve pt-BR translations
2022-06-14 14:42:28 -07:00
Mike Cao
d44bf55f07 Updated language bundles. 2022-06-14 11:33:03 -07:00
Mike Cao
2e9fca994b Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-06-14 11:32:49 -07:00
Mike Cao
6ff4ce2ad6 Updated docker file. 2022-06-14 11:32:21 -07:00
Felipe Valtl de Mello
9cde3d8e40
Improve pt-BR translations 2022-06-13 09:19:47 -03:00
Mike Cao
160a33fb28
Merge pull request #1209 from bilguun0203/master
Updated mn-MN.json
2022-06-12 20:49:41 -07:00
Bilguun Ochirbat
c2dad60607
Updated mn-MN.json 2022-06-13 11:11:28 +08:00
Mike Cao
f2aa358792 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-06-12 10:05:21 -07:00
Mike Cao
f29fbc2076
Merge pull request #1205 from userdehghani/master
Update lang/fa-IR.json
2022-06-12 10:05:17 -07:00
Mohammad Amin Dehghani
e960d15a1e Update lang/fa-IR.json 2022-06-12 13:12:33 +04:30
Anbraten
1bd59156b8 undo change to deps 2022-06-12 08:41:41 +02:00
Anbraten
9ea175eb3f Run migrations on start 2022-06-12 08:38:58 +02:00
mike
0f32f48c24 Revert github action change. 2022-06-11 02:50:06 -07:00
mike
692a5d5e92 Update github action. 2022-06-11 02:36:45 -07:00
mike
327fa9925b Added missing args. 2022-06-11 02:27:42 -07:00
Mike Cao
4f8bcb81d9
Merge pull request #1189 from mikecao/dev
v1.32.0
2022-06-10 13:46:48 -07:00
mike
ccec996b34 Update disable login message. 2022-06-10 11:23:00 -07:00
mike
8a0ca5e24f Revert postcss package. 2022-06-09 23:51:53 -07:00
mike
ec005b46af Bump version 1.32.0. 2022-06-09 23:34:36 -07:00
Mike Cao
9dae76fbf3 Updated version check. 2022-06-03 07:06:44 -07:00
Mike Cao
a42ab8677c Updated language bundle. 2022-06-01 18:30:11 -07:00
Mike Cao
8eb597ff72 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-06-01 18:28:13 -07:00
Mike Cao
d3fc27d255
Merge pull request #1172 from PavanGangireddy/loading-spelling
Update spelling from useLoadiing to useLoading
2022-06-01 18:28:07 -07:00
Mike Cao
bac7a71c6d
Merge pull request #1178 from MagicLike/dev
Corrected a few translations
2022-06-01 18:27:34 -07:00
Mike Cao
47ce253304
Merge pull request #1180 from zx900930/dev
Fix missing Dashboard translation
2022-06-01 18:27:06 -07:00
Mike Cao
8056f35ad0 Updated packages. 2022-06-01 14:09:11 -07:00
zx900930
ff8e8a37c8
Fix missing Dashboard translation 2022-06-01 14:10:16 +02:00
Mike Cao
bf3fc3b3b5 Updated Prisma to v3.14. 2022-05-31 23:17:11 -07:00
MagicLike
4726e8464d
Update de-DE.json
Corrected a few translations
2022-05-31 14:13:40 +02:00
Pavan Gangireddy
6a88f3e7f4
Update spelling from useLoadiing to useLoading 2022-05-28 14:58:31 +05:30
Mike Cao
f4d5bfcf4a Updated yarn references in README. 2022-05-24 21:33:38 -07:00
Mike Cao
3974392eee
Merge pull request #1166 from tmair/docker-standalone-output
use outputStandalone to reduce docker image size
2022-05-24 21:08:40 -07:00
Mike Cao
d373c64f9e
Merge pull request #1156 from duboiss/patch-1
fix(readme): replace npm install by yarn install
2022-05-24 20:40:23 -07:00
Mike Cao
4bddf37921
Merge pull request #1163 from rohandebsarkar/fetch-api
Update `tracker/index.js`: `SendBeacon()` to `Fetch API`
2022-05-24 20:39:57 -07:00
Thomas Mair
d35134c439 use outputStandalone to reduce docker image size 2022-05-24 14:43:19 +02:00
rohandebsarkar
a33293066e
Update tracker/index.js: SendBeacon() to Fetch API 2022-05-22 23:18:26 +05:30
Steven DUBOIS
ff1a011441
fix(readme): replace npm install by yarn install 2022-05-18 22:04:21 +02:00
Mike Cao
f55ba7bd80
Merge pull request #1137 from mikecao/dev
v1.31.0
2022-05-06 22:49:12 -07:00
Mike Cao
52fe59f41b Bump version 1.31.0. 2022-05-06 22:35:36 -07:00
Mike Cao
5b2628172b Updated README. 2022-05-06 21:57:25 -07:00
Mike Cao
e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -07:00
Mike Cao
b5de6b997e Reverted Next to v12.1.0 due to Heroku issues. 2022-04-29 20:53:00 -07:00
Mike Cao
f7c1d5b726 Updated language bundle. 2022-04-29 20:50:54 -07:00
Mike Cao
1d5756d584
Merge pull request #1120 from ym-project/master
update ru-RU locale
2022-04-27 08:35:44 -07:00
Mike Cao
08dff1293e
Merge pull request #1127 from Zxilly/master
fix: cover edge case of script name
2022-04-27 08:33:52 -07:00
isNullOrEmpty()
699740dc34 fix: cover edge case of script name 2022-04-27 10:05:24 +00:00
Mike Cao
1678d9e1ab Changed hash method again. 2022-04-25 19:11:54 -07:00
Mike Cao
86966f46e5 Updated packages. Updated language bundles. 2022-04-25 18:31:13 -07:00
ym-project
65bdfa6f0e
update ru-RU locale 2022-04-22 23:04:29 +03:00
Mike Cao
f390ac447f
Merge pull request #1119 from alessioforti/update-italian-translation
Updated Italian translation (it-IT.json)
2022-04-21 13:48:41 -07:00
Alessio Forti
625589b274 Updated it-IT.json 2022-04-21 22:05:18 +02:00
Mike Cao
b1fd4aab47
Merge pull request #1115 from briancao/master
Fix  'Unknown' country bug Closes #1102
2022-04-20 08:44:22 -07:00
Brian Cao
b697b34cc7 remove decodeURI 2022-04-18 12:27:38 -07:00
Brian Cao
d0f1487107 fix filter link 2022-04-18 10:23:13 -07:00
Mike Cao
006f4c123e Merge remote-tracking branch 'origin/dev' into dev 2022-04-13 19:07:02 -07:00
Mike Cao
9f20a62591 Updated Next. 2022-04-13 19:06:45 -07:00
Mike Cao
f69dbaeaf6 Allow filtering of events with url. 2022-04-13 19:04:06 -07:00
Mike Cao
dc458f3c48
Merge pull request #1092 from mikecao/dependabot/npm_and_yarn/minimist-1.2.6
build(deps): bump minimist from 1.2.5 to 1.2.6
2022-04-13 05:51:48 -07:00
Mike Cao
1cff704379 Updated de-DE. 2022-04-12 21:59:00 -07:00
Mike Cao
ce54e3d510 Updated language bundles. 2022-04-12 21:49:17 -07:00
Mike Cao
4d239f9a7c Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-04-12 21:48:51 -07:00
Mike Cao
65c4620677
Merge pull request #1103 from winterrific/master
Added missing German strings
2022-04-12 21:47:59 -07:00
Mike Cao
4c01f2fa49 Updated hash method. 2022-04-12 20:59:17 -07:00
RubenD
f2128a7011 Translated missing string
Theme, does not to be translated
2022-04-12 21:22:20 -04:00
dependabot[bot]
8f49b974fd
build(deps): bump minimist from 1.2.5 to 1.2.6
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 07:41:53 +00:00
Mike Cao
8384d6af35
Merge pull request #1091 from mikecao/dev
v1.30.0
2022-04-11 00:41:20 -07:00
Mike Cao
ea9da45679 Updated packages. 2022-04-11 00:35:11 -07:00
Mike Cao
70d11100a6 Fix active users. 2022-04-11 00:26:43 -07:00
Mike Cao
46cfab864c
Merge pull request #1057 from ilhamsyahids/master
Fix active users not appear
2022-04-11 00:23:21 -07:00
Mike Cao
df1ddf3e73 Updated filter processing logic. 2022-04-11 00:19:29 -07:00
Mike Cao
fb2dc9f5ab Allow filtering on session fields. 2022-04-10 03:51:43 -07:00
Mike Cao
edd1645bab Refactor multi-script name code. Update languages. 2022-04-09 22:11:15 -07:00
Mike Cao
0e82807170
Merge pull request #1036 from djyde/support-multiple-track-script-name
support multiple track script name
2022-04-09 20:13:13 -07:00
Mike Cao
27e4f27396
Merge pull request #1087 from Lemonawa/patch-1
Update Chinese Translations
2022-04-09 19:40:33 -07:00
Lemonawa
b23161f7b3
Merge pull request #1 from Lemonawa/patch-2
Update zh-CN.json
2022-04-09 22:20:37 +08:00
Lemonawa
2553411dfc
Update zh-CN.json 2022-04-09 22:19:43 +08:00
Lemonawa
f351b0628b
Update zh-TW.json 2022-04-09 22:19:19 +08:00
Mike Cao
e7602b58f4
Merge pull request #1080 from HolgerHuo/fix-referrer-issue
Fix referrer filter issue
2022-04-08 21:43:54 -07:00
Mike Cao
13432ede22 Include version for preload. 2022-04-08 21:39:13 -07:00
Mike Cao
3fab09d626 Check for no session. Closes #1075 2022-04-08 17:17:07 -07:00
Mike Cao
29178b18b8 Updated packages. 2022-04-08 17:13:30 -07:00
Mike Cao
1b599a9d9c Preload image. 2022-04-08 15:37:36 -07:00
Mike Cao
a4e2e46834 Remove prestart script. 2022-04-07 20:13:53 -07:00
Mike Cao
f2d17996eb Update readme. 2022-04-07 18:15:45 -07:00
Holger Huo
0377773e21 fix: forgot to include referrer filter in sessionMetrics 2022-04-07 22:27:15 +08:00
Holger Huo
7c744589ae fix: further address issue in #1043 2022-04-07 18:01:17 +08:00
Holger Huo
0349b82e9a fix: unable to sort by referrer 2022-04-07 16:58:01 +08:00
Mike Cao
9696a5f8f2 Re-use the response from forceSSL. 2022-04-04 18:51:31 -07:00
Mike Cao
6eaf090bde Changed force SSL method to send headers. 2022-04-04 17:01:21 -07:00
Mike Cao
22195a07f9 Updated es-MX language file. 2022-04-04 15:33:52 -07:00
Mike Cao
6b1cc67cee
Merge pull request #1063 from 1cgonza/fix/es-mx
Add missing translations and fix spelling errors
2022-04-04 15:24:12 -07:00
Mike Cao
0bd1be0971
Merge pull request #1068 from Wonderfall/master
Dockerfile: update node version
2022-04-04 15:23:33 -07:00
Mike Cao
0d4fe7eb5e
Merge pull request #1069 from pajecawav/preserve-dashboard-settings
Preserve dashboard settings in localStorage
2022-04-04 15:19:07 -07:00
Mike Cao
6e51d6054e Ignore errors from telemetry. 2022-04-04 15:14:26 -07:00
Mike Cao
54d25048c3 Merge branch 'master' into dev 2022-04-04 15:09:10 -07:00
Mike Cao
76211dc5a2 Updated start scripts. 2022-04-04 14:36:42 -07:00
pajecawav
fa7fb5eb4e preserve dashboard settings in localStorage 2022-04-04 19:15:49 +03:00
Mike Cao
b494a2595d Fix for docker build. 2022-04-04 04:07:01 -07:00
Mike Cao
283d18518e Update dependencies. 2022-04-04 03:43:29 -07:00
Wonderfall
7ceb48f4e3
Update node version 2022-04-04 12:20:34 +02:00
Mike Cao
493f5a5cf1
Merge pull request #1065 from mikecao/dev
Added CORS to website API endpoints.
2022-04-04 00:36:36 -07:00
Mike Cao
bf5068d32a Added CORS to website API endpoints. 2022-04-04 00:33:20 -07:00
Mike Cao
17aaa55aba
Merge pull request #1064 from mikecao/dev
v1.29.0
2022-04-03 23:49:39 -07:00
Mike Cao
136000c29d Bump version v1.29.0. 2022-04-03 23:41:43 -07:00
Mike Cao
faf6438852 Allow user to change admin username. 2022-04-03 22:25:32 -07:00
Juan Camilo González
3a7c4cb7c7 Add missing translations and fix spelling errors 2022-04-04 00:09:02 -05:00
Mike Cao
e31181c676 Update language bundles. 2022-04-03 20:19:05 -07:00
Mike Cao
99052d8026 Use yarn for docker build. 2022-04-03 19:22:20 -07:00
Mike Cao
119e4b9a9a Updated next and prisma. 2022-04-02 21:07:08 -07:00
Mike Cao
5d4ed6bd1b Updated packages. Use React 18. 2022-04-01 22:26:48 -07:00
Mike Cao
62519ff8b0 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-04-01 20:30:50 -07:00
Mike Cao
afe68f6e21 Update prisma seed files. 2022-03-31 19:25:04 -07:00
Mike Cao
f0b207f6a2 Updated packages. 2022-03-31 09:55:42 -07:00
Mike Cao
2bbcdd1c84
Merge pull request #1048 from quickstar/refactor-ci-cd-build-actions
Refactor ci cd build actions
2022-03-28 23:14:14 -07:00
Mike Cao
3098d720b0
Merge pull request #1054 from Lemonawa/patch-1
Improve zh-CN translations
2022-03-28 22:51:35 -07:00
Mike Cao
6c6a313782
Merge branch 'dev' into patch-1 2022-03-28 22:51:13 -07:00
Mike Cao
b030ea5708
Merge pull request #1056 from JeremDlcn/patch-1
Update fr-FR.json
2022-03-28 22:42:38 -07:00
Mike Cao
593f7d8d9c
Merge pull request #1058 from mikecao/dependabot/npm_and_yarn/minimist-1.2.6
build(deps): bump minimist from 1.2.5 to 1.2.6
2022-03-28 22:42:01 -07:00
dependabot[bot]
d4fe64acc0
build(deps): bump minimist from 1.2.5 to 1.2.6
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-27 04:27:37 +00:00
Ilham Syahid S
4a484286db
fix active users not appear 2022-03-27 11:02:18 +07:00
Jerem Dlcn
9aac74c256
Update fr-FR.json
translated the right file this time
2022-03-26 22:02:19 +01:00
Lemonawa
4200b8a214
Update zh-CN.json 2022-03-26 17:15:18 +08:00
Mike Cao
deca4e925c
Merge pull request #1043 from Kdecherf/fix/referrer
Fix regression on referrer filter and filter view based on referrer
2022-03-25 07:44:39 -07:00
Kevin Decherf
1269bea870 fixup! Update metric tables when filtering on referrer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-24 23:20:19 +01:00
Kevin Decherf
5d799a327b fixup! Rename ref to prevent collision with react elements
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-24 23:20:06 +01:00
Mike Cao
82bd7efdbe
Merge pull request #1050 from SeesawLiu/master
Update zh-CN.json
2022-03-24 11:09:40 -07:00
刘岗
67c3f3743f
Update zh-CN.json 2022-03-24 11:22:24 +08:00
Lukas Läderach
9a0c1dff9d feat(cd): use semantic release for docker images 2022-03-22 15:37:11 +01:00
Lukas Läderach
a2eadf76fe feat(ci): use matrix build to target databases 2022-03-22 15:37:11 +01:00
Lukas Läderach
65454842b0 feat(ci): add ci action 2022-03-22 15:37:03 +01:00
Lukas Läderach
65b0a03f97 feat(docker): use github.ref_name variable for image name 2022-03-22 14:27:52 +01:00
Kevin Decherf
35f9c7ef6c Update metric tables when filtering on referrer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-20 22:14:54 +01:00
Kevin Decherf
bb7d26d19f Fix referrer filter
7530de87d2 introduced a regression: the
domain parameter in refFilter() contains 'https://', which bypass the
new regex; thus we readd the call to getDomainName().

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-20 22:12:40 +01:00
Kevin Decherf
ecfc7ea68e Rename ref to prevent collision with react elements
It seems that, at least in dev mode, 'ref' may incorrectly refer to
react elements.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-03-20 22:10:41 +01:00
Randy
2bd3ddf6ec support multiple track script name 2022-03-19 14:18:32 +08:00
Mike Cao
46174f652c Added previous version to payload. 2022-03-18 22:52:42 -07:00
Mike Cao
f9f3a5bcab Fix upgrade logic. 2022-03-18 22:44:02 -07:00
Mike Cao
5b1eb8bec2 Added action to telemetry payload. 2022-03-18 22:39:39 -07:00
Mike Cao
7cf0927741 Enabling caching in tracker script. 2022-03-18 22:26:23 -07:00
Mike Cao
777dfeac0e Added prestart script. 2022-03-18 21:57:58 -07:00
Mike Cao
de3bf23e4c Fix 500 error in response. 2022-03-18 21:24:46 -07:00
Mike Cao
ffb091c1bc Updated telemetry payload. 2022-03-18 21:21:43 -07:00
Mike Cao
63bfa616f1 Set content type for responses. 2022-03-18 21:01:32 -07:00
Mike Cao
f24696de5a Refactored localization files. 2022-03-18 19:17:23 -07:00
Mike Cao
7c2b687350 Merge remote-tracking branch 'origin/dev' into dev 2022-03-18 19:02:33 -07:00
Mike Cao
281671b792 Fixed XML error in Firefox. Renamed telemetry env var. 2022-03-18 19:02:23 -07:00
Mike Cao
934914d249 Cleaned up eslint config. 2022-03-18 19:02:06 -07:00
Mike Cao
2f5926bd49
Merge pull request #1029 from tycrek/patch-1
Added Docker updating notes
2022-03-18 10:14:30 -07:00
Mike Cao
7a6cef2d71
Merge pull request #1034 from RikoDEV/patch-1
Update pl-PL.json
2022-03-18 10:01:49 -07:00
RikoDEV
0bd589df65
Update pl-PL.json 2022-03-18 16:55:45 +01:00
Mike Cao
2b4ddb5388
Merge pull request #1030 from mikecao/dev
v1.28.0
2022-03-17 21:26:11 -07:00
Mike Cao
90e0bfc9f3 Update packages. Bump version v1.28.0 2022-03-17 21:02:54 -07:00
Mike Cao
607e6a7be1 Update events chart when filter selected. Closes #494 2022-03-17 20:56:43 -07:00
Mike Cao
7530de87d2 Filter subdomains in referrers regex test. Closes #632 2022-03-17 19:58:06 -07:00
Josh Moore
1395b05038
Added Docker updating notes 2022-03-17 13:51:24 -06:00
Mike Cao
e38f08b8f6 404 page should use local url. Closes #1028 2022-03-16 22:57:40 -07:00
Mike Cao
a249f0c6dc Added postbuild script. 2022-03-16 22:05:43 -07:00
Mike Cao
0d33e6d08f Updated telemetry payload. 2022-03-16 21:59:17 -07:00
Mike Cao
45e4bfe3a9 Added telemetry script. 2022-03-16 21:50:24 -07:00
Mike Cao
3717b0e888 Fix issue with force SSL redirects. 2022-03-15 08:49:42 -07:00
Mike Cao
128f15092e Update session hash calculation. 2022-03-14 11:14:05 -07:00
Mike Cao
a7847ce5f4 Fix eslint plugin issue. 2022-03-11 22:26:58 -08:00
Mike Cao
785d41b6d3 Check for empty content-type header. 2022-03-11 22:17:47 -08:00
Mike Cao
93f15bc44b Updated packages. 2022-03-11 18:36:57 -08:00
Mike Cao
5f821461c2 Mobile css updates. 2022-03-11 16:04:05 -08:00
Mike Cao
cdd7273194 Added css-events tracker parameter. Closes #1018. 2022-03-10 23:04:05 -08:00
Mike Cao
5ca6f76daa Updated collect API response. 2022-03-10 20:39:11 -08:00
Mike Cao
17790aa5a8 Fix issue with sendBeacon request. 2022-03-10 19:01:33 -08:00
Mike Cao
48db7708de Updated CORS options. 2022-03-10 11:49:47 -08:00
Mike Cao
3e8dd815b7 Fix CSS in header. 2022-03-05 09:42:32 -08:00
Mike Cao
de50109b3e Use beacon api for links. Closes #446. 2022-03-04 20:36:13 -08:00
Mike Cao
a71377eca0 Updated language files. 2022-03-04 18:20:13 -08:00
Mike Cao
e099108ada Merge remote-tracking branch 'origin/dev' into dev 2022-03-03 19:46:04 -08:00
Mike Cao
20622116a8 New Dashboard component. 2022-03-03 19:45:49 -08:00
Mike Cao
33c921a32f Fix update notice styling. 2022-03-03 14:23:57 -08:00
Mike Cao
fe9573f088
Merge pull request #1007 from Klooven/master
Translations
2022-03-03 08:36:10 -08:00
Klooven
2f5d85ce15 Proofreading 2022-03-03 10:49:38 +00:00
Klooven
fd8a6a39af Missing translations added 2022-03-03 09:35:34 +00:00
Mike Cao
7f3b1087a1 Fix check-lang script. Ignore all en-GB. 2022-03-02 22:23:03 -08:00
Mike Cao
aa9dbd2092
Merge pull request #1003 from mikecao/dev
v1.27.0
2022-03-02 20:13:30 -08:00
Mike Cao
a4311d4773 Updated language files. 2022-03-02 19:38:21 -08:00
Mike Cao
c76fbbe11f Merge branch 'master' into dev 2022-03-02 19:37:51 -08:00
Mike Cao
c117e6dff0
Merge pull request #991 from nfn/patch-3
Update pt-PT.json
2022-03-02 19:36:13 -08:00
Mike Cao
164a1db259
Merge pull request #993 from JeremDlcn/patch-1
Update fr-FR.json
2022-03-02 19:35:50 -08:00
Mike Cao
5bcb6ab35c Bump version 1.27.0. 2022-03-02 18:35:18 -08:00
Mike Cao
f1d97660fb Updated react-spring to latest. 2022-03-02 15:23:47 -08:00
Mike Cao
5a88f2f002 Updated packages. 2022-03-02 14:22:41 -08:00
Mike Cao
6ea6e2e27d Fix tracker build. 2022-03-02 12:10:47 -08:00
Mike Cao
373dbf50ba Added website limit and show more button. Closes #592. 2022-03-01 23:03:50 -08:00
Mike Cao
7a3c1e9faa Fix default date range setting. 2022-03-01 22:02:31 -08:00
Mike Cao
69b81880cb Fix refresh button. Closes #994, #985. 2022-03-01 21:13:15 -08:00
Mike Cao
f547f2b0ec Add link to realtime referrers. 2022-03-01 19:41:37 -08:00
Mike Cao
0b846b482d Mobile layout updates. 2022-03-01 19:28:44 -08:00
Mike Cao
98b2ee29ef Added language and theme settings. 2022-02-28 20:54:32 -08:00
Mike Cao
3932cc4abb Fix realtime metrics header for mobile. Closes #959. 2022-02-28 18:43:16 -08:00
Mike Cao
34ad1d9c39 New mobile menu. 2022-02-28 18:39:37 -08:00
Jerem Dlcn
f5ab5f394f
Update fr-FR.json 2022-02-27 16:23:26 +01:00
Mike Cao
18efd4d101 Updated matching for different tracker names. 2022-02-27 02:53:24 -08:00
Nuno
c2aca9d494
Update pt-PT.json 2022-02-27 09:14:49 +00:00
Mike Cao
be98500e82 Move auth token logic to useApi hook. 2022-02-27 00:25:24 -08:00
Mike Cao
d552a01701 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-26 22:03:36 -08:00
Mike Cao
3a8bfd1dbd Move auth token logic to useApi hook. 2022-02-26 15:53:45 -08:00
Mike Cao
8aab66ee0a
Merge pull request #989 from Tox46/patch-1
Updated Italian Language
2022-02-25 08:13:48 -08:00
Tox46
e01176ce7d
Update lang-ignore.json
Added it-IT language
2022-02-25 14:48:26 +01:00
Tox46
a3179f8c79
Update it-IT.json
Added all missing traductions
2022-02-25 14:40:16 +01:00
Mike Cao
d19b6b5a82 Added useApi hook. 2022-02-22 23:52:31 -08:00
Mike Cao
7bd49e6caf Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-22 22:52:06 -08:00
Mike Cao
63bc187490
Merge pull request #978 from sophiabits/fix-772
Don't show metric change indicator when metric delta is 0 (resolves #772)
2022-02-22 22:51:58 -08:00
Mike Cao
b564ee6613
Merge pull request #979 from sophiabits/fix-925
Truncate text & show tooltip when website name is too long (Resolves #925)
2022-02-22 22:51:34 -08:00
Mike Cao
9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -08:00
Mike Cao
5d90a2d797
Merge pull request #977 from christopherpickering/patch-1
add netlify.toml
2022-02-22 22:07:24 -08:00
Mike Cao
7071f5fba5 Updated messages. 2022-02-22 13:31:37 -08:00
Mike Cao
7270d95240 Move environment variables to middleware. Closes #972. 2022-02-20 23:27:50 -08:00
Sophia Willows
74e1139072
Truncate website title on website list & website details pages 2022-02-20 14:32:54 +13:00
Sophia Willows
ef3f08788f
Don't show metric change indicator when metric delta is 0 2022-02-20 14:25:33 +13:00
Sophia Willows
07e782ca39
Truncate text in domain & name columns of website settings table when text content doesn't fit within the cell. 2022-02-20 14:08:43 +13:00
sur.la.route
f18491a818
add netlify.toml
for part of #731

Netlify next functions plugin is no longer copying in the build files. This adds the db file from the build into the functions.
2022-02-19 17:15:44 -06:00
Mike Cao
736347d37c Don't destructure process.env. 2022-02-18 21:30:41 -08:00
Mike Cao
4be4ff6479 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-18 20:03:06 -08:00
Mike Cao
460762bf3d Use rewrites for tracker script name, closes #972 2022-02-18 20:00:21 -08:00
Mike Cao
81e457babd
Merge pull request #971 from mikecao/dependabot/npm_and_yarn/next-12.1.0
build(deps): bump next from 12.0.10 to 12.1.0
2022-02-17 21:13:20 -08:00
Mike Cao
94cf918c05
Merge pull request #966 from 0xflotus/patch-1
chore: changed value in de_DE.json
2022-02-17 21:12:58 -08:00
dependabot[bot]
dec3d49ab1
build(deps): bump next from 12.0.10 to 12.1.0
Bumps [next](https://github.com/vercel/next.js) from 12.0.10 to 12.1.0.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v12.0.10...v12.1.0)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-18 02:39:57 +00:00
0xflotus
9b850c0e21
chore: changed value in de_DE.json
For unified naming purposes, I changed the value from 'Website' to 'Webseite'. This term was used multiple times before.
2022-02-17 11:45:05 +01:00
Mike Cao
1e4c3ebf3b
Merge pull request #964 from mikecao/dev
v1.26.0
2022-02-17 00:26:10 -08:00
Mike Cao
e5b3dc8162 Updated Catalan messages. 2022-02-16 23:41:11 -08:00
Mike Cao
cf2d8abd92
Merge pull request #963 from rogerclotet/update-ca
Update Catalan language
2022-02-16 23:39:03 -08:00
Mike Cao
ad56d2e1d5 Bump version 1.26. 2022-02-16 23:11:10 -08:00
Mike Cao
f5a268c916 CSS updates for mobile. 2022-02-16 23:10:35 -08:00
Mike Cao
edc31ba42b Removed load test scripts. 2022-02-16 20:59:40 -08:00
Mike Cao
c7a3505c39 Display custom tracker script name. 2022-02-16 20:58:44 -08:00
Mike Cao
8e350a2056 Added option to disable login. Closes #948 2022-02-16 15:01:33 -08:00
Roger Clotet
0f12686872 Update Catalan language 2022-02-16 10:50:05 +01:00
Mike Cao
429d5b480c Allow naming of tracker script. Closes #953 2022-02-15 21:03:09 -08:00
Mike Cao
940a752c38 Updated prisma and next. 2022-02-15 20:58:17 -08:00
Mike Cao
98ac091d4f Updated message bundles. 2022-02-15 20:35:28 -08:00
Mike Cao
9e7fc49f42 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-15 20:34:42 -08:00
Mike Cao
251617ffc5 Added lt-LT and ur-PK languages. Changed lang build. 2022-02-15 20:34:16 -08:00
Mike Cao
a035fbb581
Merge pull request #955 from nfn/patch-1
Update pt-PT.json
2022-02-13 21:07:38 -08:00
Mike Cao
191a5f64af
Merge pull request #956 from TszHong0411/master
Update zh-TW.json
2022-02-13 21:06:33 -08:00
tszhong0411
fef22b6f3f Update zh-TW.json 2022-02-14 10:59:19 +08:00
Nuno
f3e455b6b1
Update pt-PT.json 2022-02-13 13:20:15 +00:00
Nuno
73683f75bd
Update pt-PT.json 2022-02-13 13:02:07 +00:00
Mike Cao
7cbdaac59f Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-02-11 20:35:47 -08:00
Mike Cao
3537e94daf
Merge pull request #585 from kiprasmel/feat/add-lang-lt-LT
Add the Lithuanian language (`lt-LT`)
2022-02-11 20:35:28 -08:00
Mike Cao
f4c6d99034
Merge pull request #939 from adilj13/master
Added urdu language
2022-02-11 20:34:10 -08:00
Mike Cao
e6b1496179
Merge pull request #944 from ym-project/master
update ru-RU locale
2022-02-11 20:33:09 -08:00
Mike Cao
ce05bdce88
Merge pull request #945 from lxndrblz/patch-1
chore: added missing German translations
2022-02-11 20:32:30 -08:00
Mike Cao
e7a6787046
Merge branch 'dev' into patch-1 2022-02-11 20:31:48 -08:00
Kipras Melnikovas
76f3a2f75b
undo fancy stuff - does not work
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2022-02-10 22:11:43 +02:00
Kipras Melnikovas
a8e9df8932
experiment with "zero" formatting; sadly doesn't work for lt-LT yet
can try in:
- https://formatjs.io/docs/intl-messageformat/#common-usage-example

should work, as per:
- https://unicode-org.github.io/icu/userguide/format_parse/messages/#complex-argument-types
    - https://cldr.unicode.org/index/cldr-spec/plural-rules

in the tests of Format.JS, i see that only w/ the `ar`, or `cy`, or
similar locales it works, but somehow does not for `lt`/`lt-LT`.

keeping here won't hurt, esp. if the issue (the spec?) gets fixed

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2022-02-10 21:07:11 +02:00
Kipras Melnikovas
8d9555cb6a
Add the Lithuanian language (lt-LT)
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2022-02-10 20:24:33 +02:00
Alexander Bilz
9c65d376d7
Added missing German translations
Added the missing German translations.
2022-02-01 22:59:01 +01:00
ym-project
8ce7f95ae2
update ru-RU locale
Set more understandable translation for the `message.toggle-charts` key.
2022-01-31 14:51:11 +08:00
ym-project
10add67530
update ru-RU locale 2022-01-31 13:53:39 +08:00
Adil Aziz
ce622bb16b
Update ur-PK.json 2022-01-27 12:01:42 +05:00
Adil Aziz
48833ba249
Create ur-PK.json 2022-01-27 11:45:25 +05:00
Mike Cao
ba40ff23b9 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-01-25 21:24:10 -08:00
Mike Cao
6a8de2aeec Added option to remove trailing slash from urls. 2022-01-25 21:23:40 -08:00
Mike Cao
fc4323e726
Merge pull request #926 from alrico88/master
Updated spanish translation
2022-01-24 22:50:12 -08:00
Mike Cao
fbcd6a9913
Merge pull request #933 from mikecao/dependabot/npm_and_yarn/nanoid-3.2.0
build(deps): bump nanoid from 3.1.30 to 3.2.0
2022-01-24 22:49:28 -08:00
Mike Cao
3339ac19a6
Merge branch 'dev' into dependabot/npm_and_yarn/nanoid-3.2.0 2022-01-24 22:49:20 -08:00
Mike Cao
291db2b107 Upgraded to next 12.0.8 and prisma 3.8.1. 2022-01-24 22:46:14 -08:00
Mike Cao
d8e831db50 Switch to authentication using bearer token. 2022-01-23 00:33:06 -08:00
dependabot[bot]
ce36a28098
build(deps): bump nanoid from 3.1.30 to 3.2.0
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-22 01:18:14 +00:00
Mike Cao
698d4d2687 Update className check in tracker. 2022-01-21 14:49:18 -08:00
Mike Cao
547eefae82 Fix custom date range display. Closes #923, #921 2022-01-20 20:06:25 -08:00
Alberto Rico
bd1efdb2c4 Updated spanish translation 2022-01-19 18:37:01 +01:00
Mike Cao
2baf4b19fe Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-01-18 20:38:06 -08:00
Mike Cao
2f3a0c4edb
Merge pull request #918 from 0xflotus/patch-1
add: more translations in de-DE.json
2022-01-18 15:16:59 -08:00
Mike Cao
5d3196b594
Merge pull request #922 from leits/patch-1
Add missing uk-UA translations
2022-01-18 15:16:30 -08:00
Andrii Leitsius
e824324b9d
Add missing uk-UA translations 2022-01-18 19:34:09 +02:00
0xflotus
f4e73a2d16
add: more translations in de-DE.json 2022-01-18 13:06:19 +01:00
Mike Cao
5d74e86222
Merge pull request #916 from mikecao/dev
v1.25.0
2022-01-18 01:35:11 -08:00
Mike Cao
078ef83a40 Small fix to realtime users count. 2022-01-15 19:16:58 -08:00
Mike Cao
fa0ec301d0 Added active user count to realtime page. 2022-01-15 12:39:32 -08:00
Mike Cao
ddb549258b Added All time label. 2022-01-14 19:13:25 -08:00
Mike Cao
2f18aa29eb Lint fix. 2022-01-14 19:10:46 -08:00
Mike Cao
6bfaa4d40c Replaced color library. 2022-01-14 00:39:27 -08:00
Mike Cao
7d2ab240e6 Fixed invalid prop in Dot. 2022-01-14 00:21:59 -08:00
Mike Cao
db6e341e6e Bump version v1.25.0. 2022-01-14 00:17:37 -08:00
Mike Cao
f4d365bf78 Fix tracker for IE 11. 2022-01-14 00:17:06 -08:00
Mike Cao
489d46f663 Fix PR. 2022-01-14 00:08:27 -08:00
Mike Cao
f0edb2b0fe Merge remote-tracking branch 'origin/dev' into dev 2022-01-14 00:04:50 -08:00
Mike Cao
a101d639d3 Added All time date filter option. 2022-01-14 00:04:07 -08:00
Mike Cao
2e1db5ba55
Merge pull request #905 from p-chan/add-screen-fallback
Fix runtime error when device is null
2022-01-12 20:37:34 -08:00
Mike Cao
884dee06a5
Merge pull request #902 from mandaputtra/feature/895-add-number-online-on-realtime-page
implement realtime current users
2022-01-07 09:49:39 -08:00
Manda Putra
f10a8224f1 reset readme 2022-01-08 00:32:56 +07:00
Mike Cao
5f359b3cf1 Fix legend color mismatch. 2022-01-06 01:45:53 -08:00
Mike Cao
56cf55e053 Handle unique session errors. 2022-01-06 01:21:05 -08:00
Mike Cao
2a2ce0e98d Fix change password script. 2022-01-06 00:49:07 -08:00
P-Chan
56c0837e83 Refactor device message 2022-01-05 20:25:53 +09:00
P-Chan
20fa2d8fb2 Fix runtime error when device is null
Fix #904
2022-01-04 17:55:51 +09:00
Manda Putra
7d9372baa7 change every npm run with yarn 2021-12-26 11:37:41 +07:00
Manda Putra
dc29d8ed77 add info for development 2021-12-26 08:12:49 +07:00
Manda Putra
f5ecc401bf draft: implement realtime current users 2021-12-26 08:01:57 +07:00
Mike Cao
6923ea4d1d Added language names for all supported locales. 2021-12-19 23:25:29 -08:00
Mike Cao
de55496ac9 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-12-19 23:05:26 -08:00
Mike Cao
c531072a4e
Merge pull request #873 from cywio/languages-table
Add languages to website details page
2021-12-19 23:05:17 -08:00
Mike Cao
504b5f10d9 Fix refresh button issue, closes #840 2021-12-19 22:49:08 -08:00
Mike Cao
7b7557ec90 Merge branch 'prisma-upgrade' into dev 2021-12-17 20:40:40 -08:00
Mike Cao
066c0cf5ba Fix calendar bug, closes #892 2021-12-17 20:39:02 -08:00
Chris Walsh
7725553097
Remove languages table on main metrics page 2021-12-17 18:25:07 -08:00
Mike Cao
689cd983bb
Merge pull request #867 from JohnMica/patch-1
Update ro-RO.json
2021-12-17 18:03:47 -08:00
Mike Cao
52aefd0fec
Merge pull request #883 from cywio/tooltip-margin
Fix margin on tooltip
2021-12-17 18:03:12 -08:00
Mike Cao
74893b0237
Merge pull request #888 from mikecao/dependabot/npm_and_yarn/next-12.0.5
build(deps): bump next from 12.0.1 to 12.0.5
2021-12-17 18:02:22 -08:00
Mike Cao
d0fc89e914
Merge pull request #896 from winterrific/master
Added missing de-DE strings
2021-12-17 18:02:00 -08:00
Dorozala
0265c0206b Added missing de-DE strings
label.reset-website: Reset statistics
message.reset-warning: All statistics for this website will be deleted, but your tracking code will remain intact.
message.toggle-charts: Toggle charts
message.type-reset: Type {reset} in the box below to confirm.
2021-12-17 08:47:41 +01:00
Mike Cao
5ce457efa5 Updated raw query method. 2021-12-16 21:33:53 -08:00
Mike Cao
a609de0ea6 Updated prisma package. 2021-12-16 21:17:35 -08:00
dependabot[bot]
19beebefbb
build(deps): bump next from 12.0.1 to 12.0.5
Bumps [next](https://github.com/vercel/next.js) from 12.0.1 to 12.0.5.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v12.0.1...v12.0.5)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 22:47:16 +00:00
Chris Walsh
b31b6e6d88
Fix margin on tooltip 2021-12-04 16:07:31 -08:00
Mike Cao
d8b732026e
Merge pull request #872 from cywio/admin-websites-table
Add owner column to admin website settings table
2021-12-03 20:08:36 -08:00
Mike Cao
e572049cc4
Merge pull request #871 from cywio/remove-realtime-metrics
Remove comparison metrics from realtime header
2021-12-03 20:03:04 -08:00
Chris Walsh
9a326a33a0
Add languages table to metrics grid 2021-12-01 19:32:45 -08:00
Chris Walsh
b5f7aa1813
Add languages to metrics API endpoint 2021-12-01 19:25:00 -08:00
Chris Walsh
9cff025784
Add owner column to admin website settings table 2021-12-01 16:03:18 -08:00
Chris Walsh
8874357bed
Remove comparison metrics from realtime header 2021-12-01 15:07:10 -08:00
John Mica
e9b2a33373
Update ro-RO.json
a few more strings translated into Romanian
2021-11-25 11:28:19 +00:00
Mike Cao
b756fcddf1 Updated lock file. 2021-11-22 15:13:32 -08:00
Mike Cao
d4dd2069b6 Fix build issues. 2021-11-22 14:53:36 -08:00
Mike Cao
24c4180215
Merge pull request #855 from bboysoulcn/dev
update node 12.22
2021-11-22 09:21:00 -08:00
bboysoul
394f7b8f34
update node 12.22
error next@12.0.1: The engine "node" is incompatible with this module. Expected version ">=12.22.0". Got "12.18.4"
error Found incompatible module.
2021-11-22 15:29:16 +08:00
Mike Cao
cfa220c095 Updated node version. 2021-11-21 23:22:42 -08:00
Mike Cao
eba1b1d874
Merge pull request #853 from mikecao/dev
v1.24.0
2021-11-21 22:48:31 -08:00
Mike Cao
307931950b Added menu entry for vi-VN locale. 2021-11-21 22:38:11 -08:00
Mike Cao
d058c75011 Bump version 1.24.0. 2021-11-21 22:30:00 -08:00
Mike Cao
ebd52335bb Referrer filtering. 2021-11-21 22:00:14 -08:00
Mike Cao
65d4094095 Added safeDecodeURI method. Closes #848. 2021-11-21 17:47:18 -08:00
Mike Cao
b6ab8c381f Change env variable to CLIENT_IP_HEADER. 2021-11-21 09:39:22 -08:00
Mike Cao
b1ced5f32c Added COUNTRY_IP_HEADER environment variable. Closes #814. 2021-11-20 19:37:13 -08:00
Mike Cao
0a8c06b1f8 Added helper methods for locales. 2021-11-20 17:18:25 -08:00
Mike Cao
ef616cc98d Updated lang strings. 2021-11-20 17:02:24 -08:00
Mike Cao
74b8b128ef Switch to system font stacks. Closes #850. 2021-11-20 15:54:45 -08:00
Mike Cao
d780573572 Fix theme-color values. 2021-11-20 15:31:03 -08:00
Mike Cao
65adfeeef1 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-11-20 15:30:33 -08:00
Mike Cao
be55e251b6
Merge pull request #847 from 8times4/master
Add light/dark switch to meta theme-color
2021-11-20 15:30:12 -08:00
Mike Cao
93784ddf72 Added vi-VN language support. 2021-11-20 15:28:45 -08:00
Mike Cao
0f752de047
Merge pull request #851 from codyogden/issue-705
Add tooltip to charts toggle.
2021-11-20 15:25:15 -08:00
Cody Ogden
c6bb0a6c3c feat: Add tooltip to charts toggle. 2021-11-19 01:07:12 -06:00
Mark
3a01f499a5
Update _app.js 2021-11-17 14:23:58 +01:00
Mark
6343ff7638
Update _app.js 2021-11-17 14:13:32 +01:00
Mark
b2c21da798
Add light/dark switch to header
The colour of the header meta theme colour was set to default white, this will change it to respond to dark/light mode. 
https://css-tricks.com/meta-theme-color-and-trickery/
2021-11-17 14:09:53 +01:00
Mike Cao
17e070bb31
Merge pull request #843 from cuongtqtran/master
Add Vietnamese language (vi-VN)
2021-11-11 15:43:57 -08:00
Cuong Tran
a5bde95615 Create vi-VN.json 2021-11-10 20:29:01 +07:00
Mike Cao
502c8ae413
Merge pull request #842 from JeDaYoshi/dev
QoL changes on tracker
2021-11-09 20:11:57 -08:00
JeDaYoshi
cbf64e561a
QoL changes on tracker
- Remove redundant checks and returns
- Add an additional check for local storage (some browsers still lack it)
- Using some better practices
- Use MutationObserver for events
- Add initial events on DOM full render, send first trackView on complete readyState
2021-11-08 15:01:35 -04:00
Mike Cao
92b205b7b7 Cleaned up language files. 2021-11-04 17:09:03 -07:00
Mike Cao
33b87b41a9 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-11-04 15:55:17 -07:00
Mike Cao
a15dac05d4 Hide label option. 2021-11-04 15:55:12 -07:00
Mike Cao
2f33937210
Merge pull request #834 from GrimZZZ-404/master
Added app.json for heroku
2021-11-01 16:10:24 -07:00
GrimZZZ-404
a1ab45a418
Added app.json for heroku 2021-11-01 18:19:48 +05:30
Mike Cao
99861487ea Upgrade Next.js. 2021-10-27 02:08:19 -07:00
Mike Cao
77fc5b0157 Updated packages. 2021-10-27 02:05:39 -07:00
Mike Cao
37b59ac5f2 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-10-27 02:01:24 -07:00
Mike Cao
c17209760a
Merge pull request #829 from mandaputtra/feat/add-missing-id-translation
feat: add missing Indonesian translation
2021-10-27 01:28:17 -07:00
Mike Cao
b8a39b5d21 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-10-27 01:27:41 -07:00
Manda Putra
87274af5bb fix: event to peristiwa 2021-10-23 23:07:04 +07:00
Manda Putra
11844f6d97 feat: add missing indonesian translation 2021-10-23 23:05:35 +07:00
Mike Cao
8e214107d8
Merge pull request #822 from pickfire/fix-zh-space
Fix unnecessary spaces in CJK translation
2021-10-22 14:41:05 -07:00
Ivan Tham
eb7007b7b4 Fix unnecessary spaces in CJK translation
Fix #820
2021-10-14 12:00:19 +08:00
Mike Cao
56f37a3daf
Merge pull request #813 from atmonshi/fix-ar-lang
add missing translation for arabic
2021-10-11 21:06:13 -07:00
Mike Cao
344fa17d38 Fix typos. 2021-10-11 20:40:53 -07:00
Ashraf Monshi
81ed3f29df add missing translation for arabic 2021-10-06 16:37:55 +03:00
Mike Cao
2575cbfc11
Merge pull request #812 from mikecao/dev
v1.23.0
2021-10-06 00:47:27 -07:00
Mike Cao
668655e60a Bump version 1.23 2021-10-06 00:40:38 -07:00
Mike Cao
f12291eaf2 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-10-06 00:19:31 -07:00
Mike Cao
e12ae50728
Merge pull request #802 from meerfolk/add-event-type-filter
Add event_type filter for events endpoint
2021-10-06 00:12:15 -07:00
Mike Cao
29b274c1d5 Add country names for en-GB. 2021-10-06 00:02:47 -07:00
Mike Cao
4e3f93d5d4 Updated packages. 2021-10-05 23:32:37 -07:00
Mike Cao
8bebbca413 Check username/password. 2021-10-03 20:44:02 -07:00
Meerfolk
373e46ad70 Add event_type filter for events endpoint 2021-09-29 11:38:52 +03:00
Mike Cao
20b8f59b76
Merge pull request #798 from DarkKirb/master
Allow weeks to start on Monday in English locales
2021-09-27 10:15:15 -07:00
Mike Cao
f7d42673f1
Merge pull request #796 from ym-project/master
update ru-RU locale
2021-09-27 10:14:48 -07:00
Mike Cao
960afd1967
Merge pull request #799 from adonisd/master
fix noto dependency
2021-09-27 10:14:17 -07:00
adonisd
a922b9065a fix noto dependency 2021-09-27 11:55:35 +04:00
Charlotte Delenk
644ad33e04
Add en-GB locale
This is currently identical to en-US, except that weeks start on
Monday.
2021-09-26 09:07:05 +02:00
ym-project
e439c7eaed
update ru-RU locale 2021-09-24 14:11:06 +08:00
Mike Cao
0fb9a8e610
Merge pull request #777 from mikecao/dependabot/npm_and_yarn/immer-9.0.6
build(deps): bump immer from 9.0.5 to 9.0.6
2021-09-23 09:54:11 -07:00
Mike Cao
d459e468ba
Merge pull request #790 from mikecao/dependabot/npm_and_yarn/semver-regex-3.1.3
build(deps): bump semver-regex from 3.1.2 to 3.1.3
2021-09-23 09:53:50 -07:00
Mike Cao
e2e6eb0de5
Merge pull request #791 from thueske/master
Fix small typo in German lang file
2021-09-23 09:53:30 -07:00
Mike Cao
f1520fbb29
Merge pull request #793 from gaeulbyul/patch-1
Fix checking prefers-color-scheme media query
2021-09-23 09:53:08 -07:00
Gaeulbyul
b5b628ae3f
Fix checking prefers-color-scheme media query 2021-09-21 20:28:36 +09:00
Tobias Hüske
2f1efa176b
Merge pull request #1 from thueske/fix/german-typo
Fix small typo in German lang file
2021-09-21 13:02:02 +03:00
Tobias Hüske
4fcd09c93b
Fix small typo in German lang file 2021-09-21 12:01:40 +02:00
dependabot[bot]
9ed16f05c1
build(deps): bump semver-regex from 3.1.2 to 3.1.3
Bumps [semver-regex](https://github.com/sindresorhus/semver-regex) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/sindresorhus/semver-regex/releases)
- [Commits](https://github.com/sindresorhus/semver-regex/commits)

---
updated-dependencies:
- dependency-name: semver-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-21 00:40:15 +00:00
dependabot[bot]
21dfd1be9c
build(deps): bump immer from 9.0.5 to 9.0.6
Bumps [immer](https://github.com/immerjs/immer) from 9.0.5 to 9.0.6.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.5...v9.0.6)

---
updated-dependencies:
- dependency-name: immer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-03 04:01:10 +00:00
Mike Cao
90345c5874
Merge pull request #767 from anzepintar/master
Changed language label from Slovene to Slovenščina
2021-08-21 08:41:48 -07:00
Anže Pintar
4a36d9522f
Changed language label from Slovene to Slovenščina
Changed language label in menu from Slovene to Slovenščina
2021-08-21 09:01:16 +02:00
Mike Cao
9b1a75fd90
Merge pull request #762 from mikecao/dev
v1.22.0
2021-08-20 01:15:43 -07:00
Mike Cao
98bd599e97 Bump version v1.22.0 2021-08-20 01:09:45 -07:00
Mike Cao
df3ad3b6b8 Added Slovenian language. 2021-08-20 01:09:04 -07:00
Mike Cao
9a50e4930f
Merge pull request #744 from anzepintar/master
Slovenian translation
2021-08-20 01:00:51 -07:00
Mike Cao
ac00937aa2 Bump version v1.21.0 2021-08-20 00:54:04 -07:00
Mike Cao
29d83d5439 Updated packages. 2021-08-20 00:49:43 -07:00
Mike Cao
4260dd8f13
Merge pull request #760 from RikoDEV/patch-1
Update Polish localization
2021-08-19 18:48:55 -07:00
Mike Cao
66ed9a502a
Merge pull request #756 from cywio/metric-comparison
Add time period comparison metric to dashboard
2021-08-15 23:15:14 -07:00
RikoDEV
edcb17dbe2
Update Polish localization 2021-08-15 13:16:19 +02:00
Mike Cao
f1cb7e13c0
Merge pull request #753 from nemunaire/b/cidr-comparaison
Ensure comparaison of same CIDR IP version
2021-08-13 19:29:25 -07:00
Mike Cao
f9303e57d4
Merge pull request #755 from mikecao/dependabot/npm_and_yarn/path-parse-1.0.7
build(deps): bump path-parse from 1.0.6 to 1.0.7
2021-08-13 19:27:59 -07:00
Mike Cao
c23a77651b
Merge pull request #749 from mikecao/dependabot/npm_and_yarn/tar-6.1.2
build(deps-dev): bump tar from 6.1.1 to 6.1.2
2021-08-13 19:27:38 -07:00
Mike Cao
54c39b7cc9
Merge pull request #752 from cywio/reset-stats
Add reset website statistics to settings
2021-08-13 19:26:48 -07:00
Chris Walsh
0c304a2abc
Add dashboard previous-period comparison metrics 2021-08-12 16:01:51 -07:00
dependabot[bot]
9f9ab6c0a7
build(deps): bump path-parse from 1.0.6 to 1.0.7
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-12 18:17:45 +00:00
Pierre-Olivier Mercier
5bc72dcb99 Ensure comparaison of same CIDR IP version 2021-08-11 14:31:32 +02:00
Chris Walsh
6e128b2f38
Add reset website statistics to settings 2021-08-10 14:03:55 -07:00
dependabot[bot]
b908a05300
build(deps-dev): bump tar from 6.1.1 to 6.1.2
Bumps [tar](https://github.com/npm/node-tar) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.1...v6.1.2)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 23:53:12 +00:00
Anže Pintar
dda185af90
Slovenian translation
I have tested it on my website. Everything is ok, except line 60, where my language would need 4 different forms:
1 - obiskovalec
2 - obiskovalca
3,4 - obiskovalci
0,5,6... - obiskovalcev
2021-07-26 19:20:57 +02:00
Mike Cao
ae7186c32a
Merge pull request #742 from mikecao/dev
Dev
2021-07-25 21:41:49 -07:00
Mike Cao
c7265c68d2 Bump version 1.20.0. 2021-07-25 21:36:36 -07:00
Mike Cao
2cc6a98241 Updated packages. 2021-07-25 21:36:07 -07:00
Mike Cao
9b5411efcb
Merge pull request #741 from Sammy-T/page-scroll
Preserve page's scroll position
2021-07-25 21:27:32 -07:00
Sammy-T
17a673a69a Preserve page's scroll position 2021-07-25 02:42:13 -04:00
Mike Cao
e5e484cb30 Revert Next version back to 10. 2021-07-22 19:17:40 -07:00
Mike Cao
4f27a1773d Added Korean language. 2021-07-22 19:16:21 -07:00
Mike Cao
cbdf00430d
Merge pull request #729 from mikecao/dependabot/npm_and_yarn/lodash-4.17.21
build(deps): bump lodash from 4.17.20 to 4.17.21
2021-07-21 13:38:57 -07:00
Mike Cao
e16553ab0d
Merge pull request #734 from meirroth/dev
Remove fonts.gstatic.com preconnect artifact
2021-07-21 13:38:38 -07:00
Mike Cao
ecc265c13e
Merge pull request #733 from rkJun/master
feat: add Korean language
2021-07-21 13:38:25 -07:00
Meir Roth
e6bfe8efd1 Remove fonts.gstatic.com preconnect artifact
Not needed anymore, as fonts are now sourced locally 😏
See: https://github.com/mikecao/umami/pull/677
2021-07-20 20:02:58 +03:00
Mike Cao
4f38242927 Update geo lookup 2021-07-18 23:48:30 -07:00
Juntai Park
2b0025b008 feat: add Korean language 2021-07-19 13:38:56 +09:00
Mike Cao
526ed01d0a Fix issue with country db. 2021-07-16 09:23:55 -07:00
dependabot[bot]
9fefe98495
build(deps): bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

---
updated-dependencies:
- dependency-name: lodash
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-16 07:26:19 +00:00
Mike Cao
a2fdab6c9b
Merge pull request #728 from mikecao/dev
v1.19.0
2021-07-16 00:25:42 -07:00
Mike Cao
25085cbe10 Updated readme. 2021-07-16 00:07:43 -07:00
Mike Cao
0d3fafeb2e Merge remote-tracking branch 'origin/dev' into dev 2021-07-16 00:05:58 -07:00
Mike Cao
81433f65b1 Bump version 1.19.0. 2021-07-16 00:05:36 -07:00
Mike Cao
195d2a5093
Merge pull request #722 from pqvst/patch-1
Consider adding restart policy to docker-compose.yml
2021-07-12 20:49:14 -07:00
Mike Cao
d1e5ab9e07 Fix next config. 2021-07-12 20:25:24 -07:00
Mike Cao
324d31cfcc Added eslint package for nextjs. 2021-07-12 20:02:34 -07:00
Mike Cao
f012f9df76 Updated more packages. 2021-07-12 00:44:43 -07:00
Mike Cao
b0d773b843 Updated packages. 2021-07-12 00:39:12 -07:00
Philip Bergqvist
c5d775ce72
Consider adding restart policy to docker-compose.yml
It might be a good idea to add a restart policy to the default `docker-compose.yml` file.

Either: `restart: always` or `restart: unless-stopped`

Useful in case Umami crashes for some reason (see #721)

This is also useful in case the server restarts, so Umami starts up again after rebooting.

https://docs.docker.com/config/containers/start-containers-automatically/
2021-07-10 17:05:01 +08:00
Mike Cao
78566cd365 Merge remote-tracking branch 'origin/dev' into dev 2021-06-29 18:41:48 -07:00
Mike Cao
f91cc82c82 Dynamically fetch language bundles at runtime. 2021-06-29 18:41:34 -07:00
Mike Cao
73e83ad767 Added Hungarian language. 2021-06-28 21:11:12 -07:00
Mike Cao
1de0fa2d71
Merge pull request #695 from mikecao/dependabot/npm_and_yarn/glob-parent-5.1.2
build(deps): bump glob-parent from 5.1.1 to 5.1.2
2021-06-25 20:40:59 -07:00
Mike Cao
b7904b3e43
Merge pull request #696 from mikecao/dependabot/npm_and_yarn/browserslist-4.16.6
build(deps): bump browserslist from 4.14.3 to 4.16.6
2021-06-22 21:20:28 -07:00
Mike Cao
eeb043dc9f
Merge pull request #697 from mikecao/dependabot/npm_and_yarn/trim-newlines-3.0.1
build(deps): bump trim-newlines from 3.0.0 to 3.0.1
2021-06-17 22:23:02 -07:00
Mike Cao
5f9455b9e9
Merge pull request #706 from Hsiao-Feng/dev
For lang zh-TW.json : Fix punctuation and optimize details.
2021-06-17 22:22:33 -07:00
HsiaoFeng
6265f2b542 For lang zh-TW.json : Fix punctuation and optimize details. 2021-06-12 18:34:20 +08:00
dependabot[bot]
1051e53265
build(deps): bump trim-newlines from 3.0.0 to 3.0.1
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 04:47:52 +00:00
dependabot[bot]
431accd1cf
build(deps): bump browserslist from 4.14.3 to 4.16.6
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.3 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.3...4.16.6)

---
updated-dependencies:
- dependency-name: browserslist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 04:47:29 +00:00
dependabot[bot]
5d44a2fb89
build(deps): bump glob-parent from 5.1.1 to 5.1.2
Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 04:47:09 +00:00
Mike Cao
06535704ae
Merge pull request #694 from mikecao/dev
v1.18.0
2021-06-07 21:46:03 -07:00
Mike Cao
d03f2b19b4 Merge remote-tracking branch 'origin/dev' into dev 2021-06-07 21:29:46 -07:00
Mike Cao
0af54518cd Bump version 1.18.0. 2021-06-07 21:29:14 -07:00
Mike Cao
6dd65803f9 Updated mobile menu. 2021-06-07 21:25:45 -07:00
Mike Cao
fdadaddab7 Fixed placement of modals. 2021-05-25 18:51:50 -07:00
Mike Cao
b2d04c00ac Change to synchronous password hashing. 2021-05-23 17:29:27 -07:00
Mike Cao
ea40e2fbf5
Merge pull request #682 from rogerclotet/background-scroll
Fix mismatching background in dark mode overscroll
2021-05-22 14:54:09 -07:00
Roger Clotet
2f706996a2
fix: match background in dark mode overscroll
In macOS and iOS devices you can scroll past the body. When this happens
in dark mode, the css variables are only changed from the `body`, and
the ones used in `html` are not changed. This causes the overscroll
background to be displayed as the light mode color.
2021-05-22 21:54:34 +02:00
Mike Cao
756beb2cf5 Update fonts. 2021-05-21 18:28:20 -07:00
Mike Cao
04a51bc8c9 Added webpack loading mode for fonts. 2021-05-21 11:42:36 -07:00
Mike Cao
40747b463c Fix typo. 2021-05-21 10:55:37 -07:00
Mike Cao
c365e023ee
Merge pull request #677 from rogerclotet/local-fonts
feat: use fonts from @fontsource instead of Google CDN
2021-05-21 10:27:16 -07:00
Mike Cao
e8fad828ed
Merge branch 'dev' into local-fonts 2021-05-21 10:27:07 -07:00
Roger Clotet
ea59804573
feat: use fonts from @fontsource instead of Google CDN 2021-05-20 22:21:30 +02:00
Mike Cao
8830c0bd30 Updated packages. 2021-05-19 23:41:58 -07:00
Mike Cao
a46a441480 Fix translation. 2021-05-19 20:39:06 -07:00
Mike Cao
63b04b92f1
Merge pull request #660 from atmonshi/add-arabic-lang
add Arabic language (ar-SA) (Arabic Saudi Arabia)
2021-05-19 20:36:20 -07:00
Mike Cao
48e5977efa
Merge branch 'dev' into add-arabic-lang 2021-05-19 20:36:07 -07:00
Mike Cao
107454ebe2
Merge pull request #661 from Hsiao-Feng/dev
Optimize Chinese Translation Details.
2021-05-19 20:28:09 -07:00
Mike Cao
f7757ad0f4
Merge pull request #663 from bilguun0203/master
Use Mongolian locale from date-fns
2021-05-19 20:27:50 -07:00
Mike Cao
d7efccf8f9
Merge pull request #668 from sinaomrani/patch-1
Improve Farsi Translation
2021-05-19 20:27:11 -07:00
Mike Cao
62f8eae5aa
Merge pull request #675 from rogerclotet/ca
feat: add Catalan language
2021-05-19 20:26:32 -07:00
Roger Clotet
649ae83329
feat: add Catalan language 2021-05-20 00:40:03 +02:00
Mike Cao
feb4615485 Updated packages. 2021-05-19 15:23:33 -07:00
Sina M. Omrani
39d01ed045
Improve Translation
used better words and zero-width non-joiner character for plural (and some other words) to improve readability
2021-05-18 11:47:21 +04:30
Bilguun Ochirbat
be99d7165b Added missing translation 2021-05-17 13:36:08 +08:00
Bilguun Ochirbat
41bfa1c165 Use Mongolian locale from date-fns 2021-05-17 13:24:12 +08:00
Bilguun Ochirbat
9e58bdaea7 update date-fns from 2.16.1 to 2.21.3 2021-05-17 13:20:01 +08:00
Ashraf Monshi
afc4940680 add rtlLocales array 2021-05-16 09:27:48 +03:00
Ashraf Monshi
703a1e13db use useLocale 2021-05-15 11:29:39 +03:00
Hsiao Feng
fddc3ab96e
Fix mistake. 2021-05-14 22:18:51 +08:00
Hsiao Feng
9c594fe3ae
Optimize details. 2021-05-14 22:18:07 +08:00
Ashraf Monshi
0c13f8d358 add rtl support 2021-05-13 09:15:37 +03:00
Mike Cao
3852fefaff
Merge pull request #655 from zhigang1992/base_path
chore(docker): add base_path to build args
2021-05-12 19:29:05 -07:00
Mike Cao
a06901336c
Merge pull request #651 from foxytocin/enhancement
Enhancement of issue #649: also checking agains NULL in urlFilter
2021-05-12 19:28:22 -07:00
Mike Cao
d6c48fa121
Merge pull request #650 from foxytocin/master
prevents crashes if NULL is entered as a referrer in the database
2021-05-12 19:27:01 -07:00
Mike Cao
b896ea4533
Merge pull request #657 from mikecao/dependabot/npm_and_yarn/hosted-git-info-2.8.9
build(deps): bump hosted-git-info from 2.8.8 to 2.8.9
2021-05-12 19:25:28 -07:00
Ashraf Monshi
0126154e39 Update ar-SA.json
revert message.active-users
2021-05-11 11:02:52 +03:00
Ashraf Monshi
3075f772ec Update ar-SA.json
fix message.active-users
2021-05-11 10:55:28 +03:00
Ashraf Monshi
ba2d9783b7 add arabic language (ar-SA)
add arabic language (ar-SA) (arabic saudi arabia)
2021-05-11 10:44:41 +03:00
dependabot[bot]
e4412d723d
build(deps): bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 11:49:05 +00:00
Zhigang Fang
3d9951661c
chore(docker): add base_path to build args 2021-05-08 19:48:51 +08:00
Andreas Fuchs
cfb13b2d54 enhancement #649
as refFilter, urlFilter is expanded checking agains url !== null.
2021-05-06 10:47:23 +02:00
Andreas Fuchs
bd8f72daab fixes #649
prevents crashes if NULL is entered as a referrer in the database. Does not guard against submitting NULL to the database.
2021-05-06 10:04:37 +02:00
Mike Cao
5ecaf5587b
Merge pull request #642 from mikecao/dev
v1.17.0
2021-04-28 02:48:48 -07:00
Mike Cao
20dc76861f Swap bcrypt library. 2021-04-28 02:45:38 -07:00
Mike Cao
b294c8ef72 Proper fix. 2021-04-28 02:18:54 -07:00
Mike Cao
5f41447158 Fix issue with server build. 2021-04-28 02:12:17 -07:00
Mike Cao
a22f22a8ba Bump version 1.17.0. 2021-04-28 02:05:51 -07:00
Mike Cao
66759409e3 Added button to show/hide charts, closes #577. 2021-04-28 02:02:59 -07:00
Mike Cao
041c7737e8 Check user theme preference, closes #555. 2021-04-26 00:06:50 -07:00
Mike Cao
92705815ed Support CIDR notation in IGNORE_IP, closes #544. 2021-04-25 23:57:49 -07:00
Mike Cao
0cf115b2de Load lookup database only once. 2021-04-25 18:32:06 -07:00
Mike Cao
8307b46987 Updated packages. 2021-04-24 21:27:24 -07:00
Mike Cao
a2b4a2a928 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2021-04-24 21:19:24 -07:00
Mike Cao
fdbb5fcce7
Merge pull request #630 from Wonderfall/fix-page-filter
Fix Pages filter when URL has a trailing slash
2021-04-24 21:19:14 -07:00
Mike Cao
c9c158d1e8
Merge pull request #631 from mikecao/dependabot/npm_and_yarn/jose-2.0.5
build(deps): bump jose from 2.0.3 to 2.0.5
2021-04-24 21:17:35 -07:00
Mike Cao
af6ee27031 Fix issue with checkbox click, closes #549. 2021-04-24 20:56:22 -07:00
dependabot[bot]
9a577675d3
build(deps): bump jose from 2.0.3 to 2.0.5
Bumps [jose](https://github.com/panva/jose) from 2.0.3 to 2.0.5.
- [Release notes](https://github.com/panva/jose/releases)
- [Changelog](https://github.com/panva/jose/blob/v2.0.5/CHANGELOG.md)
- [Commits](https://github.com/panva/jose/compare/v2.0.3...v2.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 14:58:35 +00:00
Wonderfall
807cd5d744
Fix Page Filter when URL has a trailing slash 2021-04-19 01:43:09 +02:00
Mike Cao
e9fd42baa5
Merge pull request #628 from MoltenCoffee/master
Very small update for missing Dutch string
2021-04-14 13:39:53 -07:00
MoltenCoffee
c95c9afaaf
Merge branch 'master' of https://github.com/MoltenCoffee/umami 2021-04-13 11:20:33 +02:00
MoltenCoffee
d7dc6b0e5d
Update dutch strings 2021-04-13 11:15:16 +02:00
Mike Cao
930d050698 Merge branch 'master' into dev 2021-04-08 22:02:15 -07:00
Mike Cao
afb5e17476
Merge pull request #586 from kiprasmel/feat/toggle-checkbox-on-label-click
feat/toggle-checkbox-on-label-click
2021-04-08 22:01:52 -07:00
Mike Cao
c5d23867f5 Update docker login 2021-04-08 21:49:41 -07:00
Mike Cao
42888b75c4 Update workflow 2021-04-08 21:35:53 -07:00
Mike Cao
e67b0c7845
Merge pull request #589 from webknjaz/patch-1
Use `GITHUB_TOKEN` for publishing images to GHCR
2021-04-08 21:04:01 -07:00
Mike Cao
6ea07b33d7
Merge pull request #591 from Sammy-T/mobile-burger
Align and theme mobile burger button
2021-04-08 20:57:01 -07:00
Sammy-T
24a3667471 Prevent burger from overlapping menu contents 2021-03-30 06:13:11 -04:00
Sammy-T
3482031732 Center burger button content and match color theme 2021-03-30 05:54:50 -04:00
Sviatoslav Sydorenko
1c5dd0358a
Use GITHUB_TOKEN for publishing images to GHCR 2021-03-29 13:14:51 +02:00
Kipras Melnikovas
4e4ae0a7d0
Toggle the checkbox when clicking on the label
Pretty sure the `user-select: none` could be employed
in other places aswell

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
2021-03-28 20:07:09 +03:00
Mike Cao
6c9bea98b9
Merge pull request #581 from ym-project/master
Update ru-RU.json
2021-03-27 20:09:16 -07:00
Mike Cao
4b847b9095
Merge pull request #582 from alex-connor/patch-3
Update uk-UA.json
2021-03-27 20:08:50 -07:00
Alexandr Loskutov
1a61622064
Update uk-UA.json 2021-03-27 23:58:44 +02:00
ym-project
9e16959afe
Update ru-RU.json 2021-03-27 16:56:14 +08:00
Mike Cao
ce35a2d0ab
Merge pull request #580 from mikecao/dev
v1.16.0
2021-03-26 22:46:43 -07:00
Mike Cao
555cb67061 Bump version 1.16.0 2021-03-26 22:39:55 -07:00
Mike Cao
609cc0e98a Fix datamaps. 2021-03-26 22:32:13 -07:00
Mike Cao
86ed5d56fa Updated header links. 2021-03-26 21:50:53 -07:00
Mike Cao
b24b855006 Truncate strings. 2021-03-26 20:56:08 -07:00
Mike Cao
9415fe9a6c Updated languages. 2021-03-26 20:52:54 -07:00
Mike Cao
10e82a9ef6 Merge remote-tracking branch 'origin/dev' into dev 2021-03-26 20:01:37 -07:00
Mike Cao
c17acafe8f Update referrer. 2021-03-26 20:01:25 -07:00
Mike Cao
44f2002563
Merge pull request #567 from Form1ca/decrease-request-count
decrease db query count
2021-03-26 19:54:21 -07:00
Mike Cao
61f6886eab
Merge pull request #579 from kayuapi/dev
quote the globs in npm scripts
2021-03-26 19:49:45 -07:00
Mike Cao
c5341e605b Fixed country lookup. 2021-03-26 19:47:28 -07:00
cong
3bf6a0ce99 quote the globs in npm scripts 2021-03-27 10:34:01 +08:00
Mike Cao
f9bf6aff2e Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	yarn.lock
2021-03-26 17:09:30 -07:00
Mike Cao
69b86a2b9d Updated packages. 2021-03-26 17:08:58 -07:00
Mike Cao
555c9213f4
Merge pull request #575 from denysdovhan/master
Use DataMaps as a source for the world map
2021-03-26 16:34:51 -07:00
Mike Cao
41a8f28047
Merge pull request #576 from Form1ca/fix-loadtest-reff
fix loadtest
2021-03-26 16:34:22 -07:00
Denys Dovhan
0b996be818
Fix yarn.lock 2021-03-26 12:23:19 +02:00
formica2
f22708cbc5 fix loadtest 2021-03-26 09:25:59 +03:00
Mike Cao
1ea1e06f9f
Merge pull request #560 from beornf/master
Prisma Migrate with database seeding fixes #559
2021-03-25 20:27:06 -07:00
Mike Cao
e0474ea05b
Merge pull request #574 from 20Koen02/patch-1
Vertically Center Theme Button
2021-03-25 20:18:32 -07:00
Denys Dovhan
edc3251966
Use datamaps world map instead of world-110m 2021-03-26 00:14:23 +02:00
Denys Dovhan
94af336388
Add datamaps as a dependency 2021-03-26 00:13:53 +02:00
Mike Cao
078a457b34
Merge pull request #573 from kayuapi/master
malay translation
2021-03-25 14:57:36 -07:00
Koen van Wijngaarden
ed4b81eea2
Vertically Center Theme Button 2021-03-25 20:44:39 +01:00
cong
17f8152ec8 malay translation 2021-03-25 22:23:48 +08:00
formica2
97c0da8527 fix fields name at request 2021-03-25 15:44:37 +03:00
Mike Cao
bd9d2d8571
Merge pull request #561 from KrystianGraba/master
Edit polish locale
2021-03-24 10:15:25 -07:00
formica2
e6975b9afc decrease db query count 2021-03-24 12:58:08 +03:00
KrystianGraba
cbe78f5cbe Edit polish locale
One line edited:
Zaloguj sie -> Zaloguj się
2021-03-21 11:18:49 +01:00
Beorn Facchini
3925258bc7 Prisma Migrate with database seeding fixes #559 2021-03-20 23:01:10 +11:00
Mike Cao
b8b4e1b75b
Merge pull request #513 from gabehab/dev
Create mobile menu
2021-03-17 07:25:18 -07:00
Mike Cao
dd577783d3
Merge pull request #550 from gnarlex/domain-placeholder
Feature: Add placeholder to domain input
2021-03-17 07:24:26 -07:00
Mike Cao
279226f9a9
Merge pull request #546 from l0st0/master
Added SK language
2021-03-17 07:23:59 -07:00
Mike Cao
07a69f0272
Merge pull request #552 from gowthamgts/patch-2
add label.all-events translation for tamil
2021-03-17 07:21:35 -07:00
Mike Cao
6a8028ded9
Merge pull request #551 from Sammy-T/chart-text
Prevent bar chart label overlap
2021-03-17 07:21:03 -07:00
Gowtham Gopalakrishnan
185b2a2d2a
add label.all-events translation for tamil
added ta-IN missing translation as mentioned here: https://github.com/mikecao/umami/wiki/Missing-translations
2021-03-17 17:41:44 +05:30
Sammy-T
f306107a38 Adjust x-axis labels when record count is greater than 25 2021-03-16 12:20:57 -04:00
Sammy-T
ae8f642720 Include pixel density to scale along Bar Chart width 2021-03-16 11:12:51 -04:00
Alexander Klein
b0323b000a feat: add placeholder to domain input 2021-03-16 14:44:38 +01:00
Sammy-T
4b9e7e9218 Adjust Bar Chart x-axis labels to prevent overlap 2021-03-16 03:55:21 -04:00
l0st0
b1d4922df8 Added SK language
Support for Slovakia
2021-03-15 22:25:43 +01:00
Mike Cao
f8ac987bfc
Merge pull request #543 from mikecao/dev
v1.15.0
2021-03-12 23:51:09 -08:00
Mike Cao
247afc8c33 Truncate URL lengths. 2021-03-12 23:45:19 -08:00
Mike Cao
efd53f8a03 Update packages. 2021-03-12 23:20:23 -08:00
Mike Cao
7e302edccf Bump version 1.15 2021-03-12 22:58:58 -08:00
Mike Cao
a03e42e0d9 Added font for Chinese traditional. 2021-03-12 22:53:56 -08:00
Mike Cao
fb711d58f1 Updated bot detection library. 2021-03-12 22:44:25 -08:00
Mike Cao
e5ff182302 Added Persian language. 2021-03-12 22:30:26 -08:00
Mike Cao
cce59eae65
Merge pull request #541 from gnarlex/empty-placeholder-margin
Style: Add gap between "empty" placeholder message and children
2021-03-12 13:37:53 -08:00
Alexander Klein
a4b1a478af style: add margin to "empty" placeholder message 2021-03-12 18:12:53 +01:00
Mike Cao
e486acb316
Merge pull request #534 from gnarlex/fix-start-of-week
Use locale to determine start of week
2021-03-10 20:53:41 -08:00
Mike Cao
b42965fbbb
Merge pull request #537 from mikecao/dependabot/npm_and_yarn/elliptic-6.5.4
build(deps): bump elliptic from 6.5.3 to 6.5.4
2021-03-10 20:52:00 -08:00
dependabot[bot]
73ab39748d
build(deps): bump elliptic from 6.5.3 to 6.5.4
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-11 01:57:36 +00:00
Alexander Klein
f6f14bf104 fix(lib): add default value for getDateRange 2021-03-10 10:40:59 +01:00
Alexander Klein
3cb748b29b feature(hooks): use locale in useDateRange hook 2021-03-10 10:39:31 +01:00
Alexander Klein
a1edcecde7 feature(components): add locale for date ranges 2021-03-10 10:38:35 +01:00
Alexander Klein
a48c33fcd6 feature(DateFilter): use locale for date ranges 2021-03-10 10:22:19 +01:00
Alexander Klein
eb1029bfc8 feature(lib): locale option for getDateRange 2021-03-10 10:20:54 +01:00
Alexander Klein
17836c70e7 feature(calendar): use locale for start of week 2021-03-10 10:11:23 +01:00
Mike Cao
45181463c4
Merge pull request #522 from Sammy-T/login-menu
Login menu scaling
2021-03-08 21:04:49 -08:00
Mike Cao
6fd5c36925
Merge pull request #526 from MaxFork/master
Adding translation file fa-IR
2021-03-08 20:41:39 -08:00
Sammy-T
52bf53eda9 Increase row padding 2021-03-08 16:18:24 -05:00
Max Base
b759bb0b00
Completing the translation file fa-IR 2021-03-08 05:20:00 +03:30
Max Base
2d56809de9
Translate more words in fa-IR 2021-03-08 05:15:16 +03:30
Max Base
b03834b91b
translate more words in fa-IR 2021-03-08 05:09:09 +03:30
Max Base
ec83f8d5f3
Create fa-IR with default as en-US 2021-03-08 05:06:27 +03:30
Max Base
3ae7f8589f
Create fa-IR.json 2021-03-08 05:06:10 +03:30
Sammy-T
1b0491588f Extend input min-width and add padding 2021-03-05 19:48:20 -05:00
Sammy-T
38256c7e90 Contain login field widths on smaller displays 2021-03-05 19:18:31 -05:00
Mike Cao
24206a652a
Merge pull request #516 from meirroth/master
Fix favicon paths
2021-03-04 20:38:48 -08:00
Meir Roth
c5c62b68c9
Added basePath 2021-03-05 00:23:47 +00:00
Meir Roth
3087fa5dc0
Added basePath 2021-03-05 00:20:53 +00:00
Meir Roth
81f6ecb128 fix favicon paths 2021-03-01 22:32:46 +02:00
gabehab
0720050d65 Remove errand file 2021-02-28 20:42:21 -08:00
gabehab
18806c15cf Add temporary close and open menu icons 2021-02-28 20:37:59 -08:00
Sammy-T
47d26c743f Merge remote-tracking branch 'upstream/master' 2021-02-27 03:42:15 -05:00
Mike Cao
405766d829
Merge pull request #512 from mikecao/dev
v1.14.0
2021-02-26 22:55:54 -08:00
Mike Cao
4edd012712
Merge pull request #504 from gnarlex/fix-domain-regex
Fix: Domain name regex accepts protocols on non-localhost domains
2021-02-26 22:49:21 -08:00
Mike Cao
f3bf35189a Bump version. 2021-02-26 22:46:44 -08:00
Mike Cao
d6d0f99daa Updated date formatting for locales. 2021-02-26 22:41:05 -08:00
Mike Cao
50bc2371b8 Fix unknown country display on realtime page. 2021-02-26 21:20:47 -08:00
Mike Cao
f7201c9cfc Remove domain parameter from queries. 2021-02-26 19:50:44 -08:00
Alexander Klein
9115ce4200 revert: allow ports in non-localhost domain names
Refs: 22ca617
2021-02-24 11:00:08 +01:00
Alexander Klein
22ca617165 fix(regex): ports in domain names
Accept port numbers on all domain names, not just `localhost`.
Deny leading zeros in port numbers.
2021-02-23 16:11:42 +01:00
Alexander Klein
0c2b68d56e fix(regex): protocol accepted in domain name
Add missing brackets to the regex.
Before, the caret and dollar sign symbols were not applied to the whole string but to either side of the `|` symbol.
2021-02-23 15:58:31 +01:00
Mike Cao
278672233e
Merge pull request #490 from ruibaby/fix/page-content-jitter
fix: the page content jitters when the page jumps.
2021-02-23 00:45:15 -08:00
Mike Cao
07754169ab
Merge pull request #496 from gnarlex/fix-event-details
fix: event table fails to render in detail view
2021-02-23 00:42:04 -08:00
Mike Cao
72066c0332
Merge pull request #497 from gnarlex/add-prop-types-dependency
fix(deps): add prop-types dependency
2021-02-23 00:41:25 -08:00
Mike Cao
5d9357748e
Merge pull request #499 from gnarlex/fix-style-issues
Fix "No data available" display issues
2021-02-23 00:40:55 -08:00
Sammy-T
bb0f762217
Merge pull request #1 from mikecao/master
Update from root repo
2021-02-22 00:10:50 -05:00
Alexander Klein
f93ecdfee8 style(realtime): fix layout for realtime protocol 2021-02-21 15:12:49 +01:00
Alexander Klein
c5e03cd5d4 fix(styling): "no data" caption not considered in height calculations
Change `NoData` container position to `relative`. Otherwise it won't be considered in `auto` height calculations by browsers.

Also change the way `NoData` content is centered.
2021-02-21 14:39:30 +01:00
Alexander Klein
98a60d0d3e fix(Dashboard): "no data" caption not rendered
Change styling of `DataTable` to make `NoData` visible again.

Refs #498
2021-02-21 13:51:33 +01:00
Alexander Klein
a981fa30c7 style(MetricTable): fill container height 2021-02-21 13:25:27 +01:00
Alexander Klein
20932a4a11 style(grid): grid row x-padding for smaller screens 2021-02-21 13:20:35 +01:00
Alexander Klein
a65f9b9d73 fix(deps): add prop-types dependency
Forgot to do this in the referenced PR.

Refs #481
2021-02-21 10:54:30 +01:00
Alexander Klein
f357916042 fix: event table fails to render in detail view
The `EventsTable` component failed to render in the detail view, because the `onDataLoad` property is called but none was provided. See the issue for details.

Add a nullcheck to `onDataLoad` before calling it.

Refs #495
2021-02-21 10:31:23 +01:00
Mike Cao
7eb0ca8034
Merge pull request #492 from mikecao/dev
v1.13.0
2021-02-20 20:46:34 -08:00
Mike Cao
083ef2dc9c Updated method for getting event types. 2021-02-20 17:27:56 -08:00
Mike Cao
7921893c1d
Merge pull request #486 from gnarlex/unknown-count
Add 'Unknown' label to metrics tables
2021-02-20 02:01:05 -08:00
Mike Cao
490fc99a8a
Merge branch 'dev' into unknown-count 2021-02-20 02:00:49 -08:00
Mike Cao
994be6d9cd
Merge pull request #489 from ruibaby/pref/improve-simplified-chinese-translation
Improve simplified chinese translation
2021-02-20 01:57:59 -08:00
Mike Cao
29bfb964c3
Merge pull request #491 from gnarlex/fix-domain-regex
Fix: domain regex accepting invalid domains
2021-02-20 01:55:05 -08:00
Alexander Klein
39faf8750a fix(constants): domain regex accepting invalid domains
Change the domain regex to match the whole string.
Before, the regex would accept a string if it contained a valid domain at any point.
2021-02-20 08:42:57 +01:00
Alexander Klein
306b555b96 fix(metrics): localize 'Unknown' label in tables 2021-02-20 08:28:52 +01:00
Ryan Wang
8e8d7a6d9c pref: improve simplified chinese translation. 2021-02-20 14:08:36 +08:00
Ryan Wang
785338154a fix: the page content jitters when the page jumps. 2021-02-20 13:21:12 +08:00
Mike Cao
92d4a46a0d
Merge pull request #487 from MoltenCoffee/master
Timestamp localization
2021-02-19 19:05:37 -08:00
MoltenCoffee
e7b92cd097
Add timestamp localization 2021-02-19 10:17:30 +01:00
Alexander Klein
06f24b0c90 refactor(filter): remove now obsolete filters 2021-02-19 09:58:58 +01:00
Alexander Klein
ba4272c878 fix: remove devices/OS filter from table components 2021-02-19 09:58:20 +01:00
Alexander Klein
14e1366fe4 feature(CountriesTable): default nullish labels to 'Unknown' 2021-02-19 09:56:40 +01:00
Alexander Klein
fb85d576a2 feature(DataTable): render nullish labels as 'Unknown' 2021-02-19 09:55:11 +01:00
Mike Cao
f041f081ff
Merge pull request #485 from marcauberer/dev
Improve German translation
2021-02-18 15:26:51 -08:00
Marc Auberer
5612207bf8
Improve German translation 2021-02-18 17:44:49 +01:00
Mike Cao
405a349cca Updated packages. 2021-02-17 23:40:21 -08:00
Mike Cao
3a0195ed50
Merge pull request #476 from gnarlex/event-type-selection
Dashboard: Dropdown for filtering events by their type
2021-02-16 19:05:19 -08:00
Mike Cao
826facf56a
Merge pull request #481 from gnarlex/proptyping-common
Add prop-types for "common" components
2021-02-16 19:04:27 -08:00
Alexander Klein
90b778a25b feature(components): prop-type WorldMap 2021-02-16 14:20:05 +01:00
Alexander Klein
7e96a2a597 feature(components): prop-type Toast 2021-02-16 14:10:04 +01:00
Alexander Klein
f14cafe926 feature(components): prop-type Tag 2021-02-16 14:08:29 +01:00
Alexander Klein
cb4e481e5f feature(components): prop-type Table 2021-02-16 14:05:20 +01:00
Alexander Klein
002ac397f1 fix(RefreshButton): wrong type of websiteId 2021-02-16 13:51:14 +01:00
Alexander Klein
5766d3ac29 feature(components): prop-type RefreshButton 2021-02-16 13:35:16 +01:00
Alexander Klein
86ec5774b6 feature(components): prop-type NoData 2021-02-16 13:32:04 +01:00
Alexander Klein
86c2b75e61 feature(components): prop-type NavMenu 2021-02-16 13:31:03 +01:00
Alexander Klein
de18b03803 feature(components): prop-type Modal 2021-02-16 13:28:32 +01:00
Alexander Klein
cf87ec1ea5 feature(components): prop-type MenuButton 2021-02-16 13:27:03 +01:00
Alexander Klein
614dd51029 feature(components): prop-type Menu 2021-02-16 13:23:16 +01:00
Alexander Klein
4ff2bd4fa2 feature(components): prop-type Loading 2021-02-16 13:11:49 +01:00
Alexander Klein
d5be21649a feature(components): prop-type Link 2021-02-16 13:10:34 +01:00
Alexander Klein
933a7f37e6 feature(components): prop-type FilterButtons 2021-02-16 13:07:59 +01:00
Alexander Klein
9ab3d36ced feature(components): prop-type Favicon 2021-02-16 13:04:35 +01:00
Alexander Klein
5b80b123fa feature(components): prop-type EmptyPlaceholder 2021-02-16 12:59:39 +01:00
Alexander Klein
b75ad8eec5 feature(components): prop-type DropDown 2021-02-16 12:57:18 +01:00
Alexander Klein
303fffbc40 feature(components): prop-type Dot component 2021-02-16 12:50:27 +01:00
Alexander Klein
66154ac233 feature(components): prop-type DateFilter 2021-02-16 12:47:02 +01:00
Alexander Klein
2ff91389e0 feature(components): prop-type CopyButton 2021-02-16 12:33:37 +01:00
Alexander Klein
72b91899b3 feature(components): prop-type Checkbox 2021-02-16 12:04:00 +01:00
Alexander Klein
244fd6e494 feature(components): prop-type ButtonGroup component 2021-02-16 11:51:17 +01:00
Alexander Klein
3d910c2367 feature(components): prop-type Button component 2021-02-16 11:40:38 +01:00
Alexander Klein
d9a7b27f0e feature(components): prop-type Icon component 2021-02-16 11:27:13 +01:00
gabehab
f741a60867 Add new mobile hamburger menu for mobile 2021-02-15 20:14:09 -08:00
Alexander Klein
37c61241aa feature(i18n): translations for event type dropdown 2021-02-15 18:16:23 +01:00
Alexander Klein
7c71294bc9 refactor: extract events table styling 2021-02-15 16:44:27 +01:00
Alexander Klein
49b45acf4b feature(dashboard): filter events by their type 2021-02-15 16:31:53 +01:00
Alexander Klein
67551fb129 feature(api): add event types endpoint 2021-02-15 16:28:46 +01:00
Alexander Klein
8b6308d686 feature(lib): add event type query 2021-02-15 16:28:09 +01:00
Alexander Klein
2cab8bb15d feature(lib): add event type filter 2021-02-15 13:02:12 +01:00
Mike Cao
7ed014440b
Merge pull request #472 from gabehab/master
Add sliding stats for mobile
2021-02-14 00:10:41 -08:00
Mike Cao
9a3334c4eb
Merge pull request #467 from nickradford/fix/mobile-rendering-issues
Fix mobile rendering issues
2021-02-13 23:45:05 -08:00
Mike Cao
8940b649bc
Merge pull request #470 from reithose/master
Correct hour format realtime page
2021-02-13 23:43:35 -08:00
gabehab
4a41d8be37 Add sliding stats for mobile 2021-02-11 13:56:37 -08:00
Joris
117bce9c1a
Correct hour display
When unit is minute
2021-02-10 13:28:04 +01:00
Nick Radford
a30074c055 Addresses mikecao/umami#460
Adds an explicit meta tag for the viewport, resizes the navigation link size
for smaller screens
2021-02-09 02:58:35 -08:00
1491 changed files with 161886 additions and 22876 deletions

View file

@ -4,3 +4,4 @@ Dockerfile
.gitignore .gitignore
.DS_Store .DS_Store
node_modules node_modules
.idea

View file

@ -2,9 +2,10 @@
"env": { "env": {
"browser": true, "browser": true,
"es2020": true, "es2020": true,
"node": true "node": true,
"jest": true
}, },
"extends": ["eslint:recommended", "plugin:react/recommended", "prettier", "prettier/react"], "parser": "@typescript-eslint/parser",
"parserOptions": { "parserOptions": {
"ecmaFeatures": { "ecmaFeatures": {
"jsx": true "jsx": true
@ -12,11 +13,39 @@
"ecmaVersion": 11, "ecmaVersion": 11,
"sourceType": "module" "sourceType": "module"
}, },
"plugins": ["react"], "settings": {
"import/resolver": {
"node": {
"moduleDirectory": ["node_modules", "src/"]
}
}
},
"extends": [
"plugin:@typescript-eslint/recommended",
"eslint:recommended",
"plugin:prettier/recommended",
"plugin:import/errors",
"plugin:import/typescript",
"plugin:css-modules/recommended",
"plugin:cypress/recommended",
"prettier",
"next"
],
"plugins": ["@typescript-eslint", "prettier", "promise", "css-modules", "cypress"],
"rules": { "rules": {
"no-console": "error",
"react/display-name": "off", "react/display-name": "off",
"react-hooks/exhaustive-deps": "off",
"react/react-in-jsx-scope": "off", "react/react-in-jsx-scope": "off",
"react/prop-types": "off" "react/prop-types": "off",
"import/no-anonymous-default-export": "off",
"import/no-named-as-default": "off",
"@next/next/no-img-element": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-unused-vars": ["error", { "ignoreRestSiblings": true }]
}, },
"globals": { "globals": {
"React": "writable" "React": "writable"

36
.github/ISSUE_TEMPLATE/1.bug_report.yml vendored Normal file
View file

@ -0,0 +1,36 @@
name: '🐛 Bug Report'
description: Create a bug report for Umami.
body:
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: dropdown
attributes:
label: Database
description: What database are you using?
options:
- PostgreSQL
- MySQL
- Umami Cloud
validations:
required: true
- type: textarea
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: input
attributes:
label: Which Umami version are you using? (if relevant)
description: 'For example: Chrome, Edge, Firefox, etc'
- type: input
attributes:
label: Which browser are you using? (if relevant)
description: 'For example: Chrome, Edge, Firefox, etc'
- type: input
attributes:
label: How are you deploying your application? (if relevant)
description: 'For example: Vercel, Railway, Docker, etc'

View file

@ -0,0 +1,9 @@
name: '✨ Feature Request'
description: Create a feature or enhancement request for Umami.
body:
- type: textarea
attributes:
label: Describe the feature or enhancement
description: A clear and concise description of what the feature or enhancement is.
validations:
required: true

6
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View file

@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: "🤔 Ask a question"
url: https://github.com/umami-software/umami/discussions
about: Ask questions and discuss with other community members.

19
.github/stale.yml vendored
View file

@ -1,19 +0,0 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
- enhancement
- bug
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

43
.github/workflows/cd-manual.yml vendored Normal file
View file

@ -0,0 +1,43 @@
name: Create docker images (manual)
on:
workflow_dispatch:
inputs:
version:
type: string
description: Version
required: true
jobs:
build:
name: Build, push, and deploy
runs-on: ubuntu-latest
strategy:
matrix:
db-type: [postgresql, mysql]
steps:
- uses: actions/checkout@v3
- uses: mr-smithers-excellent/docker-build-push@v6
name: Build & push Docker image to ghcr.io for ${{ matrix.db-type }}
with:
image: umami
tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: ghcr.io
multiPlatform: true
platform: linux/amd64,linux/arm64
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: mr-smithers-excellent/docker-build-push@v6
name: Build & push Docker image to docker.io for ${{ matrix.db-type }}
with:
image: umamisoftware/umami
tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

44
.github/workflows/cd.yml vendored Normal file
View file

@ -0,0 +1,44 @@
name: Create docker images
on: [create]
jobs:
build:
name: Build, push, and deploy
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
runs-on: ubuntu-latest
strategy:
matrix:
db-type: [postgresql, mysql]
steps:
- uses: actions/checkout@v3
- name: Set env
run: |
echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
echo "NOW=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
- uses: mr-smithers-excellent/docker-build-push@v6
name: Build & push Docker image to ghcr.io for ${{ matrix.db-type }}
with:
image: umami
tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: ghcr.io
multiPlatform: true
platform: linux/amd64,linux/arm64
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: mr-smithers-excellent/docker-build-push@v6
name: Build & push Docker image to docker.io for ${{ matrix.db-type }}
with:
image: umamisoftware/umami
tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

36
.github/workflows/ci.yml vendored Normal file
View file

@ -0,0 +1,36 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: Node.js CI
on: [push]
env:
DATABASE_TYPE: postgresql
SKIP_DB_CHECK: 1
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- node-version: 18.17
db-type: postgresql
- node-version: 18.17
db-type: mysql
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
env:
DATABASE_TYPE: ${{ matrix.db-type }}
- run: npm install --global yarn
- run: yarn install
- run: yarn test
- run: yarn build

View file

@ -1,42 +0,0 @@
on:
push:
branches:
- master
jobs:
build:
name: Build, push, and deploy
runs-on: ubuntu-latest
steps:
- name: Checkout master
uses: actions/checkout@v2
- name: Build PostgreSQL container image
run: |
docker build --build-arg DATABASE_TYPE=postgresql \
--tag ghcr.io/$GITHUB_ACTOR/umami:postgresql-$(echo $GITHUB_SHA | head -c7) \
--tag ghcr.io/$GITHUB_ACTOR/umami:postgresql-latest \
.
- name: Build MySQL container image
run: |
docker build --build-arg DATABASE_TYPE=mysql \
--tag ghcr.io/$GITHUB_ACTOR/umami:mysql-$(echo $GITHUB_SHA | head -c7) \
--tag ghcr.io/$GITHUB_ACTOR/umami:mysql-latest \
.
- name: Docker login
env:
CR_PAT: ${{ secrets.CR_PAT }}
run: docker login -u $GITHUB_ACTOR -p $CR_PAT ghcr.io
- name: Push image to GitHub
run: |
# Push each image individually, avoiding pushing to umami:latest
# as MySQL or PostgreSQL are required
docker push ghcr.io/$GITHUB_ACTOR/umami:postgresql-$(echo $GITHUB_SHA | head -c7)
docker push ghcr.io/$GITHUB_ACTOR/umami:postgresql-latest
docker push ghcr.io/$GITHUB_ACTOR/umami:mysql-$(echo $GITHUB_SHA | head -c7)
docker push ghcr.io/$GITHUB_ACTOR/umami:mysql-latest

25
.github/workflows/stale-issues.yml vendored Normal file
View file

@ -0,0 +1,25 @@
name: Close stale issues
on:
schedule:
- cron: '30 1 * * *'
jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v8
with:
days-before-issue-stale: 60
days-before-issue-close: 7
stale-issue-label: 'stale'
stale-issue-message: 'This issue is stale because it has been open for 60 days with no activity.'
close-issue-message: 'This issue was closed because it has been inactive for 7 days since being marked as stale.'
days-before-pr-stale: -1
days-before-pr-close: -1
operations-per-run: 200
ascending: true
repo-token: ${{ secrets.GITHUB_TOKEN }}
exempt-issue-labels: bug,enhancement

24
.gitignore vendored
View file

@ -1,8 +1,8 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies # dependencies
/node_modules node_modules
/.pnp .pnp
.pnp.js .pnp.js
# testing # testing
@ -11,20 +11,22 @@
# next.js # next.js
/.next/ /.next/
/out/ /out/
/prisma/schema.prisma /prisma/
# production # production
/build /build
/public/umami.js /public/script.js
/public/geo /geo
/lang-compiled /dist
# misc # misc
.DS_Store .DS_Store
.idea .idea
.yarn
*.iml *.iml
*.log *.log
.vscode/* .vscode
.tool-versions
# debug # debug
npm-debug.log* npm-debug.log*
@ -33,6 +35,8 @@ yarn-error.log*
# local env files # local env files
.env .env
.env.development.local .env.*
.env.test.local *.env.*
.env.production.local
*.dev.yml

4
.husky/pre-commit Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx lint-staged

View file

@ -1 +1 @@
/public/ /public/script.js

View file

@ -5,13 +5,7 @@
"stylelint-config-prettier" "stylelint-config-prettier"
], ],
"rules": { "rules": {
"no-descending-specificity": null, "no-descending-specificity": null
"selector-pseudo-class-no-unknown": [
true,
{
"ignorePseudoClasses": ["global", "horizontal", "vertical"]
}
]
}, },
"ignoreFiles": ["**/*.js"] "ignoreFiles": ["**/*.js", "**/*.md"]
} }

View file

@ -1,41 +1,61 @@
# Build image # Install dependencies only when needed
FROM node:12.18-alpine AS build FROM node:18-alpine AS deps
ARG DATABASE_TYPE # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \ RUN apk add --no-cache libc6-compat
DATABASE_TYPE=$DATABASE_TYPE WORKDIR /app
WORKDIR /build COPY package.json yarn.lock ./
# Add yarn timeout to handle slow CPU when Github Actions
RUN yarn config set --home enableTelemetry 0 RUN yarn config set network-timeout 300000
COPY package.json yarn.lock /build/
# Install only the production dependencies
RUN yarn install --production --frozen-lockfile
# Cache these modules for production
RUN cp -R node_modules/ prod_node_modules/
# Install development dependencies
RUN yarn install --frozen-lockfile RUN yarn install --frozen-lockfile
COPY . /build # Rebuild the source code only when needed
RUN yarn next telemetry disable FROM node:18-alpine AS builder
RUN yarn build WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
COPY docker/middleware.js ./src
# Production image ARG DATABASE_TYPE
FROM node:12.18-alpine AS production ARG BASE_PATH
ENV DATABASE_TYPE $DATABASE_TYPE
ENV BASE_PATH $BASE_PATH
ENV NEXT_TELEMETRY_DISABLED 1
RUN yarn build-docker
# Production image, copy all the files and run next
FROM node:18-alpine AS runner
WORKDIR /app WORKDIR /app
# Copy cached dependencies ENV NODE_ENV production
COPY --from=build /build/prod_node_modules ./node_modules ENV NEXT_TELEMETRY_DISABLED 1
# Copy generated Prisma client RUN addgroup --system --gid 1001 nodejs
COPY --from=build /build/node_modules/.prisma/ ./node_modules/.prisma/ RUN adduser --system --uid 1001 nextjs
COPY --from=build /build/yarn.lock /build/package.json ./ RUN set -x \
COPY --from=build /build/.next ./.next && apk add --no-cache curl \
COPY --from=build /build/public ./public && yarn add npm-run-all dotenv semver prisma@5.17.0
USER node # You only need to copy next.config.js if you are NOT using the default configuration
COPY --from=builder /app/next.config.js .
COPY --from=builder --chown=nextjs:nodejs /app/public ./public
COPY --from=builder /app/package.json ./package.json
COPY --from=builder /app/prisma ./prisma
COPY --from=builder /app/scripts ./scripts
# Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs
EXPOSE 3000 EXPOSE 3000
CMD ["yarn", "start"]
ENV HOSTNAME 0.0.0.0
ENV PORT 3000
CMD ["yarn", "start-docker"]

View file

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2020 Mike Cao <mike@mikecao.com> Copyright (c) 2022 Umami Software, Inc. <hello@umami.is>
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View file

@ -1 +0,0 @@
web: npm run start-env

162
README.md
View file

@ -1,107 +1,159 @@
# umami <p align="center">
<img src="https://content.umami.is/website/images/umami-logo.png" alt="Umami Logo" width="100">
</p>
Umami is a simple, fast, website analytics alternative to Google Analytics. <h1 align="center">Umami</h1>
## Getting started <p align="center">
<i>Umami is a simple, fast, privacy-focused alternative to Google Analytics.</i>
</p>
A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/) <p align="center">
<a href="https://github.com/umami-software/umami/releases">
<img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release" />
</a>
<a href="https://github.com/umami-software/umami/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License" />
</a>
<a href="https://github.com/umami-software/umami/actions">
<img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status" />
</a>
<a href="https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is" style="text-decoration: none;">
<img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo" />
</a>
</p>
## Installing from source ---
## 🚀 Getting Started
A detailed getting started guide can be found at [umami.is/docs](https://umami.is/docs/).
---
## 🛠 Installing from Source
### Requirements ### Requirements
- A server with Node.js 10.13 or newer - A server with Node.js version 16.13 or newer
- A database (MySQL or Postgresql) - A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
### Get the source code and install packages ### Install Yarn
```bash
npm install -g yarn
``` ```
git clone https://github.com/mikecao/umami.git
### Get the Source Code and Install Packages
```bash
git clone https://github.com/umami-software/umami.git
cd umami cd umami
npm install yarn install
``` ```
### Create database tables ### Configure Umami
Umami supports [MySQL](https://www.mysql.com/) and [Postgresql](https://www.postgresql.org/). Create an `.env` file with the following:
Create a database for your Umami installation and install the tables with the included scripts.
For MySQL: ```bash
DATABASE_URL=connection-url
```
mysql -u username -p databasename < sql/schema.mysql.sql
``` ```
For Postgresql: The connection URL format:
``` ```bash
psql -h hostname -U username -d databasename -f sql/schema.postgresql.sql
```
This will also create a login account with username **admin** and password **umami**.
### Configure umami
Create an `.env` file with the following
```
DATABASE_URL=(connection url)
HASH_SALT=(any random string)
```
The connection url is in the following format:
```
postgresql://username:mypassword@localhost:5432/mydb postgresql://username:mypassword@localhost:5432/mydb
mysql://username:mypassword@localhost:3306/mydb mysql://username:mypassword@localhost:3306/mydb
``` ```
The `HASH_SALT` is used to generate unique values for your installation. ### Build the Application
### Build the application
```bash ```bash
npm run build yarn build
``` ```
### Start the application *The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.*
### Start the Application
```bash ```bash
npm start yarn start
``` ```
By default this will launch the application on `http://localhost:3000`. You will need to either *By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.*
[proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server
or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
## Installing with Docker ---
To build the umami container and start up a Postgres database, run: ## 🐳 Installing with Docker
To build the Umami container and start up a Postgres database, run:
```bash ```bash
docker-compose up docker compose up -d
``` ```
Alternatively, to pull just the Umami Docker image with PostgreSQL support: Alternatively, to pull just the Umami Docker image with PostgreSQL support:
```bash ```bash
docker pull ghcr.io/mikecao/umami:postgresql-latest docker pull docker.umami.is/umami-software/umami:postgresql-latest
``` ```
Or with MySQL support: Or with MySQL support:
```bash ```bash
docker pull ghcr.io/mikecao/umami:mysql-latest docker pull docker.umami.is/umami-software/umami:mysql-latest
``` ```
## Getting updates ---
## 🔄 Getting Updates
To get the latest features, simply do a pull, install any new dependencies, and rebuild: To get the latest features, simply do a pull, install any new dependencies, and rebuild:
```bash ```bash
git pull git pull
npm install yarn install
npm run build yarn build
``` ```
## License To update the Docker image, simply pull the new images and rebuild:
MIT ```bash
docker compose pull
docker compose up --force-recreate
```
---
## 🛟 Support
<p align="center">
<a href="https://github.com/umami-software/umami">
<img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub" />
</a>
<a href="https://twitter.com/umami_software">
<img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter" />
</a>
<a href="https://linkedin.com/company/umami-software">
<img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn" />
</a>
<a href="https://umami.is/discord">
<img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord" />
</a>
</p>
[release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
[releases-url]: https://github.com/umami-software/umami/releases
[license-shield]: https://img.shields.io/github/license/umami-software/umami.svg
[license-url]: https://github.com/umami-software/umami/blob/master/LICENSE
[build-shield]: https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml
[build-url]: https://github.com/umami-software/umami/actions
[github-shield]: https://img.shields.io/badge/GitHub--blue?style=social&logo=github
[github-url]: https://github.com/umami-software/umami
[twitter-shield]: https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter
[twitter-url]: https://twitter.com/umami_software
[linkedin-shield]: https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin
[linkedin-url]: https://linkedin.com/company/umami-software
[discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
[discord-url]: https://discord.com/invite/4dz4zcXYrQ

16
app.json Normal file
View file

@ -0,0 +1,16 @@
{
"name": "Umami",
"description": "Umami is a simple, fast, website analytics alternative to Google Analytics.",
"keywords": ["analytics", "charts", "statistics", "web-analytics"],
"website": "https://umami.is",
"repository": "https://github.com/umami-software/umami",
"addons": ["heroku-postgresql"],
"env": {
"APP_SECRET": {
"description": "Used to generate unique values for your installation",
"required": true,
"generator": "secret"
}
},
"success_url": "/"
}

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M216.464 36.465l-7.071 7.07c-4.686 4.686-4.686 12.284 0 16.971L387.887 239H12c-6.627 0-12 5.373-12 12v10c0 6.627 5.373 12 12 12h375.887L209.393 451.494c-4.686 4.686-4.686 12.284 0 16.971l7.071 7.07c4.686 4.686 12.284 4.686 16.97 0l211.051-211.05c4.686-4.686 4.686-12.284 0-16.971L233.434 36.465c-4.686-4.687-12.284-4.687-16.97 0z"/></svg>

Before

Width:  |  Height:  |  Size: 409 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.848 83.466L172.804 346.51l-96.652-96.652c-4.686-4.686-12.284-4.686-16.971 0l-28.284 28.284c-4.686 4.686-4.686 12.284 0 16.971l133.421 133.421c4.686 4.686 12.284 4.686 16.971 0l299.813-299.813c4.686-4.686 4.686-12.284 0-16.971l-28.284-28.284c-4.686-4.686-12.284-4.686-16.97 0z"/></svg>

Before

Width:  |  Height:  |  Size: 360 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M441.9 167.3l-19.8-19.8c-4.7-4.7-12.3-4.7-17 0L224 328.2 42.9 147.5c-4.7-4.7-12.3-4.7-17 0L6.1 167.3c-4.7 4.7-4.7 12.3 0 17l209.4 209.4c4.7 4.7 12.3 4.7 17 0l209.4-209.4c4.7-4.7 4.7-12.3 0-17z"/></svg>

Before

Width:  |  Height:  |  Size: 272 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M234.8 511.7L196 500.4c-4.2-1.2-6.7-5.7-5.5-9.9L331.3 5.8c1.2-4.2 5.7-6.7 9.9-5.5L380 11.6c4.2 1.2 6.7 5.7 5.5 9.9L244.7 506.2c-1.2 4.3-5.6 6.7-9.9 5.5zm-83.2-121.1l27.2-29c3.1-3.3 2.8-8.5-.5-11.5L72.2 256l106.1-94.1c3.4-3 3.6-8.2.5-11.5l-27.2-29c-3-3.2-8.1-3.4-11.3-.4L2.5 250.2c-3.4 3.2-3.4 8.5 0 11.7L140.3 391c3.2 3 8.2 2.8 11.3-.4zm284.1.4l137.7-129.1c3.4-3.2 3.4-8.5 0-11.7L435.7 121c-3.2-3-8.3-2.9-11.3.4l-27.2 29c-3.1 3.3-2.8 8.5.5 11.5L503.8 256l-106.1 94.1c-3.4 3-3.6 8.2-.5 11.5l27.2 29c3.1 3.2 8.1 3.4 11.3.4z"/></svg>

Before

Width:  |  Height:  |  Size: 601 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M304 256c0 26.5-21.5 48-48 48s-48-21.5-48-48 21.5-48 48-48 48 21.5 48 48zm120-48c-26.5 0-48 21.5-48 48s21.5 48 48 48 48-21.5 48-48-21.5-48-48-48zm-336 0c-26.5 0-48 21.5-48 48s21.5 48 48 48 48-21.5 48-48-21.5-48-48-48z"/></svg>

Before

Width:  |  Height:  |  Size: 297 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M270.2 160h35.5c3.4 0 6.1 2.8 6 6.2l-7.5 196c-.1 3.2-2.8 5.8-6 5.8h-20.5c-3.2 0-5.9-2.5-6-5.8l-7.5-196c-.1-3.4 2.6-6.2 6-6.2zM288 388c-15.5 0-28 12.5-28 28s12.5 28 28 28 28-12.5 28-28-12.5-28-28-28zm281.5 52L329.6 24c-18.4-32-64.7-32-83.2 0L6.5 440c-18.4 31.9 4.6 72 41.6 72H528c36.8 0 60-40 41.5-72zM528 480H48c-12.3 0-20-13.3-13.9-24l240-416c6.1-10.6 21.6-10.7 27.7 0l240 416c6.2 10.6-1.5 24-13.8 24z"/></svg>

Before

Width:  |  Height:  |  Size: 482 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M497.6,0,334.4.17A14.4,14.4,0,0,0,320,14.57V47.88a14.4,14.4,0,0,0,14.69,14.4l73.63-2.72,2.06,2.06L131.52,340.49a12,12,0,0,0,0,17l23,23a12,12,0,0,0,17,0L450.38,101.62l2.06,2.06-2.72,73.63A14.4,14.4,0,0,0,464.12,192h33.31a14.4,14.4,0,0,0,14.4-14.4L512,14.4A14.4,14.4,0,0,0,497.6,0ZM432,288H416a16,16,0,0,0-16,16V458a6,6,0,0,1-6,6H54a6,6,0,0,1-6-6V118a6,6,0,0,1,6-6H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V304A16,16,0,0,0,432,288Z"/></svg>

Before

Width:  |  Height:  |  Size: 575 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M48 368a48 48 0 1 0 48 48 48 48 0 0 0-48-48zm0-160a48 48 0 1 0 48 48 48 48 0 0 0-48-48zm0-160a48 48 0 1 0 48 48 48 48 0 0 0-48-48zm448 24H176a16 16 0 0 0-16 16v16a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V88a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v16a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-16a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v16a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-16a16 16 0 0 0-16-16z"/></svg>

Before

Width:  |  Height:  |  Size: 492 B

View file

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 428 389.11">
<circle cx="214.15" cy="181" r="171" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="20"/><path d="M413,134.11H15.29a15,15,0,0,0-15,15v15.3C.12,168,0,171.52,0,175.11c0,118.19,95.81,214,214,214,116.4,0,211.1-92.94,213.93-208.67,0-.44.07-.88.07-1.33v-30A15,15,0,0,0,413,134.11Z"/></svg>

Before

Width:  |  Height:  |  Size: 377 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1399.98 1400"><path d="M562.44,837.55C335.89,611,288.08,273.54,418.71,0A734.31,734.31,0,0,0,215.54,143.73c-287.39,287.39-287.39,753.33,0,1040.72s753.33,287.4,1040.74,0A733.8,733.8,0,0,0,1400,981.29C1126.45,1111.92,789,1064.09,562.44,837.55Z"/></svg>

Before

Width:  |  Height:  |  Size: 302 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M493.26 56.26l-37.51-37.51C443.25 6.25 426.87 0 410.49 0s-32.76 6.25-45.25 18.74l-74.49 74.49L256 127.98 12.85 371.12.15 485.34C-1.45 499.72 9.88 512 23.95 512c.89 0 1.79-.05 2.69-.15l114.14-12.61L384.02 256l34.74-34.74 74.49-74.49c25-25 25-65.52.01-90.51zM118.75 453.39l-67.58 7.46 7.53-67.69 231.24-231.24 31.02-31.02 60.14 60.14-31.02 31.02-231.33 231.33zm340.56-340.57l-44.28 44.28-60.13-60.14 44.28-44.28c4.08-4.08 8.84-4.69 11.31-4.69s7.24.61 11.31 4.69l37.51 37.51c6.24 6.25 6.24 16.4 0 22.63z"/></svg>

Before

Width:  |  Height:  |  Size: 580 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M368 224H224V80c0-8.84-7.16-16-16-16h-32c-8.84 0-16 7.16-16 16v144H16c-8.84 0-16 7.16-16 16v32c0 8.84 7.16 16 16 16h144v144c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16V288h144c8.84 0 16-7.16 16-16v-32c0-8.84-7.16-16-16-16z"/></svg>

Before

Width:  |  Height:  |  Size: 303 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 1400"><path d="M367.43,422.13a54.44,54.44,0,0,1-38.66-16L205,282.35A54.69,54.69,0,0,1,282.37,205L406.11,328.79a54.68,54.68,0,0,1-38.68,93.34Z"/><path d="M1156.3,1211a54.51,54.51,0,0,1-38.67-16L993.89,1071.21a54.68,54.68,0,1,1,77.34-77.33L1195,1117.65A54.7,54.7,0,0,1,1156.3,1211Z"/><path d="M243.7,1211A54.7,54.7,0,0,1,205,1117.65L328.74,993.89a54.69,54.69,0,0,1,77.36,77.32L282.37,1195A54.51,54.51,0,0,1,243.7,1211Z"/><path d="M1032.57,422.13a54.68,54.68,0,0,1-38.68-93.34L1117.61,205A54.69,54.69,0,0,1,1195,282.35L1071.23,406.11A54.44,54.44,0,0,1,1032.57,422.13Z"/><path d="M229.69,754.69h-175a54.69,54.69,0,0,1,0-109.38h175a54.69,54.69,0,0,1,0,109.38Z"/><path d="M1345.31,754.69h-175a54.69,54.69,0,0,1,0-109.38h175a54.69,54.69,0,0,1,0,109.38Z"/><path d="M700,1400a54.68,54.68,0,0,1-54.69-54.69v-175a54.69,54.69,0,0,1,109.38,0v175A54.68,54.68,0,0,1,700,1400Z"/><path d="M700,284.38a54.7,54.7,0,0,1-54.69-54.69v-175a54.69,54.69,0,0,1,109.38,0v175A54.7,54.7,0,0,1,700,284.38Z"/><circle cx="700" cy="700" r="306.25"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z"/></svg>

Before

Width:  |  Height:  |  Size: 468 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M432 80h-82.4l-34-56.7A48 48 0 0 0 274.4 0H173.6a48 48 0 0 0-41.2 23.3L98.4 80H16A16 16 0 0 0 0 96v16a16 16 0 0 0 16 16h16l21.2 339a48 48 0 0 0 47.9 45h245.8a48 48 0 0 0 47.9-45L416 128h16a16 16 0 0 0 16-16V96a16 16 0 0 0-16-16zM173.6 48h100.8l19.2 32H154.4zm173.3 416H101.11l-21-336h287.8z"/></svg>

Before

Width:  |  Height:  |  Size: 370 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1652 1652"><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path d="M1587.07,504.47A828.56,828.56,0,1,0,1652,826,823.13,823.13,0,0,0,1587.07,504.47ZM826,1577a747.29,747.29,0,0,1-464.48-161.26,39.94,39.94,0,0,0,2.8-11.35,458.82,458.82,0,0,1,34.29-135.74,464.15,464.15,0,0,1,854.78,0,458.82,458.82,0,0,1,34.29,135.74,39.94,39.94,0,0,0,2.8,11.35A747.29,747.29,0,0,1,826,1577ZM719.81,866.57A274,274,0,1,1,826,888,272.1,272.1,0,0,1,719.81,866.57Zm641.28,485.87c-36.11-201.1-182.78-363.82-374.86-423,114.28-58.37,192.53-177.22,192.53-314.35,0-194.83-157.94-352.76-352.76-352.76S473.24,420.29,473.24,615.12c0,137.13,78.25,256,192.53,314.35-192.08,59.15-338.75,221.87-374.86,423C157.46,1216.81,75,1030.86,75,826,75,411.9,411.9,75,826,75s751,336.9,751,751C1577,1030.86,1494.54,1216.81,1361.09,1352.44Z"/></g></g></svg>

Before

Width:  |  Height:  |  Size: 910 B

View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"/></svg>

Before

Width:  |  Height:  |  Size: 336 B

View file

@ -1,45 +0,0 @@
import React from 'react';
import ReactTooltip from 'react-tooltip';
import classNames from 'classnames';
import Icon from './Icon';
import styles from './Button.module.css';
export default function Button({
type = 'button',
icon,
size,
variant,
children,
className,
tooltip,
tooltipId,
disabled,
iconRight,
onClick = () => {},
...props
}) {
return (
<button
data-tip={tooltip}
data-effect="solid"
data-for={tooltipId}
type={type}
className={classNames(styles.button, className, {
[styles.large]: size === 'large',
[styles.small]: size === 'small',
[styles.xsmall]: size === 'xsmall',
[styles.action]: variant === 'action',
[styles.danger]: variant === 'danger',
[styles.light]: variant === 'light',
[styles.iconRight]: iconRight,
})}
disabled={disabled}
onClick={!disabled ? onClick : null}
{...props}
>
{icon && <Icon className={styles.icon} icon={icon} size={size} />}
{children && <div className={styles.label}>{children}</div>}
{tooltip && <ReactTooltip id={tooltipId}>{tooltip}</ReactTooltip>}
</button>
);
}

View file

@ -1,102 +0,0 @@
.button {
display: flex;
justify-content: center;
align-items: center;
font-size: var(--font-size-normal);
color: var(--gray900);
background: var(--gray100);
padding: 8px 16px;
border-radius: 4px;
border: 0;
outline: none;
cursor: pointer;
position: relative;
}
.button:hover {
background: var(--gray200);
}
.button:active {
color: var(--gray900);
}
.label {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 300px;
}
.large {
font-size: var(--font-size-large);
}
.small {
font-size: var(--font-size-small);
}
.xsmall {
font-size: var(--font-size-xsmall);
}
.action,
.action:active {
color: var(--gray50);
background: var(--gray900);
}
.action:hover {
background: var(--gray800);
}
.danger,
.danger:active {
color: var(--gray50);
background: var(--red500);
}
.danger:hover {
background: var(--red400);
}
.light,
.light:active {
color: var(--gray900);
background: transparent;
}
.light:hover {
background: inherit;
}
.button .icon + * {
margin-left: 10px;
}
.button.iconRight .icon {
order: 1;
margin-left: 10px;
}
.button.iconRight .icon + * {
margin: 0;
}
.button:disabled {
cursor: default;
color: var(--gray500);
background: var(--gray75);
}
.button:disabled:active {
color: var(--gray500);
}
.button:disabled:hover {
background: var(--gray75);
}
.button.light:disabled {
background: var(--gray50);
}

View file

@ -1,32 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import Button from './Button';
import styles from './ButtonGroup.module.css';
export default function ButtonGroup({
items = [],
selectedItem,
className,
size,
icon,
onClick = () => {},
}) {
return (
<div className={classNames(styles.group, className)}>
{items.map(item => {
const { label, value } = item;
return (
<Button
key={value}
className={classNames(styles.button, { [styles.selected]: selectedItem === value })}
size={size}
icon={icon}
onClick={() => onClick(value)}
>
{label}
</Button>
);
})}
</div>
);
}

View file

@ -1,31 +0,0 @@
.group {
display: inline-flex;
border-radius: 4px;
overflow: hidden;
border: 1px solid var(--gray500);
}
.group .button {
border-radius: 0;
color: var(--gray800);
background: var(--gray50);
border-left: 1px solid var(--gray500);
padding: 4px 8px;
}
.group .button:first-child {
border: 0;
}
.group .button:hover {
background: var(--gray100);
}
.group .button + .button {
margin: 0;
}
.group .button.selected {
color: var(--gray900);
font-weight: 600;
}

View file

@ -1,267 +0,0 @@
import React, { useState } from 'react';
import classNames from 'classnames';
import {
startOfWeek,
startOfMonth,
startOfYear,
endOfMonth,
addDays,
subDays,
addYears,
subYears,
addMonths,
setMonth,
setYear,
isSameDay,
isBefore,
isAfter,
} from 'date-fns';
import Button from './Button';
import useLocale from 'hooks/useLocale';
import { dateFormat } from 'lib/lang';
import { chunk } from 'lib/array';
import Chevron from 'assets/chevron-down.svg';
import Cross from 'assets/times.svg';
import styles from './Calendar.module.css';
import Icon from './Icon';
export default function Calendar({ date, minDate, maxDate, onChange }) {
const [locale] = useLocale();
const [selectMonth, setSelectMonth] = useState(false);
const [selectYear, setSelectYear] = useState(false);
const month = dateFormat(date, 'MMMM', locale);
const year = date.getFullYear();
function toggleMonthSelect() {
setSelectYear(false);
setSelectMonth(state => !state);
}
function toggleYearSelect() {
setSelectMonth(false);
setSelectYear(state => !state);
}
function handleChange(value) {
setSelectMonth(false);
setSelectYear(false);
if (value) {
onChange(value);
}
}
return (
<div className={styles.calendar}>
<div className={styles.header}>
<div>{date.getDate()}</div>
<div
className={classNames(styles.selector, { [styles.open]: selectMonth })}
onClick={toggleMonthSelect}
>
{month}
<Icon className={styles.icon} icon={selectMonth ? <Cross /> : <Chevron />} size="small" />
</div>
<div
className={classNames(styles.selector, { [styles.open]: selectYear })}
onClick={toggleYearSelect}
>
{year}
<Icon className={styles.icon} icon={selectYear ? <Cross /> : <Chevron />} size="small" />
</div>
</div>
<div className={styles.body}>
{!selectMonth && !selectYear && (
<DaySelector
date={date}
minDate={minDate}
maxDate={maxDate}
locale={locale}
onSelect={handleChange}
/>
)}
{selectMonth && (
<MonthSelector
date={date}
minDate={minDate}
maxDate={maxDate}
locale={locale}
onSelect={handleChange}
onClose={toggleMonthSelect}
/>
)}
{selectYear && (
<YearSelector
date={date}
minDate={minDate}
maxDate={maxDate}
onSelect={handleChange}
onClose={toggleYearSelect}
/>
)}
</div>
</div>
);
}
const DaySelector = ({ date, minDate, maxDate, locale, onSelect }) => {
const startWeek = startOfWeek(date);
const startMonth = startOfMonth(date);
const startDay = subDays(startMonth, startMonth.getDay());
const month = date.getMonth();
const year = date.getFullYear();
const daysOfWeek = [];
for (let i = 0; i < 7; i++) {
daysOfWeek.push(addDays(startWeek, i));
}
const days = [];
for (let i = 0; i < 35; i++) {
days.push(addDays(startDay, i));
}
return (
<table>
<thead>
<tr>
{daysOfWeek.map((day, i) => (
<th key={i} className={locale}>
{dateFormat(day, 'EEE', locale)}
</th>
))}
</tr>
</thead>
<tbody>
{chunk(days, 7).map((week, i) => (
<tr key={i}>
{week.map((day, j) => {
const disabled = isBefore(day, minDate) || isAfter(day, maxDate);
return (
<td
key={j}
className={classNames({
[styles.selected]: isSameDay(date, day),
[styles.faded]: day.getMonth() !== month || day.getFullYear() !== year,
[styles.disabled]: disabled,
})}
onClick={!disabled ? () => onSelect(day) : null}
>
{day.getDate()}
</td>
);
})}
</tr>
))}
</tbody>
</table>
);
};
const MonthSelector = ({ date, minDate, maxDate, locale, onSelect }) => {
const start = startOfYear(date);
const months = [];
for (let i = 0; i < 12; i++) {
months.push(addMonths(start, i));
}
function handleSelect(value) {
onSelect(setMonth(date, value));
}
return (
<table>
<tbody>
{chunk(months, 3).map((row, i) => (
<tr key={i}>
{row.map((month, j) => {
const disabled =
isBefore(endOfMonth(month), minDate) || isAfter(startOfMonth(month), maxDate);
return (
<td
key={j}
className={classNames(locale, {
[styles.selected]: month.getMonth() === date.getMonth(),
[styles.disabled]: disabled,
})}
onClick={!disabled ? () => handleSelect(month.getMonth()) : null}
>
{dateFormat(month, 'MMMM', locale)}
</td>
);
})}
</tr>
))}
</tbody>
</table>
);
};
const YearSelector = ({ date, minDate, maxDate, onSelect }) => {
const [currentDate, setCurrentDate] = useState(date);
const year = date.getFullYear();
const currentYear = currentDate.getFullYear();
const minYear = minDate.getFullYear();
const maxYear = maxDate.getFullYear();
const years = [];
for (let i = 0; i < 15; i++) {
years.push(currentYear - 7 + i);
}
function handleSelect(value) {
onSelect(setYear(date, value));
}
function handlePrevClick() {
setCurrentDate(state => subYears(state, 15));
}
function handleNextClick() {
setCurrentDate(state => addYears(state, 15));
}
return (
<div className={styles.pager}>
<div className={styles.left}>
<Button
icon={<Chevron />}
size="small"
onClick={handlePrevClick}
disabled={years[0] <= minYear}
variant="light"
/>
</div>
<div className={styles.middle}>
<table>
<tbody>
{chunk(years, 5).map((row, i) => (
<tr key={i}>
{row.map((n, j) => (
<td
key={j}
className={classNames({
[styles.selected]: n === year,
[styles.disabled]: n < minYear || n > maxYear,
})}
onClick={() => (n < minYear || n > maxYear ? null : handleSelect(n))}
>
{n}
</td>
))}
</tr>
))}
</tbody>
</table>
</div>
<div className={styles.right}>
<Button
icon={<Chevron />}
size="small"
onClick={handleNextClick}
disabled={years[years.length - 1] > maxYear}
variant="light"
/>
</div>
</div>
);
};

View file

@ -1,111 +0,0 @@
.calendar {
display: flex;
flex-direction: column;
font-size: var(--font-size-small);
flex: 1;
min-height: 306px;
}
.calendar table {
width: 100%;
border-spacing: 5px;
}
.calendar td {
color: var(--gray800);
cursor: pointer;
text-align: center;
vertical-align: center;
height: 40px;
width: 40px;
border-radius: 5px;
border: 1px solid transparent;
}
.calendar td:hover {
border: 1px solid var(--gray300);
background: var(--gray75);
}
.calendar td.faded {
color: var(--gray500);
}
.calendar td.selected {
font-weight: 600;
border: 1px solid var(--gray600);
}
.calendar td.selected:hover {
background: transparent;
}
.calendar td.disabled {
color: var(--gray400);
background: var(--gray75);
}
.calendar td.disabled:hover {
cursor: default;
background: var(--gray75);
border-color: transparent;
}
.calendar td.faded.disabled {
background: var(--gray100);
}
.header {
display: flex;
justify-content: space-evenly;
align-items: center;
font-weight: 700;
line-height: 40px;
font-size: var(--font-size-normal);
}
.body {
display: flex;
}
.selector {
cursor: pointer;
}
.pager {
display: flex;
flex: 1;
}
.pager button {
align-self: center;
}
.middle {
flex: 1;
}
.left,
.right {
display: flex;
justify-content: center;
align-items: center;
}
.left svg {
transform: rotate(90deg);
}
.right svg {
transform: rotate(-90deg);
}
.icon {
margin-left: 10px;
}
@media only screen and (max-width: 992px) {
.calendar table {
max-width: calc(100vw - 30px);
}
}

View file

@ -1,27 +0,0 @@
import React, { useRef } from 'react';
import Icon from 'components/common/Icon';
import Check from 'assets/check.svg';
import styles from './Checkbox.module.css';
export default function Checkbox({ name, value, label, onChange }) {
const ref = useRef();
return (
<div className={styles.container}>
<div className={styles.checkbox} onClick={() => ref.current.click()}>
{value && <Icon icon={<Check />} size="small" />}
</div>
<label className={styles.label} htmlFor={name}>
{label}
</label>
<input
ref={ref}
className={styles.input}
type="checkbox"
name={name}
value={value}
onChange={onChange}
/>
</div>
);
}

View file

@ -1,29 +0,0 @@
.container {
display: flex;
align-items: center;
position: relative;
overflow: hidden;
}
.checkbox {
display: flex;
justify-content: center;
align-items: center;
width: 20px;
height: 20px;
border: 1px solid var(--gray500);
border-radius: 4px;
}
.label {
margin-left: 10px;
}
.input {
position: absolute;
visibility: hidden;
height: 0;
width: 0;
bottom: 100%;
right: 100%;
}

View file

@ -1,26 +0,0 @@
import React, { useState } from 'react';
import Button from './Button';
import { FormattedMessage } from 'react-intl';
const defaultText = (
<FormattedMessage id="label.copy-to-clipboard" defaultMessage="Copy to clipboard" />
);
export default function CopyButton({ element, ...props }) {
const [text, setText] = useState(defaultText);
function handleClick() {
if (element?.current) {
element.current.select();
document.execCommand('copy');
setText(<FormattedMessage id="message.copied" defaultMessage="Copied!" />);
window.getSelection().removeAllRanges();
}
}
return (
<Button {...props} onClick={handleClick}>
{text}
</Button>
);
}

View file

@ -1,119 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { endOfYear, isSameDay } from 'date-fns';
import Modal from './Modal';
import DropDown from './DropDown';
import DatePickerForm from 'components/forms/DatePickerForm';
import useLocale from 'hooks/useLocale';
import { getDateRange } from 'lib/date';
import { dateFormat } from 'lib/lang';
import Calendar from 'assets/calendar-alt.svg';
import Icon from './Icon';
const filterOptions = [
{ label: <FormattedMessage id="label.today" defaultMessage="Today" />, value: '1day' },
{
label: (
<FormattedMessage id="label.last-hours" defaultMessage="Last {x} hours" values={{ x: 24 }} />
),
value: '24hour',
},
{
label: <FormattedMessage id="label.this-week" defaultMessage="This week" />,
value: '1week',
divider: true,
},
{
label: (
<FormattedMessage id="label.last-days" defaultMessage="Last {x} days" values={{ x: 7 }} />
),
value: '7day',
},
{
label: <FormattedMessage id="label.this-month" defaultMessage="This month" />,
value: '1month',
divider: true,
},
{
label: (
<FormattedMessage id="label.last-days" defaultMessage="Last {x} days" values={{ x: 30 }} />
),
value: '30day',
},
{
label: (
<FormattedMessage id="label.last-days" defaultMessage="Last {x} days" values={{ x: 90 }} />
),
value: '90day',
},
{ label: <FormattedMessage id="label.this-year" defaultMessage="This year" />, value: '1year' },
{
label: <FormattedMessage id="label.custom-range" defaultMessage="Custom range" />,
value: 'custom',
divider: true,
},
];
export default function DateFilter({ value, startDate, endDate, onChange, className }) {
const [showPicker, setShowPicker] = useState(false);
const displayValue =
value === 'custom' ? (
<CustomRange startDate={startDate} endDate={endDate} onClick={() => handleChange('custom')} />
) : (
value
);
function handleChange(value) {
if (value === 'custom') {
setShowPicker(true);
return;
}
onChange(getDateRange(value));
}
function handlePickerChange(value) {
setShowPicker(false);
onChange(value);
}
return (
<>
<DropDown
className={className}
value={displayValue}
options={filterOptions}
onChange={handleChange}
/>
{showPicker && (
<Modal>
<DatePickerForm
startDate={startDate}
endDate={endDate}
minDate={new Date(2000, 0, 1)}
maxDate={endOfYear(new Date())}
onChange={handlePickerChange}
onClose={() => setShowPicker(false)}
/>
</Modal>
)}
</>
);
}
const CustomRange = ({ startDate, endDate, onClick }) => {
const [locale] = useLocale();
function handleClick(e) {
e.stopPropagation();
onClick();
}
return (
<>
<Icon icon={<Calendar />} className="mr-2" onClick={handleClick} />
{dateFormat(startDate, 'd LLL y', locale)}
{!isSameDay(startDate, endDate) && `${dateFormat(endDate, 'd LLL y', locale)}`}
</>
);
};

View file

@ -1,17 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './Dot.module.css';
export default function Dot({ color, size, className }) {
return (
<div className={styles.wrapper}>
<div
style={{ background: color }}
className={classNames(styles.dot, className, {
[styles.small]: size === 'small',
[styles.large]: size === 'large',
})}
/>
</div>
);
}

View file

@ -1,22 +0,0 @@
.wrapper {
background: var(--gray50);
margin-right: 10px;
border-radius: 100%;
}
.dot {
background: var(--green400);
width: 10px;
height: 10px;
border-radius: 100%;
}
.dot.small {
width: 8px;
height: 8px;
}
.dot.large {
width: 16px;
height: 16px;
}

View file

@ -1,54 +0,0 @@
import React, { useState, useRef } from 'react';
import classNames from 'classnames';
import Menu from './Menu';
import useDocumentClick from 'hooks/useDocumentClick';
import Chevron from 'assets/chevron-down.svg';
import styles from './Dropdown.module.css';
import Icon from './Icon';
export default function DropDown({
value,
className,
menuClassName,
options = [],
onChange = () => {},
}) {
const [showMenu, setShowMenu] = useState(false);
const ref = useRef();
const selectedOption = options.find(e => e.value === value);
function handleShowMenu() {
setShowMenu(state => !state);
}
function handleSelect(selected, e) {
e.stopPropagation();
setShowMenu(false);
onChange(selected);
}
useDocumentClick(e => {
if (!ref.current?.contains(e.target)) {
setShowMenu(false);
}
});
return (
<div ref={ref} className={classNames(styles.dropdown, className)} onClick={handleShowMenu}>
<div className={styles.value}>
<div className={styles.text}>{options.find(e => e.value === value)?.label || value}</div>
<Icon icon={<Chevron />} className={styles.icon} size="small" />
</div>
{showMenu && (
<Menu
className={menuClassName}
options={options}
selectedOption={selectedOption}
onSelect={handleSelect}
float="bottom"
/>
)}
</div>
);
}

View file

@ -1,28 +0,0 @@
.dropdown {
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid var(--gray500);
border-radius: 4px;
cursor: pointer;
}
.value {
flex: 1;
display: flex;
justify-content: space-between;
font-size: var(--font-size-small);
flex-wrap: nowrap;
white-space: nowrap;
padding: 4px 16px;
min-width: 160px;
}
.text {
flex: 1;
}
.icon {
padding-left: 20px;
}

View file

@ -1,14 +0,0 @@
import React from 'react';
import Icon from 'components/common/Icon';
import Logo from 'assets/logo.svg';
import styles from './EmptyPlaceholder.module.css';
export default function EmptyPlaceholder({ msg, children }) {
return (
<div className={styles.placeholder}>
<Icon className={styles.icon} icon={<Logo />} size="xlarge" />
<h2>{msg}</h2>
{children}
</div>
);
}

View file

@ -1,11 +0,0 @@
.placeholder {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
min-height: 600px;
}
.icon {
margin-bottom: 30px;
}

View file

@ -1,14 +0,0 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import Icon from './Icon';
import Exclamation from 'assets/exclamation-triangle.svg';
import styles from './ErrorMessage.module.css';
export default function ErrorMessage() {
return (
<div className={styles.error}>
<Icon icon={<Exclamation />} className={styles.icon} size="large" />
<FormattedMessage id="message.failure" defaultMessage="Something went wrong." />
</div>
);
}

View file

@ -1,3 +0,0 @@
.favicon {
margin-right: 8px;
}

View file

@ -1,11 +0,0 @@
import React from 'react';
import ButtonLayout from 'components/layout/ButtonLayout';
import ButtonGroup from './ButtonGroup';
export default function FilterButtons({ buttons, selected, onClick }) {
return (
<ButtonLayout>
<ButtonGroup size="xsmall" items={buttons} selectedItem={selected} onClick={onClick} />
</ButtonLayout>
);
}

View file

@ -1,20 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './Icon.module.css';
export default function Icon({ icon, className, size = 'medium', ...props }) {
return (
<div
className={classNames(styles.icon, className, {
[styles.xlarge]: size === 'xlarge',
[styles.large]: size === 'large',
[styles.medium]: size === 'medium',
[styles.small]: size === 'small',
[styles.xsmall]: size === 'xsmall',
})}
{...props}
>
{icon}
</div>
);
}

View file

@ -1,35 +0,0 @@
.icon {
display: inline-flex;
justify-content: center;
align-items: center;
vertical-align: middle;
}
.icon svg {
fill: currentColor;
}
.xlarge > svg {
width: 48px;
height: 48px;
}
.large > svg {
width: 24px;
height: 24px;
}
.medium > svg {
width: 16px;
height: 16px;
}
.small > svg {
width: 12px;
height: 12px;
}
.xsmall > svg {
width: 10px;
height: 10px;
}

View file

@ -1,23 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import NextLink from 'next/link';
import Icon from './Icon';
import styles from './Link.module.css';
export default function Link({ className, icon, children, size, iconRight, ...props }) {
return (
<NextLink {...props}>
<a
className={classNames(styles.link, className, {
[styles.large]: size === 'large',
[styles.small]: size === 'small',
[styles.xsmall]: size === 'xsmall',
[styles.iconRight]: iconRight,
})}
>
{icon && <Icon className={styles.icon} icon={icon} size={size} />}
{children}
</a>
</NextLink>
);
}

View file

@ -1,50 +0,0 @@
a.link,
a.link:active,
a.link:visited {
position: relative;
color: var(--gray900);
text-decoration: none;
display: inline-flex;
align-items: center;
}
a.link:before {
content: '';
position: absolute;
bottom: -2px;
width: 0;
height: 2px;
background: var(--primary400);
opacity: 0.5;
transition: width 100ms;
}
a.link:hover:before {
width: 100%;
transition: width 100ms;
}
a.link.large {
font-size: var(--font-size-large);
}
a.link.small {
font-size: var(--font-size-small);
}
a.link.xsmall {
font-size: var(--font-size-xsmall);
}
a.link .icon + * {
margin-left: 10px;
}
a.link.iconRight .icon {
order: 1;
margin-left: 10px;
}
a.link.iconRight .icon + * {
margin: 0;
}

View file

@ -1,13 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './Loading.module.css';
export default function Loading({ className }) {
return (
<div className={classNames(styles.loading, className)}>
<div />
<div />
<div />
</div>
);
}

View file

@ -1,43 +0,0 @@
@keyframes blink {
0% {
opacity: 0.2;
}
20% {
opacity: 1;
}
100% {
opacity: 0.2;
}
}
.loading {
display: flex;
justify-content: center;
align-items: center;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
margin: 0;
}
.loading div {
width: 10px;
height: 10px;
border-radius: 100%;
background: var(--gray400);
animation: blink 1.4s infinite;
animation-fill-mode: both;
}
.loading div + div {
margin-left: 10px;
}
.loading div:nth-child(2) {
animation-delay: 0.2s;
}
.loading div:nth-child(3) {
animation-delay: 0.4s;
}

View file

@ -1,48 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './Menu.module.css';
export default function Menu({
options = [],
selectedOption,
className,
float,
align = 'left',
optionClassName,
selectedClassName,
onSelect = () => {},
}) {
return (
<div
className={classNames(styles.menu, className, {
[styles.float]: float,
[styles.top]: float === 'top',
[styles.bottom]: float === 'bottom',
[styles.left]: align === 'left',
[styles.right]: align === 'right',
})}
>
{options
.filter(({ hidden }) => !hidden)
.map(option => {
const { label, value, className: customClassName, render, divider } = option;
return render ? (
render(option)
) : (
<div
key={value}
className={classNames(styles.option, optionClassName, customClassName, {
[selectedClassName]: selectedOption === option,
[styles.selected]: selectedOption === option,
[styles.divider]: divider,
})}
onClick={e => onSelect(value, e)}
>
{label}
</div>
);
})}
</div>
);
}

View file

@ -1,51 +0,0 @@
.menu {
background: var(--gray50);
border: 1px solid var(--gray500);
border-radius: 4px;
overflow: hidden;
z-index: 100;
}
.option {
font-size: var(--font-size-small);
font-weight: normal;
background: var(--gray50);
padding: 4px 16px;
cursor: pointer;
white-space: nowrap;
}
.option:hover {
background: var(--gray100);
}
.float {
position: absolute;
min-width: 100px;
}
.top {
bottom: 100%;
margin-bottom: 5px;
}
.bottom {
top: 100%;
margin-top: 5px;
}
.left {
left: 0;
}
.right {
right: 0;
}
.divider {
border-top: 1px solid var(--gray300);
}
.selected {
font-weight: 600;
}

View file

@ -1,60 +0,0 @@
import React, { useState, useRef } from 'react';
import classNames from 'classnames';
import Menu from 'components/common/Menu';
import Button from 'components/common/Button';
import useDocumentClick from 'hooks/useDocumentClick';
import styles from './MenuButton.module.css';
export default function MenuButton({
icon,
value,
options,
buttonClassName,
menuClassName,
menuPosition = 'bottom',
menuAlign = 'right',
onSelect,
renderValue,
}) {
const [showMenu, setShowMenu] = useState(false);
const ref = useRef();
const selectedOption = options.find(e => e.value === value);
function handleSelect(value) {
onSelect(value);
setShowMenu(false);
}
function toggleMenu() {
setShowMenu(state => !state);
}
useDocumentClick(e => {
if (!ref.current?.contains(e.target)) {
setShowMenu(false);
}
});
return (
<div className={styles.container} ref={ref}>
<Button
icon={icon}
className={classNames(styles.button, buttonClassName, { [styles.open]: showMenu })}
onClick={toggleMenu}
variant="light"
>
<div className={styles.text}>{renderValue ? renderValue(selectedOption) : value}</div>
</Button>
{showMenu && (
<Menu
className={menuClassName}
options={options}
selectedOption={selectedOption}
onSelect={handleSelect}
float={menuPosition}
align={menuAlign}
/>
)}
</div>
);
}

View file

@ -1,20 +0,0 @@
.container {
display: flex;
position: relative;
cursor: pointer;
}
.button {
border: 1px solid transparent;
border-radius: 4px;
}
.text {
font-size: var(--font-size-small);
}
.open,
.open:hover {
background: var(--gray50);
border: 1px solid var(--gray500);
}

View file

@ -1,18 +0,0 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { useSpring, animated } from 'react-spring';
import styles from './Modal.module.css';
export default function Modal({ title, children }) {
const props = useSpring({ opacity: 1, from: { opacity: 0 } });
return ReactDOM.createPortal(
<animated.div className={styles.modal} style={props}>
<div className={styles.content}>
{title && <div className={styles.header}>{title}</div>}
<div className={styles.body}>{children}</div>
</div>
</animated.div>,
document.getElementById('__modals'),
);
}

View file

@ -1,46 +0,0 @@
.modal {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
z-index: 2;
}
.modal:before {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
background: #000;
opacity: 0.5;
}
.content {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background: var(--gray50);
min-width: 400px;
min-height: 100px;
max-width: 100vw;
z-index: 1;
border: 1px solid var(--gray300);
padding: 30px;
border-radius: 4px;
}
.header {
font-weight: 600;
margin-bottom: 20px;
}
.body {
display: flex;
flex-direction: column;
}

View file

@ -1,32 +0,0 @@
import React from 'react';
import { useRouter } from 'next/router';
import classNames from 'classnames';
import styles from './NavMenu.module.css';
export default function NavMenu({ options = [], className, onSelect = () => {} }) {
const router = useRouter();
return (
<div className={classNames(styles.menu, className)}>
{options
.filter(({ hidden }) => !hidden)
.map(option => {
const { label, value, className: customClassName, render } = option;
return render ? (
render(option)
) : (
<div
key={value}
className={classNames(styles.option, customClassName, {
[styles.selected]: router.asPath === value,
})}
onClick={e => onSelect(value, e)}
>
{label}
</div>
);
})}
</div>
);
}

View file

@ -1,22 +0,0 @@
.menu {
color: var(--gray800);
border: 1px solid var(--gray500);
border-radius: 4px;
overflow: hidden;
z-index: 2;
}
.option {
padding: 8px 16px;
cursor: pointer;
border-radius: 4px;
}
.option:hover {
background: var(--gray75);
}
.selected {
color: var(--gray900);
font-weight: 600;
}

View file

@ -1,12 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import { FormattedMessage } from 'react-intl';
import styles from './NoData.module.css';
export default function NoData({ className }) {
return (
<div className={classNames(styles.container, className)}>
<FormattedMessage id="message.no-data-available" defaultMessage="No data available." />
</div>
);
}

View file

@ -1,8 +0,0 @@
.container {
color: var(--gray500);
font-size: var(--font-size-normal);
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

View file

@ -1,37 +0,0 @@
import React, { useState, useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { FormattedMessage } from 'react-intl';
import { setDateRange } from 'redux/actions/websites';
import Button from './Button';
import Refresh from 'assets/redo.svg';
import Dots from 'assets/ellipsis-h.svg';
import useDateRange from 'hooks/useDateRange';
import { getDateRange } from '../../lib/date';
export default function RefreshButton({ websiteId }) {
const dispatch = useDispatch();
const [dateRange] = useDateRange(websiteId);
const [loading, setLoading] = useState(false);
const completed = useSelector(state => state.queries[`/api/website/${websiteId}/stats`]);
function handleClick() {
if (dateRange) {
setLoading(true);
dispatch(setDateRange(websiteId, getDateRange(dateRange.value)));
}
}
useEffect(() => {
setLoading(false);
}, [completed]);
return (
<Button
icon={loading ? <Dots /> : <Refresh />}
tooltip={<FormattedMessage id="label.refresh" defaultMessage="Refresh" />}
tooltipId="button-refresh"
size="small"
onClick={handleClick}
/>
);
}

View file

@ -1,60 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import NoData from 'components/common/NoData';
import styles from './Table.module.css';
export default function Table({
columns,
rows,
empty,
className,
bodyClassName,
rowKey,
showHeader = true,
children,
}) {
if (empty && rows.length === 0) {
return empty;
}
return (
<div className={classNames(styles.table, className)}>
{showHeader && (
<div className={classNames(styles.header, 'row')}>
{columns.map(({ key, label, className, style, header }) => (
<div
key={key}
className={classNames(styles.head, className, header?.className)}
style={{ ...style, ...header?.style }}
>
{label}
</div>
))}
</div>
)}
<div className={classNames(styles.body, bodyClassName)}>
{rows.length === 0 && <NoData />}
{!children &&
rows.map((row, index) => {
const id = rowKey ? rowKey(row) : index;
return <TableRow key={id} columns={columns} row={row} />;
})}
{children}
</div>
</div>
);
}
export const TableRow = ({ columns, row }) => (
<div className={classNames(styles.row, 'row')}>
{columns.map(({ key, render, className, style, cell }, index) => (
<div
key={`${key}-${index}`}
className={classNames(styles.cell, className, cell?.className)}
style={{ ...style, ...cell?.style }}
>
{render ? render(row) : row[key]}
</div>
))}
</div>
);

View file

@ -1,30 +0,0 @@
.table {
display: flex;
flex-direction: column;
}
.header {
border-bottom: 1px solid var(--gray300);
}
.head {
font-size: var(--font-size-small);
font-weight: 600;
line-height: 40px;
}
.body {
position: relative;
display: flex;
flex-direction: column;
}
.row {
border-bottom: 1px solid var(--gray300);
padding: 10px 0;
}
.cell {
display: flex;
align-items: flex-start;
}

View file

@ -1,7 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './Tag.module.css';
export default function Tag({ className, children }) {
return <span className={classNames(styles.tag, className)}>{children}</span>;
}

View file

@ -1,6 +0,0 @@
.tag {
padding: 2px 4px;
border: 1px solid var(--gray300);
border-radius: 4px;
margin-right: 10px;
}

View file

@ -1,26 +0,0 @@
import React, { useEffect } from 'react';
import ReactDOM from 'react-dom';
import { useSpring, animated } from 'react-spring';
import styles from './Toast.module.css';
import Icon from 'components/common/Icon';
import Close from 'assets/times.svg';
export default function Toast({ message, timeout = 3000, onClose }) {
const props = useSpring({
opacity: 1,
transform: 'translate3d(0,0px,0)',
from: { opacity: 0, transform: 'translate3d(0,-40px,0)' },
});
useEffect(() => {
setTimeout(onClose, timeout);
}, []);
return ReactDOM.createPortal(
<animated.div className={styles.toast} style={props} onClick={onClose}>
<div className={styles.message}>{message}</div>
<Icon className={styles.close} icon={<Close />} size="small" />
</animated.div>,
document.getElementById('__modals'),
);
}

View file

@ -1,25 +0,0 @@
.toast {
position: absolute;
top: 30px;
left: 0;
right: 0;
width: 300px;
border-radius: 5px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 16px;
color: var(--msgColor);
background: var(--green400);
margin: auto;
z-index: 2;
cursor: pointer;
}
.message {
font-size: var(--font-size-normal);
}
.close {
margin-left: 20px;
}

View file

@ -1,47 +0,0 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import useVersion from 'hooks/useVersion';
import styles from './UpdateNotice.module.css';
import ButtonLayout from '../layout/ButtonLayout';
import Button from './Button';
import useForceUpdate from '../../hooks/useForceUpdate';
export default function UpdateNotice() {
const forceUpdate = useForceUpdate();
const { hasUpdate, checked, latest, updateCheck } = useVersion(true);
function handleViewClick() {
location.href = 'https://github.com/mikecao/umami/releases';
updateCheck();
forceUpdate();
}
function handleDismissClick() {
updateCheck();
forceUpdate();
}
if (!hasUpdate || checked) {
return null;
}
return (
<div className={styles.notice}>
<div className={styles.message}>
<FormattedMessage
id="message.new-version-available"
defaultMessage="A new version of umami {version} is available!"
values={{ version: `v${latest}` }}
/>
</div>
<ButtonLayout>
<Button size="xsmall" variant="action" onClick={handleViewClick}>
<FormattedMessage id="label.view-details" defaultMessage="View details" />
</Button>
<Button size="xsmall" onClick={handleDismissClick}>
<FormattedMessage id="label.dismiss" defaultMessage="Dismiss" />
</Button>
</ButtonLayout>
</div>
);
}

View file

@ -1,13 +0,0 @@
.notice {
display: flex;
justify-content: center;
align-items: center;
padding-top: 10px;
font-size: var(--font-size-small);
font-weight: 600;
}
.message {
text-align: center;
margin-right: 20px;
}

View file

@ -1,91 +0,0 @@
import React, { useState, useMemo } from 'react';
import ReactTooltip from 'react-tooltip';
import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
import classNames from 'classnames';
import tinycolor from 'tinycolor2';
import useTheme from 'hooks/useTheme';
import { THEME_COLORS } from 'lib/constants';
import styles from './WorldMap.module.css';
import useCountryNames from 'hooks/useCountryNames';
import useLocale from 'hooks/useLocale';
import { useRouter } from 'next/router';
const geoUrl = '/world-110m.json';
export default function WorldMap({ data, className }) {
const { basePath } = useRouter();
const [tooltip, setTooltip] = useState();
const [theme] = useTheme();
const colors = useMemo(
() => ({
baseColor: THEME_COLORS[theme].primary,
fillColor: THEME_COLORS[theme].gray100,
strokeColor: THEME_COLORS[theme].primary,
hoverColor: THEME_COLORS[theme].primary,
}),
[theme],
);
const [locale] = useLocale();
const countryNames = useCountryNames(locale);
function getFillColor(code) {
if (code === 'AQ') return;
const country = data?.find(({ x }) => x === code);
if (!country) {
return colors.fillColor;
}
return tinycolor(colors.baseColor)[theme === 'light' ? 'lighten' : 'darken'](
40 * (1.0 - country.z / 100),
);
}
function getOpacity(code) {
return code === 'AQ' ? 0 : 1;
}
function handleHover(code) {
if (code === 'AQ') return;
const country = data?.find(({ x }) => x === code);
setTooltip(`${countryNames[code]}: ${country?.y || 0} visitors`);
}
return (
<div
className={classNames(styles.container, className)}
data-tip=""
data-for="world-map-tooltip"
>
<ComposableMap projection="geoMercator">
<ZoomableGroup zoom={0.8} minZoom={0.7} center={[0, 40]}>
<Geographies geography={`${basePath}${geoUrl}`}>
{({ geographies }) => {
return geographies.map(geo => {
const code = geo.properties.ISO_A2;
return (
<Geography
key={geo.rsmKey}
geography={geo}
fill={getFillColor(code)}
stroke={colors.strokeColor}
opacity={getOpacity(code)}
style={{
default: { outline: 'none' },
hover: { outline: 'none', fill: colors.hoverColor },
pressed: { outline: 'none' },
}}
onMouseOver={() => handleHover(code)}
onMouseOut={() => setTooltip(null)}
/>
);
});
}}
</Geographies>
</ZoomableGroup>
</ComposableMap>
<ReactTooltip id="world-map-tooltip">{tooltip}</ReactTooltip>
</div>
);
}

View file

@ -1,88 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { Formik, Form, Field } from 'formik';
import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
FormMessage,
FormRow,
} from 'components/layout/FormLayout';
import usePost from 'hooks/usePost';
const initialValues = {
username: '',
password: '',
};
const validate = ({ user_id, username, password }) => {
const errors = {};
if (!username) {
errors.username = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!user_id && !password) {
errors.password = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
return errors;
};
export default function AccountEditForm({ values, onSave, onClose }) {
const post = usePost();
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { ok, data } = await post('/api/account', values);
if (ok) {
onSave();
} else {
setMessage(
data || <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />,
);
}
};
return (
<FormLayout>
<Formik
initialValues={{ ...initialValues, ...values }}
validate={validate}
onSubmit={handleSubmit}
>
{() => (
<Form>
<FormRow>
<label htmlFor="username">
<FormattedMessage id="label.username" defaultMessage="Username" />
</label>
<div>
<Field name="username" type="text" />
<FormError name="username" />
</div>
</FormRow>
<FormRow>
<label htmlFor="password">
<FormattedMessage id="label.password" defaultMessage="Password" />
</label>
<div>
<Field name="password" type="password" />
<FormError name="password" />
</div>
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>
</Form>
)}
</Formik>
</FormLayout>
);
}

View file

@ -1,105 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { Formik, Form, Field } from 'formik';
import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
FormMessage,
FormRow,
} from 'components/layout/FormLayout';
import usePost from 'hooks/usePost';
const initialValues = {
current_password: '',
new_password: '',
confirm_password: '',
};
const validate = ({ current_password, new_password, confirm_password }) => {
const errors = {};
if (!current_password) {
errors.current_password = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!new_password) {
errors.new_password = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!confirm_password) {
errors.confirm_password = <FormattedMessage id="label.required" defaultMessage="Required" />;
} else if (new_password !== confirm_password) {
errors.confirm_password = (
<FormattedMessage id="label.passwords-dont-match" defaultMessage="Passwords don't match" />
);
}
return errors;
};
export default function ChangePasswordForm({ values, onSave, onClose }) {
const post = usePost();
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { ok, data } = await post('/api/account/password', values);
if (ok) {
onSave();
} else {
setMessage(
data || <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />,
);
}
};
return (
<FormLayout>
<Formik
initialValues={{ ...initialValues, ...values }}
validate={validate}
onSubmit={handleSubmit}
>
{() => (
<Form>
<FormRow>
<label htmlFor="current_password">
<FormattedMessage id="label.current-password" defaultMessage="Current password" />
</label>
<div>
<Field name="current_password" type="password" />
<FormError name="current_password" />
</div>
</FormRow>
<FormRow>
<label htmlFor="new_password">
<FormattedMessage id="label.new-password" defaultMessage="New password" />
</label>
<div>
<Field name="new_password" type="password" />
<FormError name="new_password" />
</div>
</FormRow>
<FormRow>
<label htmlFor="confirm_password">
<FormattedMessage id="label.confirm-password" defaultMessage="Confirm password" />
</label>
<div>
<Field name="confirm_password" type="password" />
<FormError name="confirm_password" />
</div>
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>
</Form>
)}
</Formik>
</FormLayout>
);
}

View file

@ -1,83 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { isAfter, isBefore, isSameDay } from 'date-fns';
import Calendar from 'components/common/Calendar';
import Button from 'components/common/Button';
import { FormButtons } from 'components/layout/FormLayout';
import { getDateRangeValues } from 'lib/date';
import styles from './DatePickerForm.module.css';
import ButtonGroup from 'components/common/ButtonGroup';
const FILTER_DAY = 0;
const FILTER_RANGE = 1;
export default function DatePickerForm({
startDate: defaultStartDate,
endDate: defaultEndDate,
minDate,
maxDate,
onChange,
onClose,
}) {
const [selected, setSelected] = useState(
isSameDay(defaultStartDate, defaultEndDate) ? FILTER_DAY : FILTER_RANGE,
);
const [date, setDate] = useState(defaultStartDate);
const [startDate, setStartDate] = useState(defaultStartDate);
const [endDate, setEndDate] = useState(defaultEndDate);
const disabled =
selected === FILTER_DAY
? isAfter(minDate, date) && isBefore(maxDate, date)
: isAfter(startDate, endDate);
const buttons = [
{
label: <FormattedMessage id="label.single-day" defaultMessage="Single day" />,
value: FILTER_DAY,
},
{
label: <FormattedMessage id="label.date-range" defaultMessage="Date range" />,
value: FILTER_RANGE,
},
];
function handleSave() {
if (selected === FILTER_DAY) {
onChange({ ...getDateRangeValues(date, date), value: 'custom' });
} else {
onChange({ ...getDateRangeValues(startDate, endDate), value: 'custom' });
}
}
return (
<div className={styles.container}>
<div className={styles.filter}>
<ButtonGroup size="small" items={buttons} selectedItem={selected} onClick={setSelected} />
</div>
<div className={styles.calendars}>
{selected === FILTER_DAY ? (
<Calendar date={date} minDate={minDate} maxDate={maxDate} onChange={setDate} />
) : (
<>
<Calendar
date={startDate}
minDate={minDate}
maxDate={endDate}
onChange={setStartDate}
/>
<Calendar date={endDate} minDate={startDate} maxDate={maxDate} onChange={setEndDate} />
</>
)}
</div>
<FormButtons>
<Button variant="action" onClick={handleSave} disabled={disabled}>
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</div>
);
}

View file

@ -1,98 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { Formik, Form, Field } from 'formik';
import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
FormMessage,
FormRow,
} from 'components/layout/FormLayout';
import useDelete from 'hooks/useDelete';
const CONFIRMATION_WORD = 'DELETE';
const validate = ({ confirmation }) => {
const errors = {};
if (confirmation !== CONFIRMATION_WORD) {
errors.confirmation = !confirmation ? (
<FormattedMessage id="label.required" defaultMessage="Required" />
) : (
<FormattedMessage id="label.invalid" defaultMessage="Invalid" />
);
}
return errors;
};
export default function DeleteForm({ values, onSave, onClose }) {
const del = useDelete();
const [message, setMessage] = useState();
const handleSubmit = async ({ type, id }) => {
const { ok, data } = await del(`/api/${type}/${id}`);
if (ok) {
onSave();
} else {
setMessage(
data || <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />,
);
}
};
return (
<FormLayout>
<Formik
initialValues={{ confirmation: '', ...values }}
validate={validate}
onSubmit={handleSubmit}
>
{props => (
<Form>
<div>
<FormattedMessage
id="message.confirm-delete"
defaultMessage="Are your sure you want to delete {target}?"
values={{ target: <b>{values.name}</b> }}
/>
</div>
<div>
<FormattedMessage
id="message.delete-warning"
defaultMessage="All associated data will be deleted as well."
/>
</div>
<p>
<FormattedMessage
id="message.type-delete"
defaultMessage="Type {delete} in the box below to confirm."
values={{ delete: <b>{CONFIRMATION_WORD}</b> }}
/>
</p>
<FormRow>
<div>
<Field name="confirmation" type="text" />
<FormError name="confirmation" />
</div>
</FormRow>
<FormButtons>
<Button
type="submit"
variant="danger"
disabled={props.values.confirmation !== CONFIRMATION_WORD}
>
<FormattedMessage id="label.delete" defaultMessage="Delete" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>
</Form>
)}
</Formik>
</FormLayout>
);
}

View file

@ -1,102 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { Formik, Form, Field } from 'formik';
import { useRouter } from 'next/router';
import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
FormMessage,
FormRow,
} from 'components/layout/FormLayout';
import Icon from 'components/common/Icon';
import Logo from 'assets/logo.svg';
import styles from './LoginForm.module.css';
import usePost from 'hooks/usePost';
const validate = ({ username, password }) => {
const errors = {};
if (!username) {
errors.username = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!password) {
errors.password = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
return errors;
};
export default function LoginForm() {
const post = usePost();
const router = useRouter();
const [message, setMessage] = useState();
const handleSubmit = async ({ username, password }) => {
const { ok, status, data } = await post('/api/auth/login', {
username,
password,
});
if (ok) {
return router.push('/');
} else {
setMessage(
status === 401 ? (
<FormattedMessage
id="message.incorrect-username-password"
defaultMessage="Incorrect username/password."
/>
) : (
data
),
);
}
};
return (
<FormLayout className={styles.login}>
<Formik
initialValues={{
username: '',
password: '',
}}
validate={validate}
onSubmit={handleSubmit}
>
{() => (
<Form>
<div className={styles.header}>
<Icon icon={<Logo />} size="xlarge" className={styles.icon} />
<h1 className="center">umami</h1>
</div>
<FormRow>
<label htmlFor="username">
<FormattedMessage id="label.username" defaultMessage="Username" />
</label>
<div>
<Field name="username" type="text" />
<FormError name="username" />
</div>
</FormRow>
<FormRow>
<label htmlFor="password">
<FormattedMessage id="label.password" defaultMessage="Password" />
</label>
<div>
<Field name="password" type="password" />
<FormError name="password" />
</div>
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="label.login" defaultMessage="Login" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>
</Form>
)}
</Formik>
</FormLayout>
);
}

View file

@ -1,23 +0,0 @@
.login {
display: flex;
flex-direction: column;
margin-top: 80px;
}
.login form {
margin: 0 auto;
}
.icon {
display: flex;
justify-content: center;
margin: 0 auto;
}
.header {
margin-bottom: 30px;
}
.header h1 {
margin: 12px 0;
}

View file

@ -1,42 +0,0 @@
import React, { useRef } from 'react';
import { FormattedMessage } from 'react-intl';
import { useRouter } from 'next/router';
import Button from 'components/common/Button';
import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
import CopyButton from 'components/common/CopyButton';
export default function TrackingCodeForm({ values, onClose }) {
const ref = useRef();
const { basePath } = useRouter();
const { name, share_id } = values;
return (
<FormLayout>
<p>
<FormattedMessage
id="message.share-url"
defaultMessage="This is the publicly shared URL for {target}."
values={{ target: <b>{values.name}</b> }}
/>
</p>
<FormRow>
<textarea
ref={ref}
rows={3}
cols={60}
spellCheck={false}
defaultValue={`${
document.location.origin
}${basePath}/share/${share_id}/${encodeURIComponent(name)}`}
readOnly
/>
</FormRow>
<FormButtons>
<CopyButton type="submit" variant="action" element={ref} />
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</FormLayout>
);
}

View file

@ -1,39 +0,0 @@
import React, { useRef } from 'react';
import { FormattedMessage } from 'react-intl';
import { useRouter } from 'next/router';
import Button from 'components/common/Button';
import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';
import CopyButton from 'components/common/CopyButton';
export default function TrackingCodeForm({ values, onClose }) {
const ref = useRef();
const { basePath } = useRouter();
return (
<FormLayout>
<p>
<FormattedMessage
id="message.track-stats"
defaultMessage="To track stats for {target}, place the following code in the {head} section of your website."
values={{ head: '<head>', target: <b>{values.name}</b> }}
/>
</p>
<FormRow>
<textarea
ref={ref}
rows={3}
cols={60}
spellCheck={false}
defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/umami.js"></script>`}
readOnly
/>
</FormRow>
<FormButtons>
<CopyButton type="submit" variant="action" element={ref} />
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</FormLayout>
);
}

View file

@ -1,109 +0,0 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { Formik, Form, Field } from 'formik';
import Button from 'components/common/Button';
import FormLayout, {
FormButtons,
FormError,
FormMessage,
FormRow,
} from 'components/layout/FormLayout';
import Checkbox from 'components/common/Checkbox';
import { DOMAIN_REGEX } from 'lib/constants';
import usePost from 'hooks/usePost';
const initialValues = {
name: '',
domain: '',
public: false,
};
const validate = ({ name, domain }) => {
const errors = {};
if (!name) {
errors.name = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!domain) {
errors.domain = <FormattedMessage id="label.required" defaultMessage="Required" />;
} else if (!DOMAIN_REGEX.test(domain)) {
errors.domain = <FormattedMessage id="label.invalid-domain" defaultMessage="Invalid domain" />;
}
return errors;
};
export default function WebsiteEditForm({ values, onSave, onClose }) {
const post = usePost();
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { ok, data } = await post('/api/website', values);
if (ok) {
onSave();
} else {
setMessage(
data || <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />,
);
}
};
return (
<FormLayout>
<Formik
initialValues={{ ...initialValues, ...values, enable_share_url: !!values?.share_id }}
validate={validate}
onSubmit={handleSubmit}
>
{() => (
<Form>
<FormRow>
<label htmlFor="name">
<FormattedMessage id="label.name" defaultMessage="Name" />
</label>
<div>
<Field name="name" type="text" />
<FormError name="name" />
</div>
</FormRow>
<FormRow>
<label htmlFor="domain">
<FormattedMessage id="label.domain" defaultMessage="Domain" />
</label>
<div>
<Field name="domain" type="text" />
<FormError name="domain" />
</div>
</FormRow>
<FormRow>
<label></label>
<Field name="enable_share_url">
{({ field }) => (
<Checkbox
{...field}
label={
<FormattedMessage
id="label.enable-share-url"
defaultMessage="Enable share URL"
/>
}
/>
)}
</Field>
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>
</Form>
)}
</Formik>
</FormLayout>
);
}

View file

@ -1,41 +0,0 @@
import React, { useState, useRef, useEffect } from 'react';
function isInViewport(element) {
const rect = element.getBoundingClientRect();
return !(
rect.bottom < 0 ||
rect.right < 0 ||
rect.left > window.innerWidth ||
rect.top > window.innerHeight
);
}
export default function CheckVisible({ className, children }) {
const [visible, setVisible] = useState(false);
const ref = useRef();
useEffect(() => {
const checkPosition = () => {
if (ref.current) {
const state = isInViewport(ref.current);
if (state !== visible) {
setVisible(state);
}
}
};
checkPosition();
window.addEventListener('scroll', checkPosition);
return () => {
window.removeEventListener('scroll', checkPosition);
};
}, [visible]);
return (
<div ref={ref} className={className} data-visible={visible}>
{typeof children === 'function' ? children(visible) : children}
</div>
);
}

View file

@ -1,49 +0,0 @@
import React, { useState, useRef, useEffect } from 'react';
import classNames from 'classnames';
export default function StickyHeader({
className,
stickyClassName,
stickyStyle,
children,
enabled = true,
}) {
const [sticky, setSticky] = useState(false);
const ref = useRef();
const top = useRef(0);
useEffect(() => {
const checkPosition = () => {
if (ref.current) {
if (!top.current) {
top.current = ref.current.offsetTop + ref.current.offsetHeight;
}
const state = window.pageYOffset > top.current;
if (sticky !== state) {
setSticky(state);
}
}
};
checkPosition();
if (enabled) {
window.addEventListener('scroll', checkPosition);
}
return () => {
window.removeEventListener('scroll', checkPosition);
};
}, [sticky, enabled]);
return (
<div
ref={ref}
data-sticky={sticky}
className={classNames(className, { [stickyClassName]: sticky })}
style={sticky ? { ...stickyStyle, width: ref?.current?.clientWidth } : null}
>
{children}
</div>
);
}

View file

@ -1,17 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './ButtonLayout.module.css';
export default function ButtonLayout({ className, children, align = 'center' }) {
return (
<div
className={classNames(styles.buttons, className, {
[styles.left]: align === 'left',
[styles.center]: align === 'center',
[styles.right]: align === 'right',
})}
>
{children}
</div>
);
}

View file

@ -1,20 +0,0 @@
.buttons {
display: flex;
align-items: center;
}
.buttons button + * {
margin-left: 10px;
}
.center {
justify-content: center;
}
.left {
justify-content: flex-start;
}
.right {
justify-content: flex-end;
}

View file

@ -1,33 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import { FormattedMessage } from 'react-intl';
import Link from 'components/common/Link';
import styles from './Footer.module.css';
import useVersion from 'hooks/useVersion';
export default function Footer() {
const { current } = useVersion();
return (
<footer className="container">
<div className={classNames(styles.footer, 'row')}>
<div className="col-12 col-md-4" />
<div className="col-12 col-md-4">
<FormattedMessage
id="message.powered-by"
defaultMessage="Powered by {name}"
values={{
name: (
<Link href="https://umami.is">
<b>umami</b>
</Link>
),
}}
/>
</div>
<div className={classNames(styles.version, 'col-12 col-md-4')}>
<Link href={`https://github.com/mikecao/umami/releases`}>{`v${current}`}</Link>
</div>
</div>
</footer>
);
}

View file

@ -1,18 +0,0 @@
.footer {
display: flex;
justify-content: space-between;
align-items: center;
font-size: var(--font-size-small);
min-height: 100px;
text-align: center;
}
.version {
text-align: right;
}
@media only screen and (max-width: 768px) {
.version {
text-align: center;
}
}

View file

@ -1,32 +0,0 @@
import React from 'react';
import { useSpring, animated } from 'react-spring';
import classNames from 'classnames';
import { ErrorMessage } from 'formik';
import styles from './FormLayout.module.css';
export default function FormLayout({ className, children }) {
return <div className={classNames(styles.form, className)}>{children}</div>;
}
export const FormButtons = ({ className, children }) => (
<div className={classNames(styles.buttons, className)}>{children}</div>
);
export const FormError = ({ name }) => {
return <ErrorMessage name={name}>{msg => <ErrorTag msg={msg} />}</ErrorMessage>;
};
const ErrorTag = ({ msg }) => {
const props = useSpring({ opacity: 1, from: { opacity: 0 } });
return (
<animated.div className={styles.error} style={props}>
<div className={styles.msg}>{msg}</div>
</animated.div>
);
};
export const FormRow = ({ children }) => <div className={styles.row}>{children}</div>;
export const FormMessage = ({ children }) =>
children ? <div className={styles.message}>{children}</div> : null;

View file

@ -1,86 +0,0 @@
.form {
display: flex;
flex-direction: column;
justify-content: center;
}
.form label {
display: block;
min-width: 100px;
}
.row {
display: flex;
align-items: center;
position: relative;
margin-bottom: 20px;
line-height: 1.8;
}
.row > div {
position: relative;
}
.buttons {
display: flex;
justify-content: center;
margin-top: 20px;
}
.buttons button + button {
margin-left: 10px;
}
.error {
position: absolute;
display: flex;
justify-content: center;
align-items: center;
top: 0;
left: calc(100% + 16px);
bottom: 0;
z-index: 1;
}
.msg {
color: var(--msgColor);
background: var(--red400);
font-size: var(--font-size-small);
padding: 4px 8px;
border-radius: 4px;
white-space: nowrap;
}
.error:after {
content: '';
position: absolute;
top: 0;
left: -5px;
bottom: 0;
margin: auto;
width: 10px;
height: 10px;
background: var(--red400);
transform: rotate(45deg);
}
.message {
text-align: center;
margin: 20px 0;
padding: 4px 8px;
border-radius: 4px;
color: var(--gray50);
background: var(--gray800);
}
@media only screen and (max-width: 576px) {
.error {
align-items: flex-start;
top: calc(100% + 7px);
left: 0;
}
.error:after {
left: 10px;
}
}

View file

@ -1,31 +0,0 @@
import React from 'react';
import classNames from 'classnames';
import styles from './GridLayout.module.css';
export default function GridLayout({ className, children }) {
return <div className={classNames(styles.grid, className)}>{children}</div>;
}
export const GridRow = ({ className, children }) => {
return <div className={classNames(styles.row, className, 'row')}>{children}</div>;
};
export const GridColumn = ({ xs, sm, md, lg, xl, className, children }) => {
const classes = [];
classes.push(xs ? `col-${xs}` : 'col-12');
if (sm) {
classes.push(`col-sm-${sm}`);
}
if (md) {
classes.push(`col-md-${md}`);
}
if (lg) {
classes.push(`col-lg-${lg}`);
}
if (xl) {
classes.push(`col-lg-${xl}`);
}
return <div className={classNames(styles.col, classes, className)}>{children}</div>;
};

Some files were not shown because too many files have changed in this diff Show more