3331 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
t	470437f949	fix typo in active visitor count	2020-08-22 00:34:56 -07:00
Mike Cao	e75593443a	Toggle formatting on click. Renamed charts folder to metrics.	2020-08-21 13:43:42 -07:00
Mike Cao	30c84dd54a	Merge pull request #35 from joshinat0r/master ... Respect DNT	2020-08-21 08:53:35 -07:00
joshinat0r	6445702610	rebuild tracking script	2020-08-21 11:53:07 +02:00
joshinat0r	aebf3c7022	proper cross browser dnt support	2020-08-21 11:51:42 +02:00
Mike Cao	d9f3c385fb	New build scripts.	2020-08-21 02:22:07 -07:00
Mike Cao	c0778afe90	Merge branch 'dev'	2020-08-21 02:05:57 -07:00
Mike Cao	cc841ca734	Added info statements to script.	2020-08-21 02:04:28 -07:00
Mike Cao	196652ffd5	Add back db specific scripts.	2020-08-21 02:00:55 -07:00
Mike Cao	48eba0242d	Removed unused file.	2020-08-21 01:46:55 -07:00
Mike Cao	551959562e	New build process.	2020-08-21 01:45:44 -07:00
joshinat0r	4a3ce9acba	respect DNT	2020-08-21 10:19:47 +02:00
Mike Cao	5ad0ff3fa4	Merge pull request #14 from dbirks/feature/add-docker ... Add Dockerfile and docker-compose.yml	2020-08-20 22:58:36 -07:00
Mike Cao	c17cd6f390	Merge branch 'master' into feature/add-docker	2020-08-20 22:58:04 -07:00
Mike Cao	c95d8e8a01	Implement rotating salt.	2020-08-20 19:38:20 -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	d95e149cf6	Fixed bug with rankings display.	2020-08-19 23:30:31 -07:00
Mike Cao	c3da37c0b0	Database build script.	2020-08-19 20:51:35 -07:00
Mike Cao	b905824d50	Fix error message on login.	2020-08-19 19:03:42 -07:00
Mike Cao	c5d7d5dea2	Fix not found appearing on share pages.	2020-08-19 14:42:54 -07:00
Mike Cao	b1493dfef8	Format long numbers. Updated README.	2020-08-19 14:35:38 -07:00
Mike Cao	c6b9682296	Update password hashes.	2020-08-19 03:16:02 -07:00
Mike Cao	72065d0a09	Revert prisma disconnect change.	2020-08-19 00:01:07 -07:00
Mike Cao	3604a845b4	Bump version.	2020-08-18 23:35:57 -07:00
Mike Cao	d4ca02f110	Use portal for modals. Prisma disconnect after query.	2020-08-18 23:35:26 -07:00
Mike Cao	774a7dfdbc	Fix tracking code display.	2020-08-18 22:37:12 -07:00
David Birks	d15d23539e	Add Dockerfile and docker-compose.yml	2020-08-19 00:25:05 -04:00
Mike Cao	2d69b3087f	Fix MySQL query.	2020-08-18 18:33:59 -07:00
Mike Cao	41eeb1a5f1	Fixed mysql schema import.	2020-08-18 15:22:07 -07:00
Mike Cao	0b4fd3ef8f	Update timeout for active user check.	2020-08-18 12:55:15 -07:00
Mike Cao	214049e077	Bump version.	2020-08-18 00:52:02 -07:00