Commit Graph

252 Commits

Author SHA1 Message Date
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
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
b3d7d49448
Fix timezone bug (#1543) 2022-09-27 17:18:16 -07:00
Brian Cao
78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Mike Cao
13cf286874 Fix www replace. 2022-09-05 15:35:36 -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
efb52f5ff1 Fix crypto errors. 2022-08-29 08:31:16 -07:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -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
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
Brian Cao
10cc6616c5 add redis placeholder 2022-08-25 23:12:47 -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
Brian Cao
537ddde189 remove allow_agent 2022-08-22 23:21:44 -07:00
Francis Cao
e522293130 fixed event_uuid logic 2022-08-22 12:24:57 -07:00
Brian Cao
41d4b4c402 allow agent 2022-08-18 23:25: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
34e9ab811b add session_uuid to token 2022-08-09 23:32:02 -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
Francis Cao
1a84608e2b add Clickhouse migration files. update saveEvent to include event_uuid 2022-08-04 20:15:21 -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
Brian Cao
daf3978970 address PR comments. line up PSQL / MYSQL 2022-08-01 20:50:14 -07:00
Brian Cao
8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Mike Cao
ba1e28f082 Fix filter issue for metrics. Closes #1268 2022-07-22 23:56:29 -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
Chris Walsh
92b009fa1e
Add UTM pageview metrics to API 2022-07-21 14:57:29 -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
Mike Cao
d95b53143e
Merge pull request #1304 from thueske/feature/screensize
Feature: Add screensize to UI
2022-07-18 00:37:07 -07:00
Tobias Hüske
8d358ccb9d Feature: Add screensize to UI 2022-07-16 07:29:55 +02:00
Brian Cao
2950343f94 fix import 2022-07-12 19:50:47 -07:00
Brian Cao
8aec6d7406 move queries 2022-07-12 14:14:36 -07:00
Mike Cao
8175f13f96 Added IGNORE_HOSTNAME environment variable. Closes #1151. 2022-06-27 01:46:21 -07:00
Mike Cao
e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -07:00
Mike Cao
f69dbaeaf6 Allow filtering of events with url. 2022-04-13 19:04:06 -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
Holger Huo
0377773e21 fix: forgot to include referrer filter in sessionMetrics 2022-04-07 22:27:15 +08:00
Mike Cao
bf5068d32a Added CORS to website API endpoints. 2022-04-04 00:33:20 -07:00
Mike Cao
faf6438852 Allow user to change admin username. 2022-04-03 22:25:32 -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
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
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
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
9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -08:00
Mike Cao
6a8de2aeec Added option to remove trailing slash from urls. 2022-01-25 21:23:40 -08:00
Mike Cao
d8e831db50 Switch to authentication using bearer token. 2022-01-23 00:33:06 -08:00
Mike Cao
489d46f663 Fix PR. 2022-01-14 00:08:27 -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
P-Chan
56c0837e83 Refactor device message 2022-01-05 20:25:53 +09: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
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
Mike Cao
ebd52335bb Referrer filtering. 2021-11-21 22:00:14 -08: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
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
66ed9a502a
Merge pull request #756 from cywio/metric-comparison
Add time period comparison metric to dashboard
2021-08-15 23:15:14 -07: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
Chris Walsh
0c304a2abc
Add dashboard previous-period comparison metrics 2021-08-12 16:01:51 -07: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
Mike Cao
b2d04c00ac Change to synchronous password hashing. 2021-05-23 17:29:27 -07:00
Mike Cao
92705815ed Support CIDR notation in IGNORE_IP, closes #544. 2021-04-25 23:57:49 -07:00
Mike Cao
fb711d58f1 Updated bot detection library. 2021-03-12 22:44:25 -08:00
Mike Cao
f7201c9cfc Remove domain parameter from queries. 2021-02-26 19:50:44 -08:00
Mike Cao
083ef2dc9c Updated method for getting event types. 2021-02-20 17:27:56 -08:00
Alexander Klein
67551fb129 feature(api): add event types endpoint 2021-02-15 16:28:46 +01:00
Mike Cao
d4bfc84ff3 Fix event value display. 2020-12-04 20:45:12 -08:00
Mike Cao
1b172d214b Fix password change issue for non-admin accounts. 2020-11-28 13:28:52 -08:00
Mike Cao
5a73c224b7 Created share token hook. 2020-10-11 02:29:55 -07:00
Mike Cao
4119e80a9a Update table components. 2020-10-11 01:33:26 -07:00
Mike Cao
b72a4c001c Refactored realtime API. Add dot component and colored dots in log. 2020-10-10 11:04:07 -07:00
Mike Cao
5dd3110fbf Updated log merge logic to prevent duplicates. 2020-10-09 10:48:47 -07:00
Mike Cao
9737127bb1 Updated polling logic. 2020-10-09 01:04:06 -07:00
Mike Cao
fdc92d087b Update realtime chart. 2020-10-08 23:26:05 -07:00
Mike Cao
e64a555652 Renamed methods. Initial work on realtime dashboard. 2020-10-08 15:02:48 -07:00
Mike Cao
fc22f5969c Added IP address ignore list. 2020-10-03 19:07:56 -07:00
Mike Cao
3d1dc08491 Implement session caching. 2020-10-02 20:33:46 -07:00
Mike Cao
5068ab12a9 Support basePath in all queries. 2020-09-30 22:34:16 -07:00
Mike Cao
11d8b19279 Updated query filters. Updated packages. 2020-09-28 20:23:42 -07:00
Mike Cao
35b921bdb4 Convert buttons to links. 2020-09-25 23:38:28 -07:00
Mike Cao
4fded49b03 URL filter functionality. 2020-09-25 22:31:18 -07:00
Mike Cao
a24bee815c Update queries to calculate correct metrics. 2020-09-25 00:15:58 -07:00
Mike Cao
c932dc2810 Fix non-admin dashboard. 2020-09-18 00:34:22 -07:00
Mike Cao
96bd7e5b47 Use token authentication for API requests. 2020-09-17 22:52:20 -07:00
Mike Cao
bff8806b61 Update security for dashboard and details pages. 2020-09-17 11:40:04 -07:00
Mike Cao
ecd2593063 Removed console logs. 2020-09-17 00:25:13 -07:00
Mike Cao
81789d6723 Fix API check. 2020-09-16 13:13:50 -07:00
Mike Cao
bde1949e8f Fix password change issue. 2020-09-15 08:50:05 -07:00
Mike Cao
5b4a012f0b Fix 401 on share url. 2020-09-14 08:46:35 -07:00
Mike Cao
f59594e4cd Calendar updates. Responsive CSS updates. 2020-09-13 11:33:57 -07:00
Mike Cao
a0cb278463 Fix display of years. 2020-09-13 01:38:14 -07:00
Mike Cao
8e3286179a API security updates. 2020-09-11 13:49:43 -07:00
Mike Cao
5a22be5efa Allow admins to view account websites. 2020-09-10 23:55:29 -07:00
Mike Cao
943c2c73d4 Added check for bots. 2020-09-10 20:37:07 -07:00
Mike Cao
cb48acde55 Error handling for queries. 2020-08-31 21:11:53 -07:00
Mike Cao
5a4cde854a Domain validation. Filter domain from referrers. 2020-08-28 21:34:20 -07:00
Mike Cao
a7e7469d22 Bar chart styling. 2020-08-27 19:11:37 -07:00
Mike Cao
4618dc7f15 Events chart. 2020-08-27 19:11:36 -07:00
Mike Cao
5206622d5a Events table. 2020-08-27 19:11:36 -07:00
Mike Cao
5cade59111 Removed session code. 2020-08-20 19:17:27 -07:00
Mike Cao
343e59e6ff Add SameSite to auth cookie. 2020-08-20 10:34:02 -07:00
Mike Cao
b96cb0d975 Show active visitor count. 2020-08-18 00:51:32 -07:00
Mike Cao
d3514cfc5f Updated forms. 2020-08-16 21:28:54 -07:00
Mike Cao
560f1316c1 Enable public website sharing. 2020-08-15 01:17:15 -07:00
Mike Cao
f4ca353b5c Refactor database queries. 2020-08-11 22:24:41 -07:00
Mike Cao
a248f35db2 Add support for MySQL. 2020-08-11 20:05:40 -07:00
Mike Cao
b392a51676 Account editing and change password. 2020-08-09 02:03:37 -07:00
Mike Cao
b5cf9f8719 Account settings page. 2020-08-08 23:48:43 -07:00
Mike Cao
c4b75e4aec Handle website delete. Added response helper functions. 2020-08-07 17:19:42 -07:00
Mike Cao
00e232fee8 Website edit functionality. 2020-08-07 02:27:12 -07:00
Mike Cao
9d09d89aef Update device filtering. 2020-08-06 19:37:19 -07:00
Mike Cao
5d4ff5cfa4 Implement redux. 2020-08-04 22:45:05 -07:00
Mike Cao
a2db27894f Refactor components and styles. 2020-08-03 18:12:28 -07:00
Mike Cao
a65f637df2 Added world map component. 2020-08-01 03:34:56 -07:00
Mike Cao
ac2612924e Details page. 2020-07-31 19:05:14 -07:00
Mike Cao
5b45301178 Added year option. 2020-07-30 23:08:33 -07:00
Mike Cao
9f112c8cc9 DropDown component. Renamed files. 2020-07-30 20:11:43 -07:00
Mike Cao
344ffeb658 Fixed summary query. 2020-07-30 00:06:29 -07:00
Mike Cao
efdbd1c632 Updated summary query. Added visit time. 2020-07-29 21:40:26 -07:00
Mike Cao
f9a6f5f637 Added summary stats query. 2020-07-29 00:16:02 -07:00
Mike Cao
ce92c7897d Display page views and unique visitors. 2020-07-28 19:04:45 -07:00
Mike Cao
bdcdcd9d13 Website components. Update chart component. 2020-07-28 01:17:45 -07:00
Mike Cao
d81ee3932d Auth and session middleware. 2020-07-27 23:52:14 -07:00
Mike Cao
590a70c2ff Chart component. Update web utils. 2020-07-26 00:12:42 -07:00
Mike Cao
f947c7770b Login/logout process. 2020-07-25 16:31:07 -07:00
Mike Cao
49a55b40b4 Accounts and login. 2020-07-23 19:56:55 -07:00
Mike Cao
f3f0ad15f2 Changed JWT implementation. 2020-07-22 21:33:17 -07:00
Mike Cao
cb0c912c5b Switch to json web tokens. 2020-07-22 20:45:09 -07:00
Mike Cao
5219582803 Cookie authentication. 2020-07-22 15:46:05 -07:00
Mike Cao
132bbcbe0d Refactored session and collect process. 2020-07-20 01:54:21 -07:00
Mike Cao
9cb08956c0 Updated event handling. 2020-07-19 02:23:15 -07:00
Mike Cao
9f3acd1583 Add event collection. 2020-07-19 01:57:01 -07:00
Mike Cao
d8c8df2955 Updated schema. 2020-07-18 23:54:25 -07:00
Mike Cao
eebf145efc Capture pushState events. 2020-07-18 22:51:17 -07:00
Mike Cao
58a1c63407 Added CORS middleware. Updated umami script. 2020-07-18 10:36:46 -07:00
Mike Cao
631d124a61 Add cors headers. Updated fetch. 2020-07-18 03:33:33 -07:00
Mike Cao
822d46a2e0 Added country lookup for ip. 2020-07-18 00:25:29 -07:00