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/delete-cascade
Francis Caob7084bb90aed
diff --cc src/queries/prisma/team.tsindex 38215335b,7315921e1..93376851a--- a/src/queries/prisma/team.ts+++ b/src/queries/prisma/team.ts@@@ -2,7 -2,7 +2,8 @@@ import { Prisma, type Team } from '@/geimport { ROLES } from '@/lib/constants';import { uuid } from '@/lib/crypto';import prisma from '@/lib/prisma';+import redis from '@/lib/redis';+ import { sanitizeSortFilters } from '@/lib/sort';import type { PageResult, QueryFilters } from '@/lib/types';import TeamFindManyArgs = Prisma.TeamFindManyArgs;diff --cc src/queries/prisma/user.tsindex 21870036c,0d9b1c4cf..7e5d28f92--- a/src/queries/prisma/user.ts+++ b/src/queries/prisma/user.ts@@@ -2,7 -2,7 +2,8 @@@ import { Prisma } from '@/generated/priimport { ROLES } from '@/lib/constants';import { getRandomChars } from '@/lib/generate';import prisma from '@/lib/prisma';+import redis from '@/lib/redis';+ import { sanitizeSortFilters } from '@/lib/sort';import type { QueryFilters, Role } from '@/lib/types';import UserFindManyArgs = Prisma.UserFindManyArgs;