Skip to content

Commit

Permalink
Item14288: Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Feb 8, 2018
2 parents e9f4ca5 + bc94398 commit c47c80c
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 36 deletions.
43 changes: 22 additions & 21 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1516935577" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1518053585" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! !TinyMCEPlugin
<!--
Expand Down Expand Up @@ -157,6 +157,7 @@ See the [[%ATTACHURLPATH%/tinymce/changelog.txt][TinyMCE Editor Change Log]] for
&copy; 2010-2018 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
| | This package also includes a complete release of the !TinyMCE editor which is covered by the [[https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html][GNU Lesser General Public License, Version 2.1] |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 2.07 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,6, |
| 2.06 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,5, |
| 2.05 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,4, |
| 2.04 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,3, |
Expand Down Expand Up @@ -279,23 +280,23 @@ Many thanks to the following sponsors for supporting this work:
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions.%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="Foswiki:Support.%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1516935577" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1516935577" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1516935577" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1516935577" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1516935577" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1516935577" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1516935577" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1516935577" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1516935577" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1516935577" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1516935577" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1516935577" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1516935577" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1516935577" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1516935577" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1516935577" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1516935577" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1516935577" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1516935577" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1516935577" size="147" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1518053585" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1518053585" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1518053585" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1518053585" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1518053585" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1518053585" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1518053585" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1518053585" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1518053585" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1518053585" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1518053585" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1518053585" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1518053585" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1518053585" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1518053585" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1518053585" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1518053585" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1518053585" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1518053585" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1518053585" size="147" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
View file
Expand Up @@ -7,8 +7,8 @@ use warnings;

use Assert;

our $VERSION = '2.06';
our $RELEASE = '25 Jan 2018';
our $VERSION = '2.07';
our $RELEASE = '07 Feb 2018';
our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
8 changes: 8 additions & 0 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/changelog.txt
View file
@@ -1,3 +1,11 @@
Version 4.7.6 (2018-01-29)
Fixed a bug in the jquery integration where it threw an error saying that "global is not defined".
Fixed a bug where deleting a table cell whose previous sibling was set to contenteditable false would create a corrupted table.
Fixed a bug where highlighting text in an unfocused editor did not work correctly in IE11/Edge.
Fixed a bug where the table resize handles were not being repositioned when activating the Fullscreen Plugin.
Fixed a bug where the Imagetools Plugin dialog didn't honor editor RTL settings.
Fixed a bug where block elements weren't being merged correctly if you deleted from after a contenteditable false element to the beginning of another block element.
Fixed a bug where TinyMCE didn't work with module loaders like webpack.
Version 4.7.5 (2018-01-22)
Fixed bug with the Codesample Plugin where it wasn't possible to edit codesamples when the editor was in inline mode.
Fixed bug where focusing on the status bar broke the keyboard navigation functionality.
Expand Down
2 changes: 1 addition & 1 deletion TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/js/tinymce/jquery.tinymce.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c47c80c

Please sign in to comment.