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

Merge branch 'v8/dev' into v8/feature/5170-IPublishedContent

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
This commit is contained in:
Shannon
2019-06-21 15:06:43 +10:00
parent 62e6168e03 37d3692cd0
commit c2cb85f1cd
137 changed files with 2017 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/config/tinyMceConfig.config
View File

@@ -33,7 +33,8 @@
<command alias="superscript" name="Superscript" mode="Selection" />
<command alias="charmap" name="Character map" mode="Insert" />
<command alias="rtl" name="Right to left" mode="Selection" />
<command alias="ltr" name="Left to right" mode="Selection" />
<command alias="ltr" name="Left to right" mode="Selection" />
<command alias="fullscreen" name="Full Screen" mode="All" />
</commands>
<plugins>
<plugin>paste</plugin>
@@ -47,6 +48,7 @@
<plugin>directionality</plugin>
<plugin>tabfocus</plugin>
<plugin>searchreplace</plugin>
<plugin>fullscreen</plugin>
</plugins>
<validElements>
<![CDATA[+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|