yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
This commit is contained in:
Bjarke Berg
2023-08-28 11:46:22 +02:00
parent b17a7689ab d43e6abc8b
commit 6fbf04592c
126 changed files with 2396 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Umbraco.Core/Configuration/Models/DeliveryApiSettings.cs
View File

@@ -48,4 +48,40 @@ public class DeliveryApiSettings
/// <value><c>true</c> if the Delivery API should output rich text values as JSON; <c>false</c> they should be output as HTML (default).</value>
[DefaultValue(StaticRichTextOutputAsJson)]
public bool RichTextOutputAsJson { get; set; } = StaticRichTextOutputAsJson;
/// <summary>
/// Gets or sets the settings for the Media APIs of the Delivery API.
/// </summary>
public MediaSettings Media { get; set; } = new ();
/// <summary>
/// Typed configuration options for the Media APIs of the Delivery API.
/// </summary>
/// <remarks>
/// The Delivery API settings (as configured in <see cref="DeliveryApiSettings"/>) supersede these settings in levels of restriction.
/// I.e. the Media APIs cannot be enabled, if the Delivery API is disabled.
/// </remarks>
public class MediaSettings
{
/// <summary>
/// Gets or sets a value indicating whether the Media APIs of the Delivery API should be enabled.
/// </summary>
/// <value><c>true</c> if the Media APIs should be enabled; otherwise, <c>false</c>.</value>
/// <remarks>
/// Setting this to <c>true</c> will have no effect if the Delivery API itself is disabled through <see cref="DeliveryApiSettings"/>
/// </remarks>
[DefaultValue(StaticEnabled)]
public bool Enabled { get; set; } = StaticEnabled;
/// <summary>
/// Gets or sets a value indicating whether the Media APIs of the Delivery API (if enabled) should be
/// publicly available or should require an API key for access.
/// </summary>
/// <value><c>true</c> if the Media APIs should be publicly available; <c>false</c> if an API key should be required for access.</value>
/// <remarks>
/// Setting this to <c>true</c> will have no effect if the Delivery API itself has public access disabled through <see cref="DeliveryApiSettings"/>
/// </remarks>
[DefaultValue(StaticPublicAccess)]
public bool PublicAccess { get; set; } = StaticPublicAccess;
}
}