Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' into hosts-support
Mike Caod1559c3a9842
diff --cc src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsxindex 56197ea94,617015f1d..a96ab8be3--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx@@@ -19,9 -18,10 +19,11 @@@ import styles from './WebsiteExpandedViconst views = {url: PagesTable,+ entry: PagesTable,+ exit: PagesTable,title: PagesTable,referrer: ReferrersTable,+ host: HostsTable,browser: BrowsersTable,os: OSTable,device: DevicesTable,diff --cc src/components/messages.tsindex ec14e66f0,dd5eb9ddc..15fccda67--- a/src/components/messages.ts+++ b/src/components/messages.ts@@@ -88,8 -88,9 +88,10 @@@ export const labels = defineMessages(leaveTeam: { id: 'label.leave-team', defaultMessage: 'Leave team' },refresh: { id: 'label.refresh', defaultMessage: 'Refresh' },pages: { id: 'label.pages', defaultMessage: 'Pages' },+ entry: { id: 'label.entry', defaultMessage: 'Entry URL' },+ exit: { id: 'label.exit', defaultMessage: 'Exit URL' },referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },+ hosts: { id: 'label.hosts', defaultMessage: 'Hosts' },screens: { id: 'label.screens', defaultMessage: 'Screens' },browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },os: { id: 'label.os', defaultMessage: 'OS' },diff --cc src/lib/constants.tsindex ad273a099,f8447b8b7..f7200ce31--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@@ -30,9 -31,8 +31,9 @@@ export const FILTER_DAY = 'filter-day'export const FILTER_RANGE = 'filter-range';export const FILTER_REFERRERS = 'filter-referrers';export const FILTER_PAGES = 'filter-pages';+export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];- export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event', 'host'];-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];++export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'host'];export const SESSION_COLUMNS = ['browser',@@@ -48,8 -47,9 +49,10 @@@export const FILTER_COLUMNS = {url: 'url_path',+ entry: 'url_path',+ exit: 'url_path',referrer: 'referrer_domain',+ host: 'hostname',title: 'page_title',query: 'url_query',os: 'os',