Merge branch 'dev' into private-http-ha

2026-08-17 17:59:45 +02:00 · 2026-04-13 20:52:47 -07:00
parent 1b9a395432 03d95874e6
commit 646e440dec
46 changed files with 3017 additions and 2559 deletions
@@ -133,8 +133,7 @@ export default function ResourceAuthenticationPage() {
        ...orgQueries.identityProviders({
            orgId: org.org.orgId,
            useOrgOnlyIdp: env.app.identityProviderMode === "org"
-        }),
-        enabled: isPaidUser(tierMatrix.orgOidc)
+        })
    });

    const pageLoading =
@@ -95,7 +95,8 @@ export default async function ProxyResourcesPage(
                ip: target.ip,
                port: target.port,
                enabled: target.enabled,
-                healthStatus: target.healthStatus
+                healthStatus: target.healthStatus,
+                siteName: target.siteName
            }))
        };
    });