Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item14288: Merge 'origin/master'
  • Loading branch information
MichaelDaum committed Oct 9, 2017
2 parents 98b1a4d + 010fc15 commit b9b8e9a
Show file tree
Hide file tree
Showing 847 changed files with 126 additions and 205,150 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev"]
path = TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce_dev
url = https://github.com/tinymce/tinymce.git
43 changes: 22 additions & 21 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1506483381" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1507512231" 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-2017 [[%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.03 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,0, |
| 2.02 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.7. |
| 2.01 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.6. Note that support for IE 8-10 has been removed. |
| 2.00 | Foswikitask:Item14323: Upgrade to TinyMCE 4.5.3, much simplified UI, full unicode support. |
Expand Down Expand Up @@ -275,23 +276,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="1506483381" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1506483381" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1506483381" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1506483381" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1506483381" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1506483381" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1506483381" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1506483381" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1506483381" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1506483381" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1506483381" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1506483381" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1506483381" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1506483381" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1506483381" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1506483381" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1506483381" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1506483381" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1506483381" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1506483381" size="147" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1507512231" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1507512231" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1507512231" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1507512231" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1507512231" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1507512231" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1507512231" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1507512231" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1507512231" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1507512231" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1507512231" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1507512231" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1507512231" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1507512231" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1507512231" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1507512231" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1507512231" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1507512231" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1507512231" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1507512231" size="147" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
Expand Up @@ -7,8 +7,8 @@ use warnings;

use Assert;

our $VERSION = '2.02';
our $RELEASE = '2.02';
our $VERSION = '2.03';
our $RELEASE = '2.03';
our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
4 changes: 4 additions & 0 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST
Expand Up @@ -91,6 +91,8 @@ pub/System/TinyMCEPlugin/tinymce/js/tinymce/plugins/visualchars/plugin.min.js 06
pub/System/TinyMCEPlugin/tinymce/js/tinymce/plugins/wordcount/plugin.min.js 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/content.inline.min.css 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/content.min.css 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/content.mobile.min.css 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-mobile.woff 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.eot 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.svg 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf 0644
Expand All @@ -104,7 +106,9 @@ pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/img/loader.gif 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/img/object.gif 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/img/trans.gif 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/skin.min.css 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/skins/lightgray/skin.mobile.min.css 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/themes/inlite/theme.min.js 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/themes/mobile/theme.min.js 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/themes/modern/theme.min.js 0644
pub/System/TinyMCEPlugin/tinymce/js/tinymce/tinymce.min.js 0644
pub/System/TinyMCEPlugin/watermark_hidden.gif 0644
Expand Down
11 changes: 11 additions & 0 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/changelog.txt
@@ -1,3 +1,14 @@
Version 4.7.0 (2017-10-03)
Added new mobile ui that is specifically designed for mobile devices.
Updated the default skin to be more modern and white since white is preferred by most implementations.
Restructured the default menus to be more similar to common office suites like Google Docs.
Fixed so theme can be set to false on both inline and iframe editor modes.
Fixed bug where inline editor would add/remove the visualblocks css multiple times.
Fixed bug where selection wouldn't be properly restored when editor lost focus and commands where invoked.
Fixed bug where toc plugin would generate id:s for headers even though a toc wasn't inserted into the content.
Fixed bug where is wasn't possible to drag/drop contents within the editor if paste_data_images where set to true.
Fixed bug where getParam and close in WindowManager would get the first opened window instead of the last opened window.
Fixed bug where delete would delete between cells inside a table in Firefox.
Version 4.6.7 (2017-09-18)
Fixed bug where paste wasn't working in IOS.
Fixed bug where the Word Count Plugin didn't count some mathematical operators correctly.
Expand Down

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

0 comments on commit b9b8e9a

Please sign in to comment.