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 fix/links-table-truncate-urls
Mike Caoa47b32718d86
diff --cc src/app/(main)/links/LinksTable.tsxindex 3006f769c,1758272e9..5e125b4da--- a/src/app/(main)/links/LinksTable.tsx+++ b/src/app/(main)/links/LinksTable.tsx@@@ -22,13 -23,13 +23,21 @@@ export function LinksTable({ showActionreturn <Link href={renderUrl(`/links/${id}`)}>{name}</Link>;}}</DataColumn>++<<<<<<< fix/links-table-truncate-urls+ <DataColumn id="slug" label={t(labels.link)} width="25%">++=======+ <DataColumn id="slug" label={<SortableLabel label={t(labels.link)} sortKey="slug" />}>++>>>>>>> dev{({ slug }: any) => {const url = getSlugUrl(slug);return <ExternalLink href={url}>{url}</ExternalLink>;}}</DataColumn>++<<<<<<< fix/links-table-truncate-urls+ <DataColumn id="url" label={t(labels.destinationUrl)} width="30%">++=======+ <DataColumn id="url" label={<SortableLabel label={t(labels.destinationUrl)} sortKey="url" />}>++>>>>>>> dev{({ url }: any) => {return <ExternalLink href={url}>{url}</ExternalLink>;}}