2493 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Francis Cao	2cd1f5541b	add event type to getWebsiteStats	2023-04-19 09:13:16 -07:00
Mike Cao	083a9ffc2c	Merge remote-tracking branch 'origin/dev' into dev	2023-04-19 08:49:47 -07:00
Mike Cao	ac8d8bbd1e	Added middleware for docker.	2023-04-19 08:49:16 -07:00
Francis Cao	0889542f3b	fix minimum password length message	2023-04-18 16:00:33 -07:00
Francis Cao	16ece9ad64	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2023-04-18 12:45:08 -07:00
Francis Cao	e8ca23c390	update mysql min versino to 5.7	2023-04-18 11:27:55 -07:00
Mike Cao	3eabe9b958	Merge branch 'dev'	2023-04-18 10:56:05 -07:00
Mike Cao	78030eb4a0	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2023-04-18 10:55:55 -07:00
Mike Cao	db31810e68	Updated messages.	2023-04-18 10:04:49 -07:00
Mike Cao	81bc5d730e	Merge pull request #1897 from atmonshi/update-lang ... update missing translation for arabic lang	2023-04-18 09:53:26 -07:00
Mike Cao	64d2cf3805	Merge pull request #1904 from screendriver/noindex ... Prevent indexing content by search engines	2023-04-18 09:51:46 -07:00
Mike Cao	3d64985f1a	Merge pull request #1910 from jonaskuske/patch-1 ... fix: use new script name in update-tracker.js	2023-04-18 09:51:15 -07:00
Mike Cao	03f7f910f2	Merge pull request #1911 from Maxime-J/localization ... ensure some translations	2023-04-18 09:50:37 -07:00
Mike Cao	ab0066517d	Merge pull request #1912 from Maxime-J/fr ... update fr-FR	2023-04-18 09:49:28 -07:00
Francis Cao	939f4752bb	Fix mysql prisma schema teamuser	2023-04-18 09:43:58 -07:00
Mike Cao	56ad1c1602	Merge pull request #1908 from dngferreira/master ... fix version sql on check_db.js	2023-04-18 09:37:29 -07:00
Maxime-J	c548ac9ca3	update fr-FR	2023-04-18 14:51:04 +00:00
Maxime-J	b3c1eb1437	ensure some translations	2023-04-18 14:35:45 +00:00
Jonas	e19d612db2	fix: use new script name in update-tracker.js	2023-04-18 16:29:30 +02:00
Duarte Ferreira	94df42a306	fix version sql on check_db.js	2023-04-18 15:17:34 +01:00
Christian Rackerseder	904f9408d8	Prevent indexing content by search engines	2023-04-18 14:05:43 +02:00
Ash Monsh	10a4921942	update missing translation for arabic lang	2023-04-18 10:27:17 +03:00
Mike Cao	bac8edd113	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2023-04-17 11:13:08 -07:00
Mike Cao	dfae0c150d	Merge branch 'dev' ... # Conflicts: # components/common/Calendar.js # components/common/EventDataButton.js # components/forms/EventDataForm.js # components/layout/Header.js # db/mysql/migrations/02_add_event_data/migration.sql # lang/be-BY.json # lang/de-CH.json # lang/es-MX.json # lang/fa-IR.json # lang/km-KH.json # lang/lt-LT.json # lang/th-TH.json # lib/auth.js # lib/detect.ts # lib/lang.js # lib/middleware.js # lib/prisma.js # package.json # pages/_app.js # pages/api/accounts/[id]/password.js # pages/api/collect.js # pages/api/realtime/init.js # pages/api/websites/[id]/index.js # pages/api/websites/[id]/reset.ts # pages/api/websites/index.js # public/intl/messages/fa-IR.json # public/intl/messages/lt-LT.json # public/intl/messages/pt-BR.json # public/intl/messages/th-TH.json # queries/analytics/event/getEventData.js # queries/analytics/event/getEventMetrics.js # queries/analytics/pageview/getPageviewMetrics.js # queries/analytics/pageview/getPageviewParams.js # queries/analytics/pageview/getPageviewStats.js # queries/analytics/session/getSessionMetrics.js # queries/analytics/stats/getActiveVisitors.js # queries/analytics/stats/getWebsiteStats.js # sql/schema.mysql.sql # styles/index.css # yarn.lock	2023-04-17 11:08:17 -07:00
Mike Cao	0e4c071b16	Bump version v2.0.0.	2023-04-17 10:36:24 -07:00
Mike Cao	d406564af3	Manually merge PR #1879.	2023-04-17 10:31:50 -07:00
Mike Cao	60984e031c	Merge remote-tracking branch 'origin/dev' into dev	2023-04-17 10:26:37 -07:00
Mike Cao	d2edb0d0d7	Manually merge PR #1799.	2023-04-17 10:26:08 -07:00
Mike Cao	2bd970ba2b	Merge pull request #1883 from screendriver/noindex ... Prevent indexing content by search engines	2023-04-17 10:23:08 -07:00
Mike Cao	23b98314d6	Merge pull request #1831 from vidschofelix/master ... Upgrade Postgres to 15	2023-04-17 10:10:27 -07:00
Francis Cao	01559c4c63	update docker-compose to 15-alpine	2023-04-17 10:10:05 -07:00
Francis Cao	43499eb4fd	fix region / city filters	2023-04-17 00:10:51 -07:00
Francis Cao	672608b2f5	re-add pgcrypto extension	2023-04-16 21:13:51 -07:00
Francis Cao	b1074c893a	01_init schema changes	2023-04-16 21:07:36 -07:00
Mike Cao	561770a469	Add selected state.	2023-04-16 20:46:38 -07:00
Mike Cao	7e79711900	Merge remote-tracking branch 'origin/dev' into dev	2023-04-16 16:35:28 -07:00
Mike Cao	061d8cd174	Fixed incorrect messages.	2023-04-16 16:34:49 -07:00
Francis Cao	b7d64a91bd	fix check-db workflow	2023-04-14 10:24:48 -07:00
Mike Cao	54b018f7ba	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2023-04-13 23:37:50 -07:00
Mike Cao	43a4357729	Updated subdivision save.	2023-04-13 23:32:28 -07:00
Mike Cao	fa52e6c83f	Merge remote-tracking branch 'origin/dev' into dev	2023-04-13 23:06:04 -07:00
Mike Cao	b183fc1600	Fixed map issue.	2023-04-13 23:05:54 -07:00
Francis Cao	06649c2e31	at null check for subdivision save	2023-04-13 22:59:04 -07:00
Brian Cao	7e096336ce	Merge remote-tracking branch 'origin/dev' into dev	2023-04-13 22:52:44 -07:00
Brian Cao	3461342601	Clean up api.	2023-04-13 22:52:41 -07:00
Mike Cao	2890cb4419	Merge remote-tracking branch 'origin/dev' into dev	2023-04-13 22:44:49 -07:00
Mike Cao	35fbb7321e	Added districts for Bangladesh.	2023-04-13 22:44:43 -07:00
Francis Cao	42df7695e8	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2023-04-13 22:40:54 -07:00
Francis Cao	9dd9ab1325	concatenate subdivision saves	2023-04-13 22:40:48 -07:00
Mike Cao	e286994397	Merge branch 'dev' of https://github.com/umami-software/umami into dev ... # Conflicts: # public/iso-3166-2.json	2023-04-13 22:30:22 -07:00