Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging with latest dev #7902

Merged
merged 3 commits into from
Nov 12, 2024
Merged

Merging with latest dev #7902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
468e711
Hide Tomcat 8.5.100, 9.0.93, 9.0.90, 9.0.88, 10.1.23, 10.1.25 and 10.…
dfuenzalida Nov 8, 2024
fa8cc9d
filter stack options (#7895)
liuqidake Nov 12, 2024
33572b1
Juno: check in to users/csigs/hb_452267ed-f3ea-4b18-a9d2-7c2ed17cef14…
csigs Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client-react/src/pages/app/app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const LinuxStacks: React.FC<PropsType> = props => {

const { webAppStacks, stackVersionDetails } = useStacks(initialValues.config.properties.linuxFxVersion);
const siteStateContext = useContext(SiteStateContext);
const runtimeOptions = getRuntimeStacks(webAppStacks);
const { t } = useTranslation();
const scenarioService = new ScenarioService(t);

Expand All @@ -54,6 +53,7 @@ const LinuxStacks: React.FC<PropsType> = props => {
() => filterDeprecatedWebAppStack(webAppStacks, stackVersionDetails.runtimeStackName, stackVersionDetails.minorVersionRuntime),
[webAppStacks, stackVersionDetails.runtimeStackName, stackVersionDetails.minorVersionRuntime]
);
const runtimeOptions = useMemo(() => getRuntimeStacks(filterredWebAppStacks), [filterredWebAppStacks]);

const isRuntimeStackDirty = (): boolean =>
getRuntimeStack(values.config.properties.linuxFxVersion) !== getRuntimeStack(initialValues.config.properties.linuxFxVersion);
Expand Down Expand Up @@ -152,6 +152,8 @@ const LinuxStacks: React.FC<PropsType> = props => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [values.config.properties.linuxFxVersion]);

console.log(runtimeStack);

return (
<>
{(scenarioService.checkScenario(ScenarioIds.linuxAppRuntime, { site }).status !== 'disabled' || siteStateContext.isWordPressApp) && (
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/cs-CZ/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15699,6 +15699,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Protokoly TLS 1.0 a 1.1 jsou považovány za starší verze protokolu TLS a nejsou již považovány za bezpečné. Platforma bude sice tyto protokoly i nadále podporovat, ale doporučujeme naplánovat si přechod na TLS 1.2 nebo TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/de-DE/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15675,6 +15675,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 und 1.1 gelten als Legacyprotokolle und gelten nicht mehr als sicher. Obwohl die Plattform diese Protokolle weiterhin unterstützt, empfiehlt es sich, den Wechsel zu TLS 1.2 oder TLS 1.3 zu planen.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/es-ES/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15672,6 +15672,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 y 1.1 se consideran protocolos heredados y ya no se consideran seguros. Aunque la plataforma seguirá siendo compatible con estos protocolos, se recomienda planear el movimiento a TLS 1.2 o TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/fr-FR/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15660,6 +15660,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 et 1.1 sont considérés comme des protocoles hérités et ne sont plus considérés comme sécurisés. Bien que la plateforme prenne toujours en charge ces protocoles, il est recommandé de planifier le passage à TLS 1.2 ou TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/hu-HU/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15666,6 +15666,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[A TLS 1.0 és 1.1 örökölt protokollnak minősül, és már nem tekinthető biztonságosnak. Bár a platform továbbra is támogatja ezeket a protokollokat, ajánlott áttérni a TLS 1.2-re vagy a TLS 1.3-ra.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/id-ID/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15012,6 +15012,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 dan 1.1 dianggap protokol lama dan tidak lagi dianggap aman. Meskipun platform akan tetap mendukung protokol ini, sebaiknya rencanakan untuk memindahkan ke TLS 1.2 atau TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/it-IT/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15675,6 +15675,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 e 1.1 sono considerati protocolli legacy e non sono più considerati sicuri. Anche se la piattaforma continuerà a supportare questi protocolli, è consigliabile pianificare il passaggio a TLS 1.2 o TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/ko-KR/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15663,6 +15663,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 및 1.1은 레거시 프로토콜로 간주되며 더 이상 안전한 것으로 간주되지 않습니다. 플랫폼은 이러한 프로토콜을 계속 지원하지만 TLS 1.2 또는 TLS 1.3으로 이동하는 것이 좋습니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/nl-NL/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15684,6 +15684,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 en 1.1 worden beschouwd als verouderde protocollen en worden niet langer als veilig beschouwd. Hoewel het platform deze protocollen nog steeds ondersteunt, wordt het aanbevolen om over te stappen op TLS 1.2 of TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/pl-PL/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15675,6 +15675,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Protokoły TLS 1.0 i 1.1 są uznawane za starsze protokoły i nie są już traktowane jako bezpieczne. Chociaż platforma będzie nadal obsługiwać te protokoły, rekomenduje się zaplanowanie przejścia na protokół TLS 1.2 lub TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/pt-BR/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15672,6 +15672,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[O TLS 1.0 e o TLS 1.1 são considerados protocolos herdados e não são mais considerados seguros. Embora a plataforma ainda seja compatível com esses protocolos, é recomendável planejar a mudança para o TLS 1.2 ou para o TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/pt-PT/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15657,6 +15657,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[O TLS 1.0 e 1.1 são considerados protocolos legados e já não são considerados seguros. Embora a plataforma continue a suportar estes protocolos, recomenda-se que planeie a mudança para o TLS 1.2 ou TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/ru-RU/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15666,6 +15666,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Протоколы TLS 1.0 и 1.1 считаются устаревшими и больше не считаются безопасными. Хотя платформа по-прежнему поддерживает эти протоколы, рекомендуется запланировать переход на TLS 1.2 или TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/sv-SE/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15678,6 +15678,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 och 1.1 betraktas som äldre protokoll och anses inte längre vara säkra. Även om plattformen fortfarande stöder de här protokollen rekommenderar vi att du flyttar till TLS 1.2 eller TLS 1.3.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/tr-TR/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15684,6 +15684,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 ve 1.1 eski protokoller olarak kabul ediliyor ve artık güvenli olarak görülmüyor. Platform bu protokolleri desteklemeye devam etse bile TLS 1.2 veya TLS 1.3 protokolüne geçmeyi planlamanız önerilir.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/zh-CN/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15666,6 +15666,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 和 1.1 被视为旧协议，不再被视为安全协议。尽管平台仍将支持这些协议，但建议计划迁移到 TLS 1.2 或 TLS 1.3。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
9 changes: 9 additions & 0 deletions server/Resources/zh-TW/LocProject/lcl/Server/Resources/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15672,6 +15672,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minTlsVersionWarningMessage" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. Though the platform will still support these protocols, it is recommended to plan to move to either TLS 1.2 or TLS 1.3.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[TLS 1.0 和 1.1 被視為傳統通訊協定，且不再被視為安全。雖然平台仍支援這些通訊協定，但建議您計畫移至 TLS 1.2 或 TLS 1.3。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";minimize" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Minimize]]></Val>
Expand Down
Loading
Loading