Upgrade to rc3

umbraco-community · May 7, 2024 · 306d5f1 · 306d5f1
1 parent e15d3da
commit 306d5f1
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 118 deletions.
diff --git a/...munity.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj b/...munity.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj
@@ -5,9 +5,9 @@
     <Nullable>enable</Nullable>
     <RootNamespace>Umbraco.Community.Sustainability.TestSite._14.x</RootNamespace>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms" Version="14.0.0-rc2" />
+    <PackageReference Include="Umbraco.Cms" Version="14.0.0-rc3" />
     <PackageReference Include="uSync" Version="14.0.0-rc2" />
   </ItemGroup>
 

diff --git a/src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.Umbraco.Cms.json b/src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.Umbraco.Cms.json
@@ -81,9 +81,6 @@
         "Unattended": {
           "$ref": "#/definitions/UnattendedSettings"
         },
-        "RichTextEditor": {
-          "$ref": "#/definitions/RichTextEditorSettings"
-        },
         "BasicAuth": {
           "$ref": "#/definitions/BasicAuthSettings"
         },
@@ -708,11 +705,6 @@
             }
           ]
         },
-        "SanitizeTinyMce": {
-          "type": "boolean",
-          "description": "Gets or sets a value indicating whether TinyMCE scripting sanitization should be applied.\n            ",
-          "default": false
-        },
         "DistributedLockingReadLockDefaultTimeout": {
           "type": "string",
           "description": "Gets or sets a value representing the maximum time to wait whilst attempting to obtain a distributed read lock.\n            ",
@@ -1416,11 +1408,17 @@
         },
         "AuthorizeCallbackPathName": {
           "type": "string",
-          "description": "The path to use for authorization callback. Will be appended to the BackOfficeHost.\n            ",
-          "default": "/umbraco"
+          "description": "Gets or sets the path to use for authorization callback. Will be appended to the BackOfficeHost.\n            ",
+          "default": "/umbraco/oauth_complete"
+        },
+        "AuthorizeCallbackLogoutPathName": {
+          "type": "string",
+          "description": "Gets or sets the path to use for authorization callback logout. Will be appended to the BackOfficeHost.\n            ",
+          "default": "/umbraco/logout"
         },
         "AuthorizeCallbackErrorPathName": {
           "type": "string",
+          "description": "Gets or sets the path to use for authorization callback error. Will be appended to the BackOfficeHost.\n            ",
           "default": "/umbraco/error"
         }
       }
@@ -1581,83 +1579,6 @@
         }
       }
     },
-    "RichTextEditorSettings": {
-      "type": "object",
-      "properties": {
-        "Commands": {
-          "type": "array",
-          "description": "HTML RichText Editor TinyMCE Commands.\n            ",
-          "items": {
-            "$ref": "#/definitions/RichTextEditorCommand"
-          }
-        },
-        "Plugins": {
-          "type": "array",
-          "description": "HTML RichText Editor TinyMCE Plugins.\n            ",
-          "items": {
-            "type": "string"
-          }
-        },
-        "CustomConfig": {
-          "type": "object",
-          "description": "HTML RichText Editor TinyMCE Custom Config.\n            ",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "ValidElements": {
-          "type": "string",
-          "default": "+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-s[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,cite,video[*],audio[*],picture[*],source[*],canvas[*]"
-        },
-        "InvalidElements": {
-          "type": "string",
-          "description": "Invalid HTML elements for RichText Editor.\n            ",
-          "default": "font"
-        },
-        "CloudApiKey": {
-          "type": [
-            "null",
-            "string"
-          ],
-          "description": "Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.\n            "
-        }
-      }
-    },
-    "RichTextEditorCommand": {
-      "type": "object",
-      "required": [
-        "Alias",
-        "Name",
-        "Mode"
-      ],
-      "properties": {
-        "Alias": {
-          "type": "string",
-          "minLength": 1
-        },
-        "Name": {
-          "type": "string",
-          "minLength": 1
-        },
-        "Mode": {
-          "$ref": "#/definitions/RichTextEditorCommandMode"
-        }
-      }
-    },
-    "RichTextEditorCommandMode": {
-      "type": "string",
-      "description": "",
-      "x-enumNames": [
-        "Insert",
-        "Selection",
-        "All"
-      ],
-      "enum": [
-        "Insert",
-        "Selection",
-        "All"
-      ]
-    },
     "BasicAuthSettings": {
       "type": "object",
       "description": "Typed configuration options for basic authentication settings.",