Skip to content

Commit

Permalink
Merge branch 'Release02x01'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDaum
MichaelDaum committed Feb 9, 2017
2 parents cdd679e + f13a51f commit 808b583
Show file tree
Hide file tree
Showing 16 changed files with 139 additions and 69 deletions.
22 changes: 11 additions & 11 deletions InterwikiPlugin/data/System/InterWikis.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1457496285" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486602810" format="1.1" version="1"}%
%META:TOPICPARENT{name="InterwikiPlugin"}%
---+ <nop>Inter-Wiki Link Rules (or Links to other Sites)

Expand Down Expand Up @@ -36,10 +36,10 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
| Acronym | http://www.acronymfinder.com/af-query.asp?Acronym=$page&String=exact | Look up '$page' on Acronym Finder site |
| CPAN | https://metacpan.org/module/ | CPAN perl repository |
| Dictionary | http://www.dictionary.com/cgi-bin/dict.pl?term= | Look up '$page' at Dictionary.com |
| Google | http://google.com/search?q= | Search for '$page' on Google |
| Group | http://groups.google.com/groups?hl=en&safe=off&group= | News group '$page' at Google.com |
| Google | https://google.com/search?q= | Search for '$page' on Google |
| Group | https://groups.google.com/forum/#!search/ | News group '$page' at Google.com |
| ISBN | http://www.bookfinder.com/search/?st=sr;ac=qr;isbn= | Book with ISBN $page |
| News | http://news.google.com/news?q= | Search for '$page' on Google news |
| News | https://news.google.com/news?q= | Search for '$page' on Google news |
| RFC | http://www.faqs.org/rfcs/rfc$page.html | IETF RFC #$page |

</noautolink>
Expand All @@ -49,25 +49,24 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
<noautolink>

| *Alias:* | *URL:* | *Tooltip Text:* | *Format override:* |
| Advogato | http://www.advogato.org/ | '$page' on Advogato community site (with peer review) |
| Advogato | http://www.advogato.org/article/$page.html | '$page' on Advogato community site (with peer review) |
| C2find | http://c2.com/cgi/wiki?FindPage&value= | Search '$page' on the original 'WikiWikiWeb' site |
| DokuWiki | http://wiki.splitbrain.org/wiki: | '$page' on Doku Wiki site |
| DokuWiki | http://dokuwiki.org/ | '$page' on Doku Wiki site |
| Foswiki | https://foswiki.org/ | '$page' on foswiki.org |
| Foswikitask | https://foswiki.org/Tasks/ | '$page' on the 'Foswiki' issue tracking site |
| Foswikirev | %REV2REF{$page}% | revision $page of 'Foswiki' on Github | $url |
| FoxWiki | http://fox.wikis.com/wc.dll?Wiki~ | '$page' on Fox Wiki site |
| HammondWiki | http://www.dairiki.org/HammondWiki/index.php3? | '$page' on 'HammondWiki' site |
| HammondWiki | http://www.dairiki.org/HammondWiki/ | '$page' on 'HammondWiki' site |
| MeatBall | http://www.usemod.com/cgi-bin/mb.pl? | '$page' on 'MeatBall' site, a 'UseMod' Wiki variant |
| MoinMoin | http://moinmo.in/ | '$page' on 'MoinMoin' Wiki site |
| MoinMoin | https://moinmo.in/ | '$page' on 'MoinMoin' Wiki site |
| PPR | http://c2.com/cgi/wiki? | '$page' on the original 'PortlandPatternRepository' site |
| Squeak | http://wiki.squeak.org/squeak/ | '$page' on Squeak Smalltalk Wiki |
| TWiki | http://twiki.org/cgi-bin/view/ | '$page' on TWiki.org |
| TWikibug | http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/ | '$page' on the TWiki issue tracking site |
| TWikirev | http://develop.twiki.org/trac/changeset/ | revision $page of TWiki svn |
| UseMod | http://www.usemod.com/cgi-bin/wiki.pl? | '$page' on 'UseMod' Wiki site |
| Wiki | http://c2.com/cgi/wiki? | '$page' on the original 'WikiWikiWeb' site |
| Wikipedia | http://en.wikipedia.org/wiki/ | '$page' on 'Wikipedia' |
| ZWiki | http://joyful.com/zwiki/ | '$page' on Zope's Wiki |
| Wikipedia | https://en.wikipedia.org/wiki/ | '$page' on 'Wikipedia' |
| ZWiki | http://zwiki.org/ | '$page' on Zope's Wiki |

</noautolink>

Expand All @@ -79,3 +78,4 @@ Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in t
<!--
%JQREQUIRE{"chili"}%
-->
%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="*"}%
11 changes: 8 additions & 3 deletions InterwikiPlugin/data/System/InterwikiPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1460168492" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1486602810" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Interwiki Plugin
<!--
Expand Down Expand Up @@ -29,12 +29,16 @@ Add and edit aliases in %SYSTEMWEB%.InterWikis.%STARTSECTION{"aliasformat"}%
* any external links.
* Hint: Escape =='WikiWords'== and =='$page'==.
* If the link format override is provided, it overrides the =INTERWIKIPLUGIN_INTERLINKFORMAT= for just that entry.

<div class="foswikiHelp">%H% Note that Interwiki links do not properly resolve
when part of an INCLUDEd topic.</div>

<div class="foswikiHelp">%H% For Foswiki and TWiki sites, both the *web* and the *topic* have to be specified: ==<nop>Foswiki:Webname/<nop>SomePage==
Foswiki:Extensions/InterwikiPlugin or Foswiki:Extensions.InterwikiPlugin
</div>

<div class="foswikiHelp">
%H% For links with paranthesis you will need to write as ==[<nop>[Wikipedia:Fork_(software_development)]]==, or quoted, as ==<nop>Wikipedia:'Fork_(software_development)'== as we assume that the closing paranthesis is not part of the link. For example, Wikipedia:'Fork_(software_development)' .
%H% For links with paranthesis you will need to write as ==[<nop>[Wikipedia:Fork_(software_development)]]==, or quoted, as ==<nop>Wikipedia:'Fork_(software_development)'== as we assume that the closing paranthesis is not part of the link.
</div>
%ENDSECTION{"aliasformat"}%

Expand Down Expand Up @@ -63,6 +67,7 @@ The =INTERWIKIPLUGIN_INTERLINKFORMAT= supports a number of formatting tokens:%ST
---++ Plugin Info

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 8 Feb 2071: (1.24) | Foswikitask:Item14321: Fix some stale default Interwiki links. |
| 8 Apr 2016: (1.23) | Foswikitask:Item14022: Change foswiki.org links to https. |
| 14 Jun 2014: (1.22) | Foswikitask:Item13287: Foswikitask:Item13387: Regular expression enhancements, better UTF-8 support. |
| 03 Oct 2014: (1.21) | Foswikitask:Item13045: Add per-link override of INTERLINKFORMAT |
Expand Down Expand Up @@ -103,7 +108,7 @@ The =INTERWIKIPLUGIN_INTERLINKFORMAT= supports a number of formatting tokens:%ST

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2001-2007, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), 2007-2015 %SYSTEMWEB%.ProjectContributor"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2001-2007, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), 2007-2017 %SYSTEMWEB%.ProjectContributor"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Author" title="Author" value="Foswiki:%USERSWEB%.AndreaSterbini, TWiki:Main.PeterThoeny"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/InterwikiPlugin"}%
Expand Down
6 changes: 3 additions & 3 deletions InterwikiPlugin/lib/Foswiki/Plugins/InterwikiPlugin.pm
View file
Expand Up @@ -26,8 +26,8 @@ use warnings;
use Foswiki::Func (); # The plugins API
use Foswiki::Plugins (); # For the API version

our $VERSION = '1.23';
our $RELEASE = '1.23';
our $VERSION = '1.24';
our $RELEASE = '8 Feb 2017';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION =
'Link !ExternalSite:Page text to external sites based on aliases defined in a rules topic';
Expand Down Expand Up @@ -198,7 +198,7 @@ sub _trimWhitespace {
__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
18 changes: 9 additions & 9 deletions InterwikiPlugin/test/unit/InterwikiPlugin/InterwikiPluginTests.pm
View file
Expand Up @@ -36,7 +36,7 @@ sub tear_down {
sub test_link_from_default_rules_topic {
my $this = shift;
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Perl" title="\'Perl\' on \'Wikipedia\'"><noautolink>Wikipedia:Perl</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Perl" title="\'Perl\' on \'Wikipedia\'"><noautolink>Wikipedia:Perl</noautolink></a>',
Foswiki::Func::renderText( "Wikipedia:Perl", $this->{test_web} )
);
}
Expand Down Expand Up @@ -98,7 +98,7 @@ HERE

# default rule
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Perl" title="\'Perl\' on \'Wikipedia\'"><noautolink>Wikipedia:Perl</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Perl" title="\'Perl\' on \'Wikipedia\'"><noautolink>Wikipedia:Perl</noautolink></a>',
Foswiki::Func::renderText( "Wikipedia:Perl", $this->{test_web} ),
'default rule'
);
Expand Down Expand Up @@ -154,7 +154,7 @@ sub test_link_format {
sub test_link_with_url {
my $this = shift;
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/http://www.google.com/search?q=foswiki&foo=bar" title="\'http://www.google.com/search?q=foswiki&foo=bar\' on \'Wikipedia\'"><noautolink>Wikipedia:http://www.google.com/search?q=foswiki&foo=bar</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/http://www.google.com/search?q=foswiki&foo=bar" title="\'http://www.google.com/search?q=foswiki&foo=bar\' on \'Wikipedia\'"><noautolink>Wikipedia:http://www.google.com/search?q=foswiki&foo=bar</noautolink></a>',
Foswiki::Func::renderText(
"Wikipedia:http://www.google.com/search?q=foswiki&foo=bar",
$this->{test_web}
Expand All @@ -167,7 +167,7 @@ sub test_link_with_url {
sub test_link_with_complex_url {
my $this = shift;
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'" title="\'http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'\' on \'Wikipedia\'"><noautolink>Wikipedia:http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'" title="\'http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'\' on \'Wikipedia\'"><noautolink>Wikipedia:http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'</noautolink></a>',
Foswiki::Func::renderText(
'Wikipedia:http://www.google.com/search?q=foswiki&foo="bar"/\'baz.\'',
$this->{test_web}
Expand Down Expand Up @@ -268,13 +268,13 @@ sub test_link_with_parentheses {
# If you want to link to a topic with parenthesis, you
# will need to writ it as [[Wikipedia:Fork_(software_development)]]
#$this->assert_html_equals(
#'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
#'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
#Foswiki::Func::renderText( "Wikipedia:Fork_(software_development)", $this->{test_web} )
#);

# ref in [[ref]]
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
Foswiki::Func::renderText(
"[[Wikipedia:Fork_(software_development)]]",
$this->{test_web}
Expand All @@ -283,7 +283,7 @@ sub test_link_with_parentheses {

# ref in [[ref][foo]]
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>foo</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Fork_(software_development)" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>foo</noautolink></a>',
Foswiki::Func::renderText(
"[[Wikipedia:Fork_(software_development)][foo]]",
$this->{test_web}
Expand Down Expand Up @@ -420,7 +420,7 @@ HERE

# Quoted with special characters
$this->assert_html_equals(
'<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Fork_%28software_development%29" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
'<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Fork_%28software_development%29" title="\'Fork_(software_development)\' on \'Wikipedia\'"><noautolink>Wikipedia:Fork_(software_development)</noautolink></a>',
Foswiki::Func::renderText(
"Wikipedia:'Fork_(software_development)'",
$this->{test_web}
Expand Down Expand Up @@ -515,7 +515,7 @@ HERE
);

$this->assert_html_matches(
qq{<a class="interwikiLink" href="http://en.wikipedia.org/wiki/Exponential_growth" title="'Exponential_growth' on 'Wikipedia'">},
qq{<a class="interwikiLink" href="https://en.wikipedia.org/wiki/Exponential_growth" title="'Exponential_growth' on 'Wikipedia'">},
Foswiki::Func::renderText(
Foswiki::Func::expandCommonVariables(
"%INCLUDE{\"$this->{other_web}.$otherTopic\" section=\"Exponential growth\"}%"
Expand Down
3 changes: 2 additions & 1 deletion JQueryPlugin/data/System/JQueryPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485233581" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486607275" 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%"}%
| 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. \
- Item14172: jquery.stars width incorrect in modal dialogs. \
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.21';
our $RELEASE = '23 Jan 2017';
our $VERSION = '7.22';
our $RELEASE = '8 Feb 2017';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
9 changes: 5 additions & 4 deletions MailerContrib/data/System/MailerContrib.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1479268930" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486607275" format="1.1" version="1"}%
%META:TOPICPARENT{name="Contribs"}%
---+!! Mailer Contrib
<a href="http://wikiring.com"><img src="%ATTACHURL%/logo.gif" style="float:right" /></a>
Expand Down Expand Up @@ -268,7 +268,8 @@ Many thanks to the following sponsors for supporting this work:

| Copyright &copy;: | 2004, Wind River Systems; 2009-2014 Foswiki Contributors |
| Change History: | |
| 2.83 (15 Nov 2016) | Foswiki 2.1.3 Foswikitask:Item13936: Allow From: address of emails to be separately configured<br />\
| 2.84 (8 Feb 2017) | Foswiki 2.1.3 Minor file permissions changes |
| 2.83 (15 Nov 2016) | Foswikitask:Item13936: Allow From: address of emails to be separately configured<br />\
Foswikitask:Item14216: mailnotify fails with "Wide character in print" |
| 2.82 (14 Jun 2015) | Foswiki 2.0. Foswikitask:Item13423: Perl 5.22 deprecations<br />\
Foswikitask:Item13378: Foswikitask:Item13387: utf-8 foswiki core<br />\
Expand Down Expand Up @@ -312,5 +313,5 @@ 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="logo.gif" attr="h" comment="" date="1479268930" size="11437" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1479268930" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1486607275" size="11437" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1486607275" size="1343" user="ProjectContributor" version="1"}%
5 changes: 3 additions & 2 deletions MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm
View file
Expand Up @@ -28,8 +28,9 @@ use Foswiki::Contrib::MailerContrib::WebNotify ();
use Foswiki::Contrib::MailerContrib::Change ();
use Foswiki::Contrib::MailerContrib::UpData ();

our $VERSION = '2.83';
our $RELEASE = '2.83';
# Also change Version/Release in Plugins/MailerContrib.pm
our $VERSION = '2.84';
our $RELEASE = '2.84';
our $SHORTDESCRIPTION = 'Supports email notification of changes';

# PROTECTED STATIC ensure the contrib is internally initialised
Expand Down
7 changes: 4 additions & 3 deletions MailerContrib/lib/Foswiki/Plugins/MailerContribPlugin.pm
View file
Expand Up @@ -4,8 +4,9 @@ package Foswiki::Plugins::MailerContribPlugin;
use strict;
use warnings;

our $VERSION = '2.82';
our $RELEASE = '2.82';
# Also change Version/Release in Contrib/MailerContrib.pm
our $VERSION = '2.84';
our $RELEASE = '2.84';
our $SHORTDESCRIPTION = 'Supports e-mail notification of changes';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -80,7 +81,7 @@ sub _restNotify {
__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

0 comments on commit 808b583

Please sign in to comment.