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

# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
This commit is contained in:
Bjarke Berg
2024-01-10 08:35:58 +01:00
29 changed files with 354 additions and 194 deletions

View File

@@ -146,6 +146,11 @@ public class RichTextEditorSettings
[DefaultValue(StaticInvalidElements)]
public string InvalidElements { get; set; } = StaticInvalidElements;
/// <summary>
/// Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.
/// </summary>
public string? CloudApiKey { get; set; }
public class RichTextEditorCommand
{
[Required]