Commit Graph

538 Commits

Author SHA1 Message Date
Mike Cao
46a18f2918 Fixed account lookup. 2022-10-25 11:01:28 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Mike Cao
2290be7ca4 Fixed share page issue. 2022-10-24 19:48:10 -07:00
Brian Cao
500a2b9663 fix column names 2022-10-21 22:30:52 -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 Cao
5a4fc96ebc Refactor API authentication. 2022-10-12 13:11:44 -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
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
Mike Cao
5e2d23f18f Refactor auth logic. 2022-10-11 21:48:33 -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
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
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Brian Cao
0387cf0da0 remove CH import 2022-10-06 12:49:49 -07:00
Sergio Mensing
e8a30e7251 use slice instead of substring for desired result 2022-10-05 14:44:49 +02:00
Brian Cao
d4abe51331 remove database_type from prisma getdb function 2022-09-28 15:36:41 -07:00
Mike Cao
dfac7e1af5 Updated Kafka loading process. 2022-09-22 10:36:23 -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
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
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Brian Cao
99914d6e98 Add retry connection to redis. Clean up up redis/session logic 2022-09-05 22:47:45 -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
Brian Cao
42bdfccdf4 Fix website get during collection/session check 2022-09-05 11:36:57 -07:00
Mike Cao
0bbfbc04c3
Merge pull request #1463 from guigrpa/add-yesterday
Add yesterday option
2022-09-03 21:23:51 -07:00
Brian Cao
afe6d8994b fix redis connection. fix delete account 2022-09-01 11:11:11 -07:00
Brian Cao
f18b5a20e3 remove bigint 2022-08-30 13:56:37 -07:00
Brian Cao
d53b4a8895 roll back bigint. add loading 2022-08-30 00:03:22 -07:00
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07: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
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
467c7f289f Database refactoring. 2022-08-27 21:38:35 -07:00
Mike Cao
3327bcf5a3 Refactor get database type logic. 2022-08-26 22:43:31 -07:00
Brian Cao
b29cece7ef fix relational 2022-08-26 21:29:26 -07:00
Brian Cao
54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao
818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07: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
f499af5491 fix refs 2022-08-25 22:43:22 -07:00
Brian Cao
c811577460 fix folders 2022-08-25 22:20:30 -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
700158f5f6 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2022-08-23 00:48:57 -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
Francis Cao
192dd218cb move kafka logic into own file 2022-08-12 09:21:43 -07:00
Mike Cao
c0276db6e3 Fixed session check logic. Closes #1340. 2022-08-11 12:11:43 -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
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
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Mike Cao
62b032ab19 Refactored dashboard sort logic. 2022-08-04 21:37:18 -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
1d4aa7c535 Refactored website ordering feature. 2022-08-04 03:56:30 -07: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
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
a4a6888248 Moved telemetry code to script. 2022-08-02 00:24:17 -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
Mike Cao
ab1e49e703 Added Bengali and Thai languages. 2022-08-01 17:14:36 -07:00
Francis Cao
d952214536 check in producer test logic 2022-08-01 00:28:38 -07:00
Brian Cao
8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Brian Cao
f189035a73 fix CH return. 2022-07-25 09:47:11 -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
Chris Walsh
3926d3fe93
Add website ordering to state and settings page 2022-07-23 23:01:59 -07:00
Mike Cao
ba1e28f082 Fix filter issue for metrics. Closes #1268 2022-07-22 23:56:29 -07:00
Brian Cao
f569055771 PR comments 2022-07-22 22:42:01 -07:00
Brian Cao
aa8057f9fe fix stats query 2022-07-22 17:47:26 -07:00
Brian Cao
304314fff0 Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 17:03:42 -07:00
Brian Cao
65910c7348 clickhouse inserts 2022-07-22 14:43:19 -07:00
Maxime-J
bb1d17a5e2 follow-up - reverted getDateQuery logic 2022-07-22 12:35:37 +00:00
Mike Cao
07d276106e Fixed date query for MySQL. 2022-07-21 21:21:48 -07:00
Mike Cao
250cdce306 Reverted getDateQuery logic. 2022-07-21 13:21:33 -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
ae354ba676
Merge pull request #1283 from njfdev/master
Add Filter to Have Direct Referrer
2022-07-20 14:25:14 -07:00
Mike Cao
e4c4019e25 Allow custom release URL. 2022-07-15 23:53:31 -07:00
Brian Cao
4f12933f42 checkpoint 2022-07-15 22:21:37 -07:00
Brian Cao
20b8337e35 checkpoint 2022-07-15 16:47:38 -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
f327b5c0f7 fix imports 2022-07-12 15:14:27 -07:00
Brian Cao
8aec6d7406 move queries 2022-07-12 14:14:36 -07: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
a1d0235416 Added handling for BigInt values. 2022-07-07 05:55:43 -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
ca385af8c4 Removed password from accounts query. Closes #1153. 2022-06-26 23:09:34 -07:00
Mike Cao
5e094cd6ab Added Galacian language. 2022-06-26 20:56:24 -07:00
Mike Cao
3122bab419 Refactor migrations. 2022-06-19 00:07:01 -07:00
Mike Cao
e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -07:00
Mike Cao
1678d9e1ab Changed hash method again. 2022-04-25 19:11:54 -07:00
Mike Cao
f69dbaeaf6 Allow filtering of events with url. 2022-04-13 19:04:06 -07:00
Mike Cao
4c01f2fa49 Updated hash method. 2022-04-12 20:59:17 -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
e7602b58f4
Merge pull request #1080 from HolgerHuo/fix-referrer-issue
Fix referrer filter issue
2022-04-08 21:43:54 -07:00
Mike Cao
3fab09d626 Check for no session. Closes #1075 2022-04-08 17:17:07 -07:00
Holger Huo
0377773e21 fix: forgot to include referrer filter in sessionMetrics 2022-04-07 22:27:15 +08:00
Holger Huo
0349b82e9a fix: unable to sort by referrer 2022-04-07 16:58:01 +08:00
Mike Cao
faf6438852 Allow user to change admin username. 2022-04-03 22:25:32 -07: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
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
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
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
63bfa616f1 Set content type for responses. 2022-03-18 21:01:32 -07:00
Mike Cao
7530de87d2 Filter subdomains in referrers regex test. Closes #632 2022-03-17 19:58:06 -07:00
Mike Cao
128f15092e Update session hash calculation. 2022-03-14 11:14:05 -07:00
Mike Cao
785d41b6d3 Check for empty content-type header. 2022-03-11 22:17:47 -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
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
34ad1d9c39 New mobile menu. 2022-02-28 18:39:37 -08:00
Mike Cao
3a8bfd1dbd Move auth token logic to useApi hook. 2022-02-26 15:53:45 -08:00
Mike Cao
9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -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
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
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
Mike Cao
d8e831db50 Switch to authentication using bearer token. 2022-01-23 00:33:06 -08:00
Mike Cao
56cf55e053 Handle unique session errors. 2022-01-06 01:21:05 -08:00
Mike Cao
504b5f10d9 Fix refresh button issue, closes #840 2021-12-19 22:49:08 -08:00
Mike Cao
5ce457efa5 Updated raw query method. 2021-12-16 21:33:53 -08:00
Chris Walsh
9cff025784
Add owner column to admin website settings table 2021-12-01 16:03:18 -08:00
Mike Cao
d4dd2069b6 Fix build issues. 2021-11-22 14:53:36 -08:00
Mike Cao
307931950b Added menu entry for vi-VN locale. 2021-11-21 22:38:11 -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
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
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
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
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
df3ad3b6b8 Added Slovenian language. 2021-08-20 01:09:04 -07:00
Chris Walsh
6e128b2f38
Add reset website statistics to settings 2021-08-10 14:03:55 -07:00
Mike Cao
4f27a1773d Added Korean language. 2021-07-22 19:16:21 -07:00
Mike Cao
4f38242927 Update geo lookup 2021-07-18 23:48:30 -07:00
Mike Cao
526ed01d0a Fix issue with country db. 2021-07-16 09:23:55 -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
b2d04c00ac Change to synchronous password hashing. 2021-05-23 17:29:27 -07:00
Mike Cao
48e5977efa
Merge branch 'dev' into add-arabic-lang 2021-05-19 20:36:07 -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
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
Bilguun Ochirbat
41bfa1c165 Use Mongolian locale from date-fns 2021-05-17 13:24:12 +08:00
Ashraf Monshi
afc4940680 add rtlLocales array 2021-05-16 09:27:48 +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
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
20dc76861f Swap bcrypt library. 2021-04-28 02:45:38 -07:00
Mike Cao
0cf115b2de Load lookup database only once. 2021-04-25 18:32:06 -07:00
Wonderfall
807cd5d744
Fix Page Filter when URL has a trailing slash 2021-04-19 01:43:09 +02:00
Mike Cao
609cc0e98a Fix datamaps. 2021-03-26 22:32:13 -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
44f2002563
Merge pull request #567 from Form1ca/decrease-request-count
decrease db query count
2021-03-26 19:54:21 -07:00
Mike Cao
c5341e605b Fixed country lookup. 2021-03-26 19:47:28 -07:00
formica2
97c0da8527 fix fields name at request 2021-03-25 15:44:37 +03:00
formica2
e6975b9afc decrease db query count 2021-03-24 12:58:08 +03:00
l0st0
b1d4922df8 Added SK language
Support for Slovakia
2021-03-15 22:25:43 +01:00
Mike Cao
247afc8c33 Truncate URL lengths. 2021-03-12 23:45:19 -08:00
Mike Cao
e5ff182302 Added Persian language. 2021-03-12 22:30:26 -08:00
Alexander Klein
f6f14bf104 fix(lib): add default value for getDateRange 2021-03-10 10:40:59 +01:00
Alexander Klein
eb1029bfc8 feature(lib): locale option for getDateRange 2021-03-10 10:20:54 +01: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
d6d0f99daa Updated date formatting for locales. 2021-02-26 22:41:05 -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
083ef2dc9c Updated method for getting event types. 2021-02-20 17:27:56 -08:00
Mike Cao
490fc99a8a
Merge branch 'dev' into unknown-count 2021-02-20 02:00:49 -08:00