Skip to content

Commit

Permalink
Item14370: Item13883: Merge branch 'Release02x01'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gac410
gac410 committed May 6, 2017
2 parents 6873fac + cc9bd39 commit 705ee87
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 31 deletions.
7 changes: 4 additions & 3 deletions CompareRevisionsAddOn/data/System/CompareRevisionsAddOn.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493947845" format="1.1" version="1"}%
<!--
One line description, required for extensions repository catalog.
* Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
Expand Down Expand Up @@ -134,6 +134,7 @@ This Add-On comes pre-installed on Foswiki. You should only need to re-install i

| Copyright &copy;: | 2006, !JChristophFuchs; 2008-2015 Kenneth Lavrsen and Foswiki Contributors |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 04 May 2017 (1.115) | Foswikitask:Item14366: <code>use CGI::Carp</code> in bin scripts BEGIN block cannot be found via LocalLib.cfg override. |
| 14 Jun 2015 (1.114) | Foswikitask:Item13423: Perl 5.22 deprecations. Foswikitask:Item13378: Support utf-8 internally. |
| 18 Dec 2014 (1.113) | Foswikitask:Item13068: Remove the CompareRevisionsAddOn demo, don't ship revision history<br />\
Foswikitask:Item11737: Change hardcoded Main to %USERSWEB% <br \>\
Expand Down Expand Up @@ -185,5 +186,5 @@ __Related Topic:__ %SYSTEMWEB%.ContributedAddOns
%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="interweave.png" attr="h" comment="" date="1437500521" size="28786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebyside.png" attr="h" comment="" date="1437500521" size="48991" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="interweave.png" attr="h" comment="" date="1493947845" size="28786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="sidebyside.png" attr="h" comment="" date="1493947845" size="48991" user="ProjectContributor" version="1"}%
3 changes: 2 additions & 1 deletion ConfigurePlugin/data/System/ConfigurePlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1491685944" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1493947845" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Configure Plugin
%FORMFIELD{"Description"}%
Expand Down Expand Up @@ -43,6 +43,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.<br/>\
Foswikitask:Item13339: Warning or errors icons in configure get stuck unless page is reloaded.<br/>\
Foswikitask:Item14366: Reorder initialization to allow local CGI::Carp |
| 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 |
Expand Down
33 changes: 17 additions & 16 deletions EditRowPlugin/data/System/EditRowPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493666715" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493947845" format="1.1" version="1"}%
---+!! !EditRowPlugin
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -271,7 +271,8 @@ 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 (1 May 2017) | Foswikitask:Item14351: Uninitialized value warning when changerows is used with EditRowPlugin <br/>\
| 3.318 (1 May 2017) | Foswikitask:Item14351: Uninitialized value warning when changerows is used with EditRowPlugin. <br/>\
Foswikitask:Item13766: EditRowPlugin columns widths are jumping to wider size when you hoover the mouse over the table. <br/>\
Foswikitask:Item14349: Edit Table button not functional on IE 11.|
| 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/> \
Expand Down Expand Up @@ -352,17 +353,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="1493666715" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1493666715" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1493666715" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1493666715" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1493666715" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1493666715" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1493666715" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1493666715" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1493666715" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1493666715" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493666715" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1493666715" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493666715" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1493666715" size="1418" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1493947845" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1493947845" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1493947845" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1493947845" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1493947845" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1493947845" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1493947845" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1493947845" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1493947845" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1493947845" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493947845" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1493947845" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493947845" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1493947845" size="1418" user="ProjectContributor" version="1"}%
3 changes: 2 additions & 1 deletion JQueryPlugin/data/System/JQueryPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486607275" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493947845" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%

Expand Down Expand Up @@ -125,6 +125,7 @@ required for Foswiki 1.1 or later.

---++ Change History
%TABLE{columnwidths="7em" tablewidth="100%"}%
| 4 May 2017: | (7.23) - Item14372: JQueryPlugin ui-draggable got dropped from Config.spec. |
| 8 Feb 2017: | (7.22) - Item14312: don't destroy dialogs on close. |
| 23 Jan 2017: | (7.21) - Item14281: Cookie related changes. Inconsistent use of the domain and secure flags. |
| 12 Dec 2016: | (7.20) - Item10918: Improve javascript api to address individual tabs. \
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
View file
Expand Up @@ -24,8 +24,8 @@ BEGIN {
}
}

our $VERSION = '7.22';
our $RELEASE = '8 Feb 2017';
our $VERSION = '7.23';
our $RELEASE = '4 May 2017';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
5 changes: 3 additions & 2 deletions NatEditPlugin/data/System/NatEditPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1484931182" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493947845" format="1.1" version="1"}%
---+!! Natural Edit Plugin
%TOC%

Expand Down Expand Up @@ -56,6 +56,7 @@ is sufficient.

| Copyright &copy;: | 2007-2017 Michael Daum http://michaeldaumconsulting.com |
| Change History: | |
| 04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
| 20 Jan 2017 | Foswikitask:Item14265: NatEdit plugin leaves UI blocked after some save errors<br/>\
Foswikitask:Item14285: fixed error clicking on disabled toolbar buttons |
| 06 Jan 2016 | Add helper to insert a data form table header. |
Expand Down Expand Up @@ -181,4 +182,4 @@ is sufficient.
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1484931182" size="64487" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493947845" size="64487" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
View file
Expand Up @@ -30,8 +30,8 @@ BEGIN {
}
}

our $VERSION = '9.08';
our $RELEASE = '20 Jan 2017';
our $VERSION = '9.09';
our $RELEASE = '04 May 2017';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION = 'A Wikiwyg Editor';
our $baseWeb;
Expand Down
5 changes: 4 additions & 1 deletion core/data/System/ReleaseHistory.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1486929101" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1493948714" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
History of Foswiki
%STARTINCLUDE%
Expand All @@ -7,6 +7,9 @@ History of Foswiki
---+ Appendix A: Foswiki Development Time-line

%TOC%
---++ Foswiki Release 2.1.4-Beta1 - 4 May 2017

Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.

---++ Foswiki Release 2.1.3 - 12 Feb 2017

Expand Down
30 changes: 28 additions & 2 deletions core/data/System/ReleaseNotes02x01.txt
View file
@@ -1,6 +1,6 @@
%META:TOPICINFO{author="ProjectContributor" date="1486929101" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1493948714" format="1.1" version="1"}%
%META:TOPICPARENT{name="ReleaseHistory"}%
---+!! Foswiki Release 2.1.3
---+!! Foswiki Release 2.1.4-RC1

%TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
%TOC%
Expand Down Expand Up @@ -55,6 +55,7 @@ Foswiki is released under the GNU General Public License.
* Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
* Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
* Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
* Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.


---++ Pre-installed Extensions
Expand Down Expand Up @@ -474,6 +475,31 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel
| [[%BUGS%/Item14229][Item14229]] | Upgrade JQueryPlugin to jsrender 0.9.83. |
| [[%BUGS%/Item14230][Item14230]] | jquery.maskedinput initializer does not match documentation. |

---++ Foswiki Release 2.1.4 Details
---+++ Fixes

| [[%BUGS%/Item12090][Item12090]] | Field name -with description- in Forms not working properly. |
| [[%BUGS%/Item13246][Item13246]] | Context =header_text= needs better documentation. |
| [[%BUGS%/Item13339][Item13339]] | Warning or errors icons in configure get stuck unless page is reloaded. |
| [[%BUGS%/Item13766][Item13766]] | EditRowPlugin columns widths are jumping to wider size when you hoover the mouse over the table. |
| [[%BUGS%/Item13907][Item13907]] | UpdatesPlugin Report of required update should list the backlevel extensions. |
| [[%BUGS%/Item13954][Item13954]] | Extensions with "pluggable" components cause errors: No such value {Store}{Implementation}. |
| [[%BUGS%/Item14324][Item14324]] | Perl 5.25.10 reports unescaped left brace in regular expression errors. |
| [[%BUGS%/Item14328][Item14328]] | Foswiki::Net crashes with uninitialized value in pattern match when sending email for older CPAN modules. |
| [[%BUGS%/Item14337][Item14337]] | SCRIPTURL paths and inline scripts make javascript signing more difficult than needed. |
| [[%BUGS%/Item14346][Item14346]] | Systemd service file has issues, needs better documentation. |
| [[%BUGS%/Item14347][Item14347]] | Prune the cruft from the tools dir and improve tools script documentation. |
| [[%BUGS%/Item14349][Item14349]] | EditRowPlugin Edit Table button not functional on IE 11. |
| [[%BUGS%/Item14350][Item14350]] | OopsException documentation has incorrect example. |
| [[%BUGS%/Item14351][Item14351]] | Uninitialized value warning when changerows is used with EditRowPlugin. |
| [[%BUGS%/Item14366][Item14366]] | =use CGI::Carp= in bin scripts BEGIN block cannot be found via LocalLib.cfg override. |
| [[%BUGS%/Item14368][Item14368]] | Failure to handle edge cases leads to obscure bug in RCS. |
| [[%BUGS%/Item14369][Item14369]] | Document parameters for USERNAME, WIKINAME and WIKIUSERNAME macros. |
| [[%BUGS%/Item14372][Item14372]] | JQueryPlugin ui-draggable got dropped from Config.spec. |
| [[%BUGS%/Item14377][Item14377]] | Error message requires some encoding. |
| [[%BUGS%/Item14381][Item14381]] | mod_perl unexpectedly decodes the URI, and X-FoswikiURI header should be debug only. |
| [[%BUGS%/Item14388][Item14388]] | NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |

</noautolink>

---
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Func.pm
View file
Expand Up @@ -1403,7 +1403,7 @@ sub addUserToGroup {

=begin TML
---+++ removeUserFromGroup( $group, $id ) -> $boolean
---+++ removeUserFromGroup( $id, $group ) -> $boolean
* $id can be a login name or a WikiName
Expand Down

0 comments on commit 705ee87

Please sign in to comment.