Skip to content

Commit

Permalink
Item14288: Merge branch 'master' into Item14288
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Apr 26, 2017
2 parents 78b890d + 15b1936 commit 0845ce2
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 66 deletions.
4 changes: 2 additions & 2 deletions NatEditPlugin/data/System/NatEditPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1488191908" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493186548" format="1.1" version="1"}%
---+!! Natural Edit Plugin
%FORMFIELD{"Description"}%

Expand Down Expand Up @@ -180,4 +180,4 @@ is sufficient.
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1488191908" size="64487" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493186548" size="64487" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2007-2016 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2007-2017 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/FormButton.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2007-2016 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2007-2017 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/FormList.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2007-2016 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2007-2017 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm
View file
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2006-2016 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2006-2017 Michael Daum, http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/RestAttachments.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2013-2016 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/RestSave.pm
View file
@@ -1,4 +1,4 @@
# Copyright (C) 2013-2016 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2013-2017 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
79 changes: 27 additions & 52 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1490209964" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493139302" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! !TinyMCEPlugin
<!--
Expand Down Expand Up @@ -127,17 +127,7 @@ Documentation for standard theme_advanced toolbar buttons (Eg. superscript/subsc
---+++ Default Plugins
These plugins are enabled by default in the standard distribution of Foswiki.

| *Plugin Name* | *Toolbar buttons* | *Description* | *Notes* |
| [[http://tinymce.moxiecode.com/js/tinymce/docs/api/index.html#class_tinymce.plugins.AutoSave.html][autosave]] | restoredraft | Saves the editor content to your web browser's local storage periodically so that it may be restored later | See =TINYMCEPLUGIN_AUTOSAVE_INTERVAL= and defaults to %INCLUDE{"%TOPIC%" section="AUTOSAVE_INTERVAL"}%; =TINYMCEPLUGIN_AUTOSAVE_RETENTION= defaults to %INCLUDE{"%TOPIC%" section="AUTOSAVE_RETENTION"}% |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu][contextmenu]] | | Provides context (right-click) menu capability | Allows the =table= plugin to offer copy & paste of rows & columns | |
| =foswiki= | - | Fixup !TinyMCE bugs, Foswiki integration issues | init param =foswiki_autosave_no_fixup= prevents fixup of autosave plugin if true; only works if =foswiki= is after =autosave= in the plugins list |
| =foswikibuttons= | tt, colour, attach, hide | Provides toolbar buttons, dialogues and formatting styles for Foswiki | List of formats populated from =foswikibuttons_formats= init param; ms of cursor idle time required before update of toolbar buttons/format state is set from =foswikibuttons_cursoridletime= param |
| =foswikiimage= | image | Provides image toolbar button, dialogue for Foswiki | |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen][fullscreen]] | fullscreen | Provides fullscreen capability | |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput][legacyoutput]] | | Maintains compatibility for =&lt;font&gt;=, =&lt;u&gt;=, =&lt;b&gt;=, =&lt;strike&gt;= etc. tags | |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste][paste]] | pastetext, pasteword, selectall | "Cleans" content pasted from clipboard; useful when pasting from MS Office | |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace][searchreplace]] | search, replace | Refer to !TinyMCE documentation | |
| [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table][table]] | tablecontrols, [[http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table#Table_controls.2Fbuttons][others]] | Refer to !TinyMCE documentation | |
contextmenu table searchreplace save autosave paste fullscreen lists link anchor charmap hr code legacyoutput image textcolor colorpicker wordcount

---+++ Additional Plugins
See the Tiny MCE documentation for a complete list of available plugins. To enable extra plugins, set the =TINYMCEPLUGIN_ADDITIONAL_MCEPLUGINS= variable in your [[%LOCALSITEPREFS%]].
Expand All @@ -156,32 +146,17 @@ The =TINYMCEPLUGIN_INIT= string needs to be built differently, due to the API ch

If a customised =TINYMCEPLUGIN_INIT= string is in use, it should be re-built based on the content of this documentation. The customisations should be reviewed to determine if they are still necessary.

---++ Known Issues of TinyMCEPlugin
* Foswikitask:Item8475 - Foswiki introduces errant spaces into table cells
* Foswikitask:Item8582 - X11 environments: TinyMCEPlugin editor copies current topic onto the "Primary Selection"
* Foswikitask:Item8712 - Outdenting list items in Firefox soemtimes does not work correctly
* Description: The list symbol (number, bullet, etc) sometimes disappears from the item after being outdented. When this happens, it is also not possible to outdent the item another level.
* Work-around: Position the cursor to the beginning of the line (where the symbol should appear) and press the enter key. The symbol should be restored and another outdent will be possible.
* Foswikitask:Item9198 - After inserting new table at top of document: unable to position cursor above
* Work-around: Use 'Save and continue' or switch to TML editing and back to WYSIWYG again to allow WysiwygPlugin to add an empty =&lt;p/&gt;= above the table
* Foswikitask:Item8085 - International characters (example, &Scaron;) are converted to HTML entities (IE. =&amp;Scaron;= or =&amp;#352;=)
* Ensure you are using the latest version of WysiwygPlugin.
* Work-around: Try changing the =TINYMCEPLUGIN_ENTITY_ENCODING= setting to =raw=. It's possible this may cause problems on older browsers.

---++ Known Issues of WysiwygPlugin (partial list)
For the full list, consult [[WysiwygPlugin#Known_issues][WysiwygPlugin documentation]]
%INCLUDE{"WysiwygPlugin" section="tinymceintegration"}%

Check regularly at Foswiki:Extensions.TinyMCEPlugin for updates.
---++ Known Issues of TinyMCEPlugin and WysiwygPlugin
See http://foswiki.org/Tasks/TinyMCEPlugin and http://foswiki.org/Tasks/WysiwygPlugin

---++ Plugin Info

Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!

| Copyright: | &copy; 2007-2010 Crawford Currie http://c-dot.co.uk %BR%\
| Copyright: | &copy; 2007-2017 Crawford Currie http://c-dot.co.uk %BR%\
&copy; 2010-2014 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
| | This package also includes the complete sources for version 3.5.7 of the !TinyMCE editor which is covered by [[http://tinymce.moxiecode.com/license.php][its own license]]. |
| | 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.00 | Foswikitask:Item14323: Upgrade to TinyMCE 4.5.3, much simplified UI, full unicode support |
| 1.30 | Foswikitask:Item12181: Upgrade to TinyMCE 3.5.11 |
| 21 Dec 2012 (TBD) | Foswikitask:Item12278: Changing a wikiword should not require visiting the TinyMCE link dialog. *Changes TINYMCEPLUGIN_INIT settings* |
| 29 Oct 2012 (TBD) | Foswikitask:Item12201: Add missing syntax highlighting classes, and make menus more user friendly. |
Expand Down Expand Up @@ -297,23 +272,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="1490209964" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1490209964" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1490209964" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1490209964" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1490209964" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1490209964" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1490209964" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1490209964" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1490209964" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1490209964" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1490209964" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1490209964" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1490209964" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1490209964" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1490209964" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1490209964" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" comment="screenshot" date="1490209964" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1490209964" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1490209964" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1490209964" size="147" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1493139302" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1493139302" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1493139302" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1493139302" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1493139302" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1493139302" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1493139302" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1493139302" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1493139302" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1493139302" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1493139302" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1493139302" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1493139302" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1493139302" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1493139302" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1493139302" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" comment="screenshot" date="1493139302" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493139302" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1493139302" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1493139302" size="147" user="ProjectContributor" version="1"}%
12 changes: 9 additions & 3 deletions WysiwygPlugin/data/System/WysiwygPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1491354107" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493186672" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Wysiwyg Plugin
<!--
Expand Down Expand Up @@ -187,7 +187,13 @@ Many thanks to the following sponsors for supporting this work:
| Copyright | &copy; ILOG 2005 http://www.ilog.fr %BR% \
&copy; 2008-2015 Foswiki Contributors |
| Change History: | |
| 1.35 (04 Apr 2017) | Foswikitask:Item14324: Unescaped left brace - Perl 5.25.10. |
| 1.35 (04 Apr 2017) | Foswikitask:Item2489: WysiwygPlugin Constants should use export instead of aliasing it to some WC module <br/>\
Foswikitask:Item9651: wysiwyg converts bold table content to table heads - Waiting for Release <br/>\
Foswikitask:Item10239: Class Attribute is missing after Wysiwyg Transfer of Table Nodes <br/>\
Foswikitask:Item12388: HTML2TML relies on XML-specific <code>&amp;apos;</code> entity <br/>\
Foswikitask:Item13344: Wysiwyg corrupts markup with mixed indent (:) and list markup <br/>\
Foswikitask:Item14323: Update to latest TinyMCE version <br/>\
Foswikitask:Item14324: Unescaped left brace caught by Perl 5.25.10.|
| 1.34 (26 Nov 2016) | Released with Foswiki 2.1.3 Foswikitask:Item14078: Wysiwyg merges horizontal rules (---) into a preceeding list and looses the TML markup.<br />\
Foswikitask:Item14253: WysiwygPlugin inserts extra spaces in front of square bracket links. |
| 1.33 (08 Apr 2016) | Released with Foswiki 2.1.1 Foswikitask:Item13960: Editor fails to preserve alignment of cells containing "0".<br/>\
Expand Down Expand Up @@ -281,4 +287,4 @@ Many thanks to the following sponsors for supporting this work:
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1491354107" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493186672" size="1343" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions core/data/System/UpgradeGuide.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1482207308" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493146093" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
%STARTINCLUDE%
---+ Foswiki Upgrade Guide
Expand Down Expand Up @@ -250,7 +250,7 @@ This is the most common data that should be copied. Review other non-default ext

---+++ Migrate =.htpasswd= file

If used, *the =.htpasswd= file may require conversion*. If users have registered using "high ascii" characters in their !WikiNames (e.g. Ä, ä, Ë, ë, Ï, ï, Ö, ö, Ü, ü) then conversion will be
If used, *the =.htpasswd= file may require conversion*. If users have registered using "high ascii" characters in their !WikiNames (e.g. &Auml;, &auml;, &Euml;, &euml;, &Iuml;, &iuml;, &Ouml;, &ouml;, &Uuml;, &uuml;) then conversion will be
required. Foswiki does not provide a tool to convert =.htpasswd=. Consider command line tools such as =iconv= or =recode=. See
[[http://stackoverflow.com/questions/64860/best-way-to-convert-text-files-between-character-sets][this StackOverflow article]] for more details.

Expand Down
2 changes: 1 addition & 1 deletion core/tools/check_manifest.pl
View file
Expand Up @@ -10,7 +10,7 @@

my $manifest = shift || 'MANIFEST';
my @skip =
qw(tools/develop tools/githooks tools/pkg tools/benchmark tools/distro test working logs MANIFEST DEPENDENCIES build\.pl PREINSTALL TIDY .*?\.psd .*?\.xcf \.gitignore);
qw(tools/develop tools/githooks tools/pkg tools/benchmark tools/distro test working logs MANIFEST DEPENDENCIES build\.pl PREINSTALL TIDY .*?\.psd .*?\.xcf \.gitignore .*?\/TinyMCEPlugin/tinymce_dev);
my $cvs = 'subversion';
my $skipPattern = join( '|', @skip );

Expand Down

0 comments on commit 0845ce2

Please sign in to comment.