Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Item14288
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Apr 5, 2017
2 parents 35b3c2e + 1b50aad commit d7114cb
Show file tree
Hide file tree
Showing 29 changed files with 604 additions and 199 deletions.
3 changes: 2 additions & 1 deletion ConfigurePlugin/data/System/ConfigurePlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1485233581" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1491355273" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Configure Plugin
%FORMFIELD{"Description"}%
Expand Down Expand Up @@ -42,6 +42,7 @@ The plugin uses the =JsonRpcContrib=, which must be installed.

---++ Change History

| 04 Apr 2017: | (1.08) Foswikitask:Item13883: Updated base template to suggest solutions when configure shows base login page. |
| 23 Jan 2017: | (1.07) Foswikitask:Item14287: Configure needs to encode reported configuration values. |
| 28 Nov 2016: | (1.06) Foswikitask:Item13206: Upgrade to latest jquery-ui |
| 11 Apr 2016: | (1.05) Foswikitask:Item14049: fixed jsonrpc endpoint |
Expand Down
4 changes: 2 additions & 2 deletions ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
View file
Expand Up @@ -31,8 +31,8 @@ package Foswiki::Plugins::ConfigurePlugin;
use strict;
use warnings;

our $VERSION = '1.07';
our $RELEASE = '23 Jan 2017';
our $VERSION = '1.08';
our $RELEASE = '04 Apr 2017';
our $SHORTDESCRIPTION = '=configure= interface using json-rpc';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
31 changes: 16 additions & 15 deletions EditRowPlugin/data/System/EditRowPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485029916" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1491353402" format="1.1" version="1"}%
---+!! !EditRowPlugin
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -271,6 +271,7 @@ Provides the vertical row editing interface like
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!

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 3.318 (4 Apr 2017) | Foswikitask:Item14351: uninitialized value warning when changerows is used with EditRowPlugin |
| 3.317 (21 Jan 2017) | Foswikitask:Item14107 Document that move, add & delete row actions are immediate, not subject to cancel. |
| 3.316 (26 Nov 2016) | Foswikitask:Item14174 css.gz and js.gz files missing from MANIFEST<br/> \
Foswikitask:Item14213 Warning logged about uninitialized values <br/>\
Expand Down Expand Up @@ -350,17 +351,17 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
%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="http://foswiki.org/Extensions/EditRowPlugin"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/EditRowPlugin"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1485029916" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1485029916" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1485029916" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1485029916" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1485029916" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1485029916" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1485029916" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1485029916" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1485029916" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1485029916" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1485029916" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1485029916" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1485029916" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1485029916" size="1418" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1491353402" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1491353402" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1491353402" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1491353402" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1491353402" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1491353402" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1491353402" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1491353402" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1491353402" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1491353402" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1491353402" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1491353402" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1491353402" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1491353402" size="1418" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin.pm
View file
Expand Up @@ -32,8 +32,8 @@ BEGIN {
}
}

our $VERSION = '3.317';
our $RELEASE = '21 Jan 2017';
our $VERSION = '3.318';
our $RELEASE = '04 Apr 2017';
our $SHORTDESCRIPTION = 'Inline edit for tables';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
29 changes: 14 additions & 15 deletions EditTablePlugin/data/System/EditTablePlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1490657423" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1491353723" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Edit Table Plugin

Expand Down Expand Up @@ -197,9 +197,8 @@ Test if the Plugin is correctly installed:

| Copyright: | &copy; 2008-2012, Arthur Clemens, 2008-2015, Foswiki Contributors; Copyright &copy; 2002-2007 Peter Thoeny, peter@thoeny.org and TWiki Contributors |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
| Version: | %$VERSION% |
| Release: | %$RELEASE% |
| Change History: | <!-- specify latest version first -->&nbsp; |
| 04 Apr 2017: | 4.46: Item14324: Unescaped left brace - Perl 5.25.10 |
| 28 Nov 2016: | 4.45: Released with Foswiki 2.1.3<br/>\
Foswikitask:Item14236: Include compressed and gziped versions of css and js. |
| 19 Sep 2015: | 4.44: Foswikitask:Item13730: EditTablePlugin uses unescaped braces and calls CGI::param in list context. |
Expand Down Expand Up @@ -269,15 +268,15 @@ Test if the Plugin is correctly installed:
| Plugin Home: | http://foswiki.org/Extensions/%TOPIC% |
| Support: | http://foswiki.org/Support/%TOPIC% |

%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1490657423" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1490657423" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1490657423" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1490657423" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1490657423" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1490657423" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1491353723" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1491353723" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1491353723" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1491353723" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1491353723" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions EditTablePlugin/lib/Foswiki/Plugins/EditTablePlugin.pm
View file
Expand Up @@ -16,11 +16,11 @@ BEGIN {
}
}

our $VERSION = '4.45';
our $VERSION = '4.46';

# Please note that the second is now two digit.
# Someone increased 4.22 to 4.3 which is not correct.
our $RELEASE = '28 Nov 2016';
our $RELEASE = '04 Apr 2017';

our $pluginName = 'EditTablePlugin';
our $ENCODE_START = '--EditTableEncodeStart--';
Expand Down
37 changes: 19 additions & 18 deletions PatternSkin/data/System/PatternSkin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1486607275" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1491355273" format="1.1" version="1"}%
%META:TOPICPARENT{name="Skins"}%
%STARTINCLUDE%
---+!! Pattern skin
Expand Down Expand Up @@ -189,6 +189,7 @@ For further troubleshooting and feedback, go to http://foswiki.org/Support/%TOPI
| Preview: | [[%SCRIPTURL{view}%/%WEB%/%TOPIC%?skin=pattern][Preview with this skin]] |
| Base Name: | pattern |
| History: | <!-- specify latest version first -->&nbsp; |
| 4 Apr 2017 | V.6.10: Foswikitask:Item13883: Fix HTML errors in PatternSkinElements. |
| 8 Feb 2017 | v.6.09: Foswikitask:Item14315: Attachment count always shows latest revision when viewing prior versions.<br/>\
Foswikitask:Item14235: Sanitize some template fields. |
| 23 Jan 2017 | v.6.08: Foswikitask:Item13831: JS error in System.LanguageSelector<br/>\
Expand Down Expand Up @@ -271,20 +272,20 @@ Leave remarks, suggestions and other feedback in http://foswiki.org/Support/%TOP
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%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:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1486607275" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1486607275" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1486607275" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1486607275" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1486607275" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1486607275" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1486607275" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1486607275" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1486607275" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1486607275" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1486607275" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1486607275" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1486607275" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1486607275" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1486607275" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1486607275" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1486607275" size="5545" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1491355273" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1491355273" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1491355273" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1491355273" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1491355273" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1491355273" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1491355273" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1491355273" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1491355273" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1491355273" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1491355273" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1491355273" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1491355273" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1491355273" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1491355273" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1491355273" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1491355273" size="5545" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm
View file
Expand Up @@ -3,8 +3,8 @@ package Foswiki::Contrib::PatternSkin;
use strict;
use warnings;

our $VERSION = '6.09';
our $RELEASE = '8 Feb 2017';
our $VERSION = '6.10';
our $RELEASE = '4 Apr 2017';
our $SHORTDESCRIPTION =
'Pattern skin provides a CSS based default look and feel - flexible and [[http://www.w3.org/][W3C]] compliant. Its layout and color scheme are designed to provide a nice, clean and productive editing environment';

Expand Down
3 changes: 2 additions & 1 deletion RCSStoreContrib/data/System/RCSStoreContrib.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1480186866" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1491353912" format="1.1" version="1"}%
<!--
One line description, required for extensions repository catalog.
* Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
Expand Down Expand Up @@ -65,6 +65,7 @@ diff lib/Foswiki/Store/Rcs/RcsLiteHandler.pm lib/Foswiki/Store/Rcs/RcsLiteHandle

| Dependencies: | %$DEPENDENCIES% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 1.06 (4 Apr 2017): | Foswikitask:Item14368: Failure to handle edge cases leads to obscure bug. |
| 1.05 (26 Nov 2016): | Released wth Foswiki 2.1.3<br>\
Foswikitask:Item14066: performance issue sorting topic list based on NFKD. |
| 1.04 (06 Mar 2016): | Foswikitask:Iem14008: Error if !FoswikiAttachPubFiles is enabled with a non-RCS store. |
Expand Down
4 changes: 2 additions & 2 deletions RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm
View file
Expand Up @@ -19,8 +19,8 @@ use warnings;

use Foswiki::Configure::Load;

our $VERSION = '1.05';
our $RELEASE = '26 Nov 2016';
our $VERSION = '1.06';
our $RELEASE = '4 Apr 2017';
our $SHORTDESCRIPTION =
'A wiki topic and attachment store using the RCS revision control system';

Expand Down

0 comments on commit d7114cb

Please sign in to comment.