Merge branch 'dev' into refactor/show-product-updates-conditionnally

This commit is contained in:
Milo Schwartz
2025-12-06 09:38:39 -08:00
committed by GitHub
21 changed files with 24601 additions and 22234 deletions

View File

@@ -426,7 +426,7 @@ export default function LoginForm({
<div className="text-center">
<Link
href={`${env.app.dashboardUrl}/auth/reset-password${form.getValues().email ? `?email=${form.getValues().email}` : ""}`}
href={`${env.app.dashboardUrl}/auth/reset-password${form.getValues().email ? `?email=${encodeURIComponent(form.getValues().email)}` : ""}`}
className="text-sm text-muted-foreground"
>
{t("passwordForgot")}

View File

@@ -273,7 +273,7 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
if (originalRow.type === "wireguard") {
return (
<div className="flex items-center space-x-2">
<span>WireGuard</span>
<Badge variant="secondary">WireGuard</Badge>
</div>
);
}
@@ -281,7 +281,7 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
if (originalRow.type === "local") {
return (
<div className="flex items-center space-x-2">
<span>{t("local")}</span>
<Badge variant="secondary">Local</Badge>
</div>
);
}