From 99f841b7aecdfb1b9a7ef9b12dc42eb3f5cab468 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Thu, 22 Feb 2024 14:44:01 +0100 Subject: [PATCH 1/2] Bump rc version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 43d283b98f..44ba7dcf8f 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "13.2.0-rc", + "version": "13.2.0-rc2", "assemblyVersion": { "precision": "build" }, From f17f5522c00db37241e4f559a36094bba8a0e2a0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 26 Feb 2024 10:40:11 +0100 Subject: [PATCH 2/2] revert changes in Default.cshtml regarding external login providers, as there are still parts of the backoffice using the AngularJS variables --- .../umbraco/UmbracoBackOffice/Default.cshtml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml index 10d67be2da..b80ee34272 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml @@ -16,6 +16,7 @@ @inject IOptions globalSettings @inject IRuntimeMinifier runtimeMinifier @inject IProfilerHtml profilerHtml +@inject IBackOfficeExternalLoginProviders externalLogins @{ bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug); var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment); @@ -113,6 +114,8 @@