m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,611 Commits 2 Branches 0 Tags 16 MiB
dcb9f69c43
Commit Graph

390 Commits

Author SHA1 Message Date
Mike Cao
d05fd2bd3d Refactor redis calls. 2022-10-25 20:17:13 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -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
Mike Cao
59fdaf580f Fixed share page. 2022-10-24 16:28:20 -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
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
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
c147742d7a use uuid 2022-10-11 19:37:38 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -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
Mike Cao
2428314f58 Updated save method for websites. 2022-10-07 17:13:03 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07: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
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
bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -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
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
68d35c0fc4 Moved DISABLE_LOGIN check to getServerSideProps. 2022-08-01 18:42:07 -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
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
8aec6d7406 move queries 2022-07-12 14:14:36 -07:00
mike
846afad0a4 Moved middleware. 2022-07-07 09:24:32 -07:00
rohandebsarkar
ce6fd12f9f
Change API_COLLECT_ENDPOINT to COLLECT_API_ENDPOINT 2022-07-04 15:52:59 +05:30
rohandebsarkar
ae48ff0e68
Adds support for customCollectEndpoint 2022-07-03 11:33:49 +05:30
Mike Cao
8175f13f96 Added IGNORE_HOSTNAME environment variable. Closes #1151. 2022-06-27 01:46:21 -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
ccec996b34 Update disable login message. 2022-06-10 11:23:00 -07:00
Mike Cao
9dae76fbf3 Updated version check. 2022-06-03 07:06:44 -07:00
Mike Cao
e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -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
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
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
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
1b599a9d9c Preload image. 2022-04-08 15:37:36 -07:00
Holger Huo
0377773e21 fix: forgot to include referrer filter in sessionMetrics 2022-04-07 22:27:15 +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
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
Randy
2bd3ddf6ec support multiple track script name 2022-03-19 14:18:32 +08:00
Mike Cao
3717b0e888 Fix issue with force SSL redirects. 2022-03-15 08:49:42 -07: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
20622116a8 New Dashboard component. 2022-03-03 19:45:49 -08:00
Mike Cao
34ad1d9c39 New mobile menu. 2022-02-28 18:39:37 -08:00
Mike Cao
9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -08:00
Mike Cao
7270d95240 Move environment variables to middleware. Closes #972. 2022-02-20 23:27:50 -08:00
Mike Cao
8e350a2056 Added option to disable login. Closes #948 2022-02-16 15:01:33 -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
d780573572 Fix theme-color values. 2021-11-20 15:31:03 -08: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
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
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
f91cc82c82 Dynamically fetch language bundles at runtime. 2021-06-29 18:41:34 -07:00
Mike Cao
b2d04c00ac Change to synchronous password hashing. 2021-05-23 17:29:27 -07:00
Roger Clotet
ea59804573
feat: use fonts from @fontsource instead of Google CDN 2021-05-20 22:21:30 +02:00
Mike Cao
92705815ed Support CIDR notation in IGNORE_IP, closes #544. 2021-04-25 23:57:49 -07:00
Mike Cao
86ed5d56fa Updated header links. 2021-03-26 21:50:53 -07: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
Meir Roth
c5c62b68c9
Added basePath 2021-03-05 00:23:47 +00:00
Meir Roth
81f6ecb128 fix favicon paths 2021-03-01 22:32:46 +02: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
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
Alexander Klein
67551fb129 feature(api): add event types endpoint 2021-02-15 16:28:46 +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
Mike Cao
23d4d13c9d Fix basePath references. 2021-01-14 00:34:51 -08:00
Mike Cao
d4bfc84ff3 Fix event value display. 2020-12-04 20:45:12 -08:00
Mike Cao
7e29aee798 Updated packages. Expose event methods in tracker. 2020-12-02 19:27:57 -08:00
Mike Cao
1b172d214b Fix password change issue for non-admin accounts. 2020-11-28 13:28:52 -08:00
Mike Cao
0de874f7a0 Reset user in redux on logout. 2020-11-09 21:20:04 -08:00
Mike Cao
b4ed29be3c Merge remote-tracking branch 'origin/dev' into dev 2020-11-09 21:02:11 -08:00
Mike Cao
339cd21596 Fix issues with basePath. 2020-11-09 21:01:53 -08:00
Andrew MacLean
6db2b1fdb5 Optimize Multi-Device Favicon 2020-11-09 12:37:14 -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
69b317386a Updated fetch hook API. 2020-10-09 12:39:03 -07:00
Mike Cao
5dd3110fbf Updated log merge logic to prevent duplicates. 2020-10-09 10:48:47 -07:00
Vito Botta
89843f62ee Fix CORS error when IGNORE_IP is set 2020-10-09 20:48:09 +03: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
4cafa68e23 Add force SSL check. 2020-10-03 21:54:21 -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
6bb34cd3a5 Moved files around. Updated test page. 2020-09-27 00:51:29 -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
023adafa39 Refactor tracker. 2020-09-18 13:40:46 -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
7f598fa84d Updated profile settings. Refactored locale saving. 2020-09-17 00:17:11 -07:00
Mike Cao
53c23a280b Added router navigation for settings and details. 2020-09-16 21:55:32 -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
52acb691ad Added useLocale hook. 2020-09-08 20:46:31 -07:00
Mike Cao
ff854150ae Date formatting using locale. 2020-09-07 19:48:40 -07:00
Mike Cao
987fdfd57d Added support for zh-CN locale. 2020-09-07 15:25:09 -07:00
Mike Cao
e8538f6e23 Support i18n. 2020-09-07 01:22:16 -07:00
Mike Cao
f0ac9b6522 Convert text for internationalization. 2020-09-05 17:27:01 -07:00
Mike Cao
cb48acde55 Error handling for queries. 2020-08-31 21:11:53 -07:00
Mike Cao
d0ca0819c6 Added useFetch hook. Updated database check. 2020-08-30 15:29:31 -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
PabloSz
0787818bc8 share page loading 
since there isn't a spinner, just returning null, just like pages/dashboard.js
 2020-08-22 17:32:27 -04: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
c5d7d5dea2 Fix not found appearing on share pages. 2020-08-19 14:42:54 -07:00
Mike Cao
b96cb0d975 Show active visitor count. 2020-08-18 00:51:32 -07:00
Mike Cao
9f6e17b986 Responsive tables. 2020-08-17 22:47:58 -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