calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-06 12:19:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into rdp-ssh

Browse Source
This commit is contained in:
Owen
2026-05-19 20:12:05 -07:00
parent 0f9100fd3a c47c411161
commit 23ca3efbf4
41 changed files with 3932 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/[orgId]/settings/resources/client/page.tsx
View File

@@ -127,7 +127,8 @@ export default async function ClientResourcesPage(
authDaemonPort: siteResource.authDaemonPort ?? null,
subdomain: siteResource.subdomain ?? null,
domainId: siteResource.domainId ?? null,
fullDomain: siteResource.fullDomain ?? null
fullDomain: siteResource.fullDomain ?? null,
labels: siteResource.labels ?? []
};
}
);

1
src/app/[orgId]/settings/resources/proxy/page.tsx
View File

@@ -111,6 +111,7 @@ export default async function ProxyResourcesPage(
protocol: resource.protocol,
proxyPort: resource.proxyPort,
http: resource.http,
labels: resource.labels,
authState: !resource.http
? "none"
: resource.sso ||