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
..
auth.ts	Remove webisite.teamId related code. Clean up queries.	2023-04-13 20:57:22 -07:00
cache.ts
clickhouse.ts
client.ts
constants.ts	Added regions and cities support.	2023-04-13 22:28:29 -07:00
crypto.js
date.js	Merge branch 'dev'	2023-04-17 11:08:17 -07:00
db.js
detect.ts
eventData.ts
filters.js
format.js
kafka.ts
lang.js	Manually merge PR #1879.	2023-04-17 10:31:50 -07:00
middleware.ts
prisma.ts	fix region / city filters	2023-04-17 00:10:51 -07:00
query.ts
session.ts
types.ts	fix region / city filters	2023-04-17 00:10:51 -07:00