From fd7b020117a15228a497db4ff973a8feef609a25 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 28 Apr 2026 22:40:50 -0400 Subject: [PATCH 1/2] Fixed a gitversion issue with release branches --- gitversion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitversion.yml b/gitversion.yml index 4b9e7fb6ba2..183afba12c8 100644 --- a/gitversion.yml +++ b/gitversion.yml @@ -29,6 +29,7 @@ branches: increment: Patch prevent-increment: of-merged-branch: true + when-current-commit-tagged: true track-merge-target: false tracks-release-branches: false is-release-branch: true From 5901787ea4384dfa18085a60a3dae6ecc92b0181 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 4 May 2026 22:10:40 -0400 Subject: [PATCH 2/2] Fixed an issue where language flags would not show in Site Settings #7116 had a fix for the language icons in Site Settings, it worked for a dev build but apparently failed at runtime. This PR should fix it but I will test the CI build before confirming... --- .../ClientSide/Dnn.React.Common/src/Flag/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx index 3895cf6569b..68a2d0ebee5 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx @@ -42,11 +42,11 @@ function Flag({ culture = "", onClick, title }) { useEffect(() => { try { - setFlagUrl(require(`./img/flags/${culture}.png`).default); + setFlagUrl(require(`./img/flags/${culture}.png`)); setIsFallback(false); } catch { try { - setFlagUrl(require("./img/flags/none.png").default); + setFlagUrl(require("./img/flags/none.png")); setIsFallback(true); } catch { setFlagUrl(undefined);