Commit Graph

1963 Commits

Author SHA1 Message Date
Mike Cao
319a5c9548 Merge branch 'dev' of https://github.com/mikecao/umami into dev 2020-08-27 23:53:11 -07:00
Mike Cao
ccb98f836f MySQL query optimization. Added loading component. 2020-08-27 23:45:37 -07:00
Mike Cao
a7e7469d22 Bar chart styling. 2020-08-27 19:11:37 -07:00
Mike Cao
d936ecc86e Refactor BarChart component. 2020-08-27 19:11:37 -07:00
Mike Cao
4618dc7f15 Events chart. 2020-08-27 19:11:36 -07:00
Mike Cao
5f47f328be BarChart component. 2020-08-27 19:11:36 -07:00
Mike Cao
5206622d5a Events table. 2020-08-27 19:11:36 -07:00
Mike Cao
2addb96e4b Fixed bounce rate calculation. 2020-08-27 19:11:35 -07:00
Mike Cao
13ec32b1c9 Don't filter subdomains. 2020-08-27 19:11:35 -07:00
Mike Cao
78888c3728
Merge pull request #70 from andrewvaca/patch-1
Generic AIP collect URL allowing subfolders
2020-08-27 01:53:19 -07:00
Ondřej Vacek
36119f4cb4
Update index.js
better solution from @mikecao, it's not dependent on script name
2020-08-27 10:01:05 +02:00
Mike Cao
2910eb5c2d
Merge pull request #71 from HipsterBrown/update-get-database
Update getDatabase to lookup DATABASE_TYPE env
2020-08-26 20:40:47 -07:00
HipsterBrown
ef8da2fbcc update getDatabase to lookup DATABASE_TYPE env 2020-08-26 20:50:47 -04:00
Ondřej Vacek
4fb9150631
Generic AIP collect URL allowing subfolders
I've changed the fetching of "hostUrl" variable to match not only domain, but the subfolder as well. The thing is I've installed the analytics to subfolder "/myfolder/" but when I used the code, the tracker tries to send the data to "mydomain.com/api/collect" instead of correct "mydomain.com/myfolder/api/collect". This change fixes the issue. It's not pretty to filter out the name of the script from the path by .replace, but I wasn't able to find better solution to get the subfolder. If you do, please change it :)
2020-08-26 16:12:20 +02:00
Mike Cao
5e9299be1e Events table. 2020-08-24 23:49:14 -07:00
Mike Cao
a19248d713 Fixed bounce rate calculation. 2020-08-24 10:52:47 -07:00
Mike Cao
1591dc246c Don't filter subdomains. 2020-08-24 10:40:01 -07:00
Mike Cao
3e1bc27f26
Merge pull request #63 from mikecao/dev
Bug fixes and package updates.
2020-08-23 19:55:41 -07:00
Mike Cao
d0ef846215 Updated packages. 2020-08-23 19:50:06 -07:00
Mike Cao
1aa9689b4f Fix crash on invalid data. 2020-08-23 19:50:06 -07:00
Mike Cao
ebad20ce0e Do not stack bar charts. 2020-08-23 19:50:06 -07:00
Mike Cao
d91fd2492c Filter out null entries. 2020-08-23 19:50:05 -07:00
Mike Cao
8739e3624f
Merge pull request #62 from mikecao/do-not-track
Refactor do not track code
2020-08-23 13:45:55 -07:00
Mike Cao
03b374a1d8 Add eslint ignore. 2020-08-23 13:35:55 -07:00
Mike Cao
0ba7676e97 Refactor do not track code. 2020-08-23 13:34:00 -07:00
Mike Cao
fd0c22c09d
Merge pull request #61 from premist/master
Check window.external before checking msTrackingProtectionEnabled
2020-08-23 12:04:58 -07:00
Minku Lee
679a2b0460 Check window.external before checking msTrackingProtectionEnabled 2020-08-23 19:06:16 +09:00
Hugo Müller-Downing
a9b1d73d83 Add GitHub workflow to push Docker image 2020-08-23 18:26:01 +10:00
Mike Cao
e7f83c084e Add links to referrer urls. 2020-08-23 00:23:47 -07:00
Mike Cao
7c0e0dd8c4 Add tracker build to main build. 2020-08-22 22:03:39 -07:00
Mike Cao
cf8ed13d1f New page and referrer url filters. 2020-08-22 22:01:14 -07:00
Mike Cao
1d977875be Fix tracker bug. 2020-08-22 19:59:39 -07:00
Mike Cao
fa20f7f67f Merge branch 'master' of https://github.com/mikecao/umami 2020-08-22 19:55:53 -07:00
Mike Cao
2f4e3bae5e
Merge pull request #52 from TuiSoftware/update-docker-ignore
for better local building performance
2020-08-22 19:51:47 -07:00
Mike Cao
bd4d2b1108
Merge pull request #46 from hugomd/feat/add-database-schema-variable
Add DATABASE_TYPE environment variable
2020-08-22 19:51:25 -07:00
tim-hub
8c66af79d8 for better local building performance
- ignore node_modules for building performance
- ignore some misc stuff, DS_Store, etc
2020-08-23 14:07:01 +12:00
Mike Cao
3a515b56b2 Updated pages and referrer filters to merge urls. 2020-08-22 19:05:07 -07:00
Hugo Müller-Downing
73ea516a7a Add DATABASE_TYPE environment variable
Determines which Prisma schema to use
2020-08-23 10:46:33 +10:00
Mike Cao
05dc77ca35
Merge pull request #51 from PabloSzx/loading_share_page
share page loading
2020-08-22 16:46:41 -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
8d27a0a846
Merge pull request #41 from snird/master
Collect urls in pushstate the same way as in initial load
2020-08-22 14:24:50 -07:00
Mike Cao
035bc8212b
Merge pull request #43 from cbluth/master
fix docker-compose
2020-08-22 11:19:48 -07:00
Snir David
3bdfc2fd45 merge 2020-08-22 21:10:35 +03:00
Mike Cao
133785278b
Merge pull request #40 from summertriangle-dev/patch-1
Fix typo in active visitor count
2020-08-22 10:16:00 -07:00
Mike Cao
d863e9ce49
Merge pull request #48 from joshinat0r/master
DNT & Safari
2020-08-22 10:09:27 -07:00
Joshua Hahn
6eab94dc4c aaand another DNT fix 2020-08-22 18:26:29 +02:00
Mike Cao
59f68b8395
Merge pull request #44 from joshinat0r/master
fix DNT check
2020-08-22 09:15:56 -07:00
Joshua Hahn
51f19e36f6 fix DNT check 2020-08-22 12:03:39 +02:00
Cobin Bluth
d1c7f2162b fix docker-compose 2020-08-22 12:00:35 +02:00
Snir David
9ac97a3293 Collect urls in pushstate the same way as in initial load 2020-08-22 12:22:29 +03:00