Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Release02x01'
  • Loading branch information
gac410 committed Jan 21, 2017
2 parents b1227d6 + 4ed3a3f commit 36e3131
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 36 deletions.
13 changes: 7 additions & 6 deletions CommentPlugin/data/System/CommentPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1460168492" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485009132" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Comment Plugin

Expand Down Expand Up @@ -279,6 +279,7 @@ This plugin has been significantly changed from the =10 April 2011= version ship
Another great 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: | |
| 2.92 (21 Jan 2017) | Foswikitask:Item14009: Comment plugin does not properly identify location to insert comment when specified as an anchor. |
| 2.91 (08 Apr 2016) | Foswikitask:Item14022: Update Foswiki.org links to https. Released with Foswiki 2.1.1. |
| 2.9 (03 Feb 2016) | Foswikitask:Item13854: Set ALLOWTOPICVIEW = "*" on Comment Template. *Requires compatibility patch on Foswiki 1.x or Foswiki 1.1.10.* |
| 2.8 (15 Nov 2015) | Foswikitask:Item13852: Warn that COMMENT ACLs should be configured if enabled. Also suppress guest session warning on Foswiki 1.1. |
Expand Down Expand Up @@ -332,8 +333,8 @@ Another great extension from the <a style="text-decoration:none" href="http://wi
%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/CommentPlugin"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/CommentPlugin"}%
%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1460168492" size="70" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1460168492" size="1931" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1460168492" size="60" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1460168492" size="5134" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1460168492" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1485009132" size="70" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1485009132" size="1931" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1485009132" size="60" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1485009132" size="5134" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1485009132" size="1343" user="ProjectContributor" version="1"}%
6 changes: 3 additions & 3 deletions CommentPlugin/lib/Foswiki/Plugins/CommentPlugin.pm
Expand Up @@ -13,8 +13,8 @@ use Foswiki::Func ();
use Foswiki::Plugins ();

# Please use major.minor
our $VERSION = '2.91';
our $RELEASE = '08 Apr 2016';
our $VERSION = '2.92';
our $RELEASE = '21 Jan 2017';
our $SHORTDESCRIPTION =
'Quickly post comments to a page without an edit/save cycle';
our $NO_PREFS_IN_TOPIC = 1;
Expand Down Expand Up @@ -274,7 +274,7 @@ sub _restSave {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
@@ -1,7 +1,7 @@
/*
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2010-2014 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2010-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down Expand Up @@ -62,8 +62,9 @@ This is an example of a simple AJAX comment submission.
relto = $('*:contains("' + form.comment.location.value
+ '")')[0];
} else if (form.comment_anchor) {
relto = $("a[name='" + form.comment_anchor.value
+ "']");
var anchor = form.comment_anchor.value.slice(1);
relto = $("a[name='" + anchor
+ "'],*[id='" + anchor + "']");
} else {
relto = $(".commentPluginForm")[form.comment_index.value];
if (relto)
Expand Down
48 changes: 27 additions & 21 deletions EditRowPlugin/data/System/EditRowPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1482340777" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485029916" format="1.1" version="1"}%
---+!! !EditRowPlugin
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -40,6 +40,10 @@ larger than this will work, but they put considerable stress on the browser
and the server. For manipulating larger tables, you are recommended to investigate
Foswiki:Extensions.JQGridPlugin.

<div class='foswikiHelp'>%X% This plugin makes some changes on the server immediately,
such as add and delete rows. *Cancel does not roll back server side changes.*
If necessary, roll back changes using the More topic actions "revert".</div>

---++ Usage

Works like the !EditTablePlugin (it uses exactly the same =%EDITTABLE= macro)
Expand Down Expand Up @@ -119,12 +123,13 @@ table. When the table is
edited, then a number of buttons may be shown depending on the
settings of =changerows= and =quietsave=.
* %UICON%disk%NOCIU% saves the changes
* <button type="button" class="erp-button erp-quietsave"></button> saves without notification
* %UICON%plusthick%NOCIU% adds a new row after the current row, taking for its contents the initial values specified in the EDITTABLE macro
* %UICON%minusthick%NOCIU% deletes the row
* %UICON%arrow-1-n%NOCIU% Move this row up one row in the table
* %UICON%arrow-1-s%NOCIU% Move this row down one row in the table
* <button type="button" class="erp-button erp-quietsave"></button> saves without notification.
* %UICON%cancel%NOCIU% cancels the open edit
* The following actions are applied to the topic on the server immediately and are not reverted by the Cancel action,
* %UICON%plusthick%NOCIU% adds a new row after the current row, taking for its contents the initial values specified in the EDITTABLE macro.
* %UICON%minusthick%NOCIU% deletes the row.
* %UICON%arrow-1-n%NOCIU% Move this row up one row in the table
* %UICON%arrow-1-s%NOCIU% Move this row down one row in the table

---++ Per Cell Settings

Expand Down Expand Up @@ -266,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.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/>\
Foswikitask:Item14218 Not fuctional on recent versions of IE. <br/>\
Expand Down Expand Up @@ -340,21 +346,21 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2007-2011 Wind<nop>River Inc.<br/> &copy; 2008-2016 Foswiki Contributors"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2007-2011 Wind<nop>River Inc.<br/> &copy; 2008-2017 Foswiki Contributors"}%
%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="1482340777" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1482340777" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1482340777" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1482340777" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1482340777" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1482340777" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1482340777" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1482340777" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1482340777" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1482340777" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1482340777" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1482340777" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1482340777" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1482340777" size="1418" user="ProjectContributor" version="1"}%
%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"}%
6 changes: 3 additions & 3 deletions EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin.pm
Expand Up @@ -32,8 +32,8 @@ BEGIN {
}
}

our $VERSION = '3.316';
our $RELEASE = '26 Nov 2016';
our $VERSION = '3.317';
our $RELEASE = '21 Jan 2017';
our $SHORTDESCRIPTION = 'Inline edit for tables';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -123,7 +123,7 @@ __END__
Author: Crawford Currie http://c-dot.co.uk
Copyright (c) 2008-2016 Foswiki Contributors
Copyright (c) 2008-2017 Foswiki Contributors
Copyright (c) 2007 WindRiver Inc.
All Rights Reserved. Foswiki Contributors are listed in the
AUTHORS file in the root of this distribution.
Expand Down

0 comments on commit 36e3131

Please sign in to comment.