Skip to content

Commit 306d5f1

Browse files
author
Rick Butterfield
committed
Upgrade to rc3
1 parent e15d3da commit 306d5f1

File tree

6 files changed

+181
-118
lines changed

6 files changed

+181
-118
lines changed

src/Umbraco.Community.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Nullable>enable</Nullable>
66
<RootNamespace>Umbraco.Community.Sustainability.TestSite._14.x</RootNamespace>
77
</PropertyGroup>
8-
8+
99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc2" />
10+
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc3" />
1111
<PackageReference Include="uSync" Version="14.0.0-rc2" />
1212
</ItemGroup>
1313

src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.Umbraco.Cms.json

Lines changed: 8 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@
8181
"Unattended": {
8282
"$ref": "#/definitions/UnattendedSettings"
8383
},
84-
"RichTextEditor": {
85-
"$ref": "#/definitions/RichTextEditorSettings"
86-
},
8784
"BasicAuth": {
8885
"$ref": "#/definitions/BasicAuthSettings"
8986
},
@@ -708,11 +705,6 @@
708705
}
709706
]
710707
},
711-
"SanitizeTinyMce": {
712-
"type": "boolean",
713-
"description": "Gets or sets a value indicating whether TinyMCE scripting sanitization should be applied.\n ",
714-
"default": false
715-
},
716708
"DistributedLockingReadLockDefaultTimeout": {
717709
"type": "string",
718710
"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 @@
14161408
},
14171409
"AuthorizeCallbackPathName": {
14181410
"type": "string",
1419-
"description": "The path to use for authorization callback. Will be appended to the BackOfficeHost.\n ",
1420-
"default": "/umbraco"
1411+
"description": "Gets or sets the path to use for authorization callback. Will be appended to the BackOfficeHost.\n ",
1412+
"default": "/umbraco/oauth_complete"
1413+
},
1414+
"AuthorizeCallbackLogoutPathName": {
1415+
"type": "string",
1416+
"description": "Gets or sets the path to use for authorization callback logout. Will be appended to the BackOfficeHost.\n ",
1417+
"default": "/umbraco/logout"
14211418
},
14221419
"AuthorizeCallbackErrorPathName": {
14231420
"type": "string",
1421+
"description": "Gets or sets the path to use for authorization callback error. Will be appended to the BackOfficeHost.\n ",
14241422
"default": "/umbraco/error"
14251423
}
14261424
}
@@ -1581,83 +1579,6 @@
15811579
}
15821580
}
15831581
},
1584-
"RichTextEditorSettings": {
1585-
"type": "object",
1586-
"properties": {
1587-
"Commands": {
1588-
"type": "array",
1589-
"description": "HTML RichText Editor TinyMCE Commands.\n ",
1590-
"items": {
1591-
"$ref": "#/definitions/RichTextEditorCommand"
1592-
}
1593-
},
1594-
"Plugins": {
1595-
"type": "array",
1596-
"description": "HTML RichText Editor TinyMCE Plugins.\n ",
1597-
"items": {
1598-
"type": "string"
1599-
}
1600-
},
1601-
"CustomConfig": {
1602-
"type": "object",
1603-
"description": "HTML RichText Editor TinyMCE Custom Config.\n ",
1604-
"additionalProperties": {
1605-
"type": "string"
1606-
}
1607-
},
1608-
"ValidElements": {
1609-
"type": "string",
1610-
"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[*]"
1611-
},
1612-
"InvalidElements": {
1613-
"type": "string",
1614-
"description": "Invalid HTML elements for RichText Editor.\n ",
1615-
"default": "font"
1616-
},
1617-
"CloudApiKey": {
1618-
"type": [
1619-
"null",
1620-
"string"
1621-
],
1622-
"description": "Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.\n "
1623-
}
1624-
}
1625-
},
1626-
"RichTextEditorCommand": {
1627-
"type": "object",
1628-
"required": [
1629-
"Alias",
1630-
"Name",
1631-
"Mode"
1632-
],
1633-
"properties": {
1634-
"Alias": {
1635-
"type": "string",
1636-
"minLength": 1
1637-
},
1638-
"Name": {
1639-
"type": "string",
1640-
"minLength": 1
1641-
},
1642-
"Mode": {
1643-
"$ref": "#/definitions/RichTextEditorCommandMode"
1644-
}
1645-
}
1646-
},
1647-
"RichTextEditorCommandMode": {
1648-
"type": "string",
1649-
"description": "",
1650-
"x-enumNames": [
1651-
"Insert",
1652-
"Selection",
1653-
"All"
1654-
],
1655-
"enum": [
1656-
"Insert",
1657-
"Selection",
1658-
"All"
1659-
]
1660-
},
16611582
"BasicAuthSettings": {
16621583
"type": "object",
16631584
"description": "Typed configuration options for basic authentication settings.",

0 commit comments

Comments
 (0)