urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'joey' into revert

master
Peter Gammie 2010-09-30 16:13:56 +10:00
parent 941755e466 e65ce4f093
commit ce411663cf
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ikiwiki (3.20100927) UNRELEASED; urgency=low
* Fix test suite failure on other side of date line.
-- Joey Hess <joeyh@debian.org> Wed, 29 Sep 2010 11:58:23 -0400
ikiwiki (3.20100926) unstable; urgency=low ikiwiki (3.20100926) unstable; urgency=low
* meta: Ensure that the url specified by xrds-location is absolute. * meta: Ensure that the url specified by xrds-location is absolute.

9
doc/plugins/contrib/imailhide.mdwn
View File

@ -1,7 +1,7 @@
[[!template id=plugin name=imailhide author="Peter Vizi"]] [[!template id=plugin name=imailhide author="Peter_Vizi"]]
[[!tag type/widget type/html]] [[!tag type/widget type/html]]
# Mailhide plugin for Ikiwiki # Mailhide Plugin for Ikiwiki
This plugin provides the directive mailhide, that uses the [Mailhide This plugin provides the directive mailhide, that uses the [Mailhide
API][1] to protect email addresses from spammers. API][1] to protect email addresses from spammers.
@ -53,8 +53,13 @@ will result in `joh<a href="...">...</a>@example.com`.
*Optional.* You can set the style parameter individually for each *Optional.* You can set the style parameter individually for each
`mailhide` call. See `mailhide_default_style` for details. `mailhide` call. See `mailhide_default_style` for details.
## Known Issues
1. [opening new window when displaying email address][6]
[1]: http://www.google.com/recaptcha/mailhide/ [1]: http://www.google.com/recaptcha/mailhide/
[2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide [2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide
[3]: http://github.com/petervizi/imailhide [3]: http://github.com/petervizi/imailhide
[4]: http://www.google.com/recaptcha/mailhide/apikey [4]: http://www.google.com/recaptcha/mailhide/apikey
[5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html [5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html
[6]: http://github.com/petervizi/imailhide/issues#issue/1

1
t/pagespec_match.t
View File

@ -101,6 +101,7 @@ ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success
ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success"); ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success"); ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success");
$ENV{TZ}="GMT";
$IkiWiki::pagectime{foo}=1154532692; # Wed Aug 2 11:26 EDT 2006 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug 2 11:26 EDT 2006
$IkiWiki::pagectime{bar}=1154532695; # after $IkiWiki::pagectime{bar}=1154532695; # after
ok(pagespec_match("foo", "created_before(bar)")); ok(pagespec_match("foo", "created_before(bar)"));