From 64607ddbaa3d5f07cec26d484625f45f7c406095 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 19 Feb 2025 12:17:04 +0100 Subject: [PATCH 1/4] Disable webhook firing if disable in configuration. (#18383) --- .../BackgroundJobs/Jobs/WebhookFiring.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs index e6d25aff0e..07d8a09d9a 100644 --- a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs +++ b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs @@ -51,6 +51,12 @@ public class WebhookFiring : IRecurringBackgroundJob public async Task RunJobAsync() { + if (_webhookSettings.Enabled is false) + { + _logger.LogInformation("WebhookFiring task will not run as it has been globally disabled via configuration"); + return; + } + IEnumerable requests; using (ICoreScope scope = _coreScopeProvider.CreateCoreScope()) { From de2114b8c5baecbb63294a31ba936d9ab478ba24 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Sat, 22 Feb 2025 09:39:58 +0100 Subject: [PATCH 2/4] Adds warning to publish descendants dialog when force re-publish is selected. (#18409) --- src/Umbraco.Core/EmbeddedResources/Lang/da.xml | 3 +++ src/Umbraco.Core/EmbeddedResources/Lang/en.xml | 2 ++ src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml | 2 ++ .../src/views/content/overlays/publishdescendants.html | 9 ++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index 73ef388cb1..ceaf24aea8 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -298,6 +298,9 @@ Fjern denne tekstboks Indholdsrod Inkluder ikke-udgivet indhold. + Udgiv uændrede elementer. + ADVARSEL: Udgivelse af alle sider under denne i indholdstræet, uanset om de er ændret eller ej, kan være en ressourcekrævende og langvarig proces. + Dette bør ikke være nødvendigt under normale omstændigheder, så fortsæt kun med denne handling, hvis du er sikker på, at det er nødvendigt. Denne værdi er skjult. Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din administrator. diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index cf79f426b7..a0494a0204 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -310,6 +310,8 @@ Content root Include unpublished content items. Publish unchanged items. + WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation. + This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required. This value is hidden. If you need access to view this value please contact your website administrator. diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index bd387b4a07..74d87e8979 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -309,6 +309,8 @@ Content root Include unpublished content items. Publish unchanged items. + WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation. + This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required. This value is hidden. If you need access to view this value please contact your website administrator. diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html index a4d337ac71..106f363c71 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html @@ -28,7 +28,10 @@ show-labels="true"> - +
+

+

+
@@ -59,6 +62,10 @@ show-labels="true">
+
+

+

+
From eaea7a67ba231a29802b3ab91660e62d0b2ece02 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 26 Feb 2025 08:14:26 +0100 Subject: [PATCH 3/4] Bump version to 13.7.0. --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index ee882f912b..c976fce100 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.7.0-rc", + "version": "13.7.0", "assemblyVersion": { "precision": "build" }, From 5ed09ebefa068a539557c1ebd2c66d6fc95ee1ab Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Wed, 26 Feb 2025 20:13:27 +0100 Subject: [PATCH 4/4] Backport ShowUnroutableContentWarnings to V13 (#18479) --- src/Umbraco.Core/Configuration/Models/ContentSettings.cs | 7 +++++++ .../Controllers/ContentController.cs | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs index f08ab2abe5..c542bcb030 100644 --- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs @@ -160,6 +160,7 @@ public class ContentSettings internal const bool StaticDisableUnpublishWhenReferenced = false; internal const bool StaticAllowEditInvariantFromNonDefault = false; internal const bool StaticShowDomainWarnings = true; + internal const bool StaticShowUnroutableContentWarnings = true; /// /// Gets or sets a value for the content notification settings. @@ -285,4 +286,10 @@ public class ContentSettings /// [DefaultValue(StaticShowDomainWarnings)] public bool ShowDomainWarnings { get; set; } = StaticShowDomainWarnings; + + /// + /// Gets or sets a value indicating whether to show unroutable content warnings. + /// + [DefaultValue(StaticShowUnroutableContentWarnings)] + public bool ShowUnroutableContentWarnings { get; set; } = StaticShowUnroutableContentWarnings; } diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index ef935b6b59..a1c5e55ac8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -1278,6 +1278,11 @@ public class ContentController : ContentControllerBase SimpleNotificationModel globalNotifications, string[]? successfulCultures) { + if (_contentSettings.ShowUnroutableContentWarnings is false) + { + return; + } + IContent? content = publishStatus.FirstOrDefault()?.Content; if (content is null) {