diff options
| author | Peter Gammie <peteg42@gmail.com> | 2010-09-30 16:13:56 +1000 |
|---|---|---|
| committer | Peter Gammie <peteg42@gmail.com> | 2010-09-30 16:13:56 +1000 |
| commit | ce411663cf4ecb62c395451ef4457f3c7a90ce4e (patch) | |
| tree | c2392e01a505da7a2e30de4c357cac39f3a72663 | |
| parent | 941755e46661b65f29aeebcf38f8410f9c8cfc2e (diff) | |
| parent | e65ce4f0937eaf622846c02a9d39fa7aebe4af12 (diff) | |
Merge branch 'joey' into revert
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/plugins/contrib/imailhide.mdwn | 9 | ||||
| -rwxr-xr-x | t/pagespec_match.t | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a26a35617..527dd7884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * meta: Ensure that the url specified by xrds-location is absolute. diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 3aacef57a..6009aa012 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -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]] -# Mailhide plugin for Ikiwiki +# Mailhide Plugin for Ikiwiki This plugin provides the directive mailhide, that uses the [Mailhide 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 `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/ [2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide [3]: http://github.com/petervizi/imailhide [4]: http://www.google.com/recaptcha/mailhide/apikey [5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html +[6]: http://github.com/petervizi/imailhide/issues#issue/1 diff --git a/t/pagespec_match.t b/t/pagespec_match.t index fe9624370..a37b06e8e 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -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("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{bar}=1154532695; # after ok(pagespec_match("foo", "created_before(bar)")); |