Skip to content

[staging] Update TinyMCE #24978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2019
Merged

[staging] Update TinyMCE #24978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72ca9b6
[staging] Update TinyMCE
brianteeman May 22, 2019
3f98219
Update plugins/editors/tinymce/tinymce.xml
brianteeman May 30, 2019
dabc0f6
Merge branch 'staging' into tinymce
brianteeman Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ PLG_TINY_FIELD_SKIN_ADMIN_DESC="Select skin for the Administrator Backend interf
PLG_TINY_FIELD_SKIN_ADMIN_LABEL="Administrator Skin"
PLG_TINY_FIELD_SKIN_DESC="Select skin for the Frontend interface."
PLG_TINY_FIELD_SKIN_INFO_DESC="Copy your new skins to: /media/editors/tinymce/skins."
PLG_TINY_FIELD_SKIN_INFO_LABEL="For customised skins go to: <a href="_QQ_"http://skin.tinymce.com"_QQ_" target="_QQ_"_blank"_QQ_">Skin Creator</a>"
PLG_TINY_FIELD_SKIN_INFO_LABEL="For customised skins go to: <a href="_QQ_"http://skin.tiny.cloud"_QQ_" target="_QQ_"_blank"_QQ_">Skin Creator</a>"
PLG_TINY_FIELD_SKIN_LABEL="Site Skin"
PLG_TINY_FIELD_SMILIES_DESC="Show or hide the Smilies buttons."
PLG_TINY_FIELD_SMILIES_LABEL="Smilies"
Expand Down
4 changes: 4 additions & 0 deletions media/editors/tinymce/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 4.5.11 (2019-05-16)
Fixed bug where the editor would scroll to the top of the editable area if a dialog was closed in inline mode. #TINY-1073
Version 4.5.10 (2018-10-19)
Changed the contextual toolbar shortcut to Ctrl+F9 since an Edge shortcut interfered with the previous one.
Version 4.5.9 (2018-08-02)
Fixed a bug where Edge 17 wouldn't be able to select images or tables.
Version 4.5.8 (2017-10-05)
Expand Down
2 changes: 1 addition & 1 deletion media/editors/tinymce/themes/modern/theme.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions media/editors/tinymce/tinymce.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions plugins/editors/tinymce/tinymce.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<extension version="3.2" type="plugin" group="editors" method="upgrade">
<name>plg_editors_tinymce</name>
<version>4.5.9</version>
<creationDate>2005-2018</creationDate>
<author>Ephox Corporation</author>
<version>4.5.11</version>
<creationDate>2005-2019</creationDate>
<author>Tiny Technologies, Inc</author>
<authorEmail>N/A</authorEmail>
<authorUrl>http://www.tinymce.com</authorUrl>
<copyright>Ephox Corporation</copyright>
<authorUrl>https://www.tiny.cloud</authorUrl>
<copyright>Tiny Technologies, Inc</copyright>
<license>LGPL</license>
<description>PLG_TINY_XML_DESCRIPTION</description>
<files>
Expand Down