From: Joey Hess Date: Sun, 19 Jul 2009 10:36:01 +0000 (+0200) Subject: Merge branch 'master' into po X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/ec965fc92cd41f597c6e8e88584b9a688407c8c6 Merge branch 'master' into po Conflicts: debian/changelog --- ec965fc92cd41f597c6e8e88584b9a688407c8c6 diff --cc debian/changelog index d72efe455,05b7be70f..dffab5349 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,22 +1,31 @@@ - ikiwiki (3.15) UNRELEASED; urgency=low ++ikiwiki (3.15) unstable; urgency=low ++ ++ * Add new hooks: canremove, canrename, rename. (intrigeri) ++ * rename: Refactor subpage rename handling code into rename hook. (intrigeri) ++ * po: New plugin, suporting translation of wiki pages using po files. ++ (intrigeri) ++ ++ -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 ++ + ikiwiki (3.14159) unstable; urgency=low + + * svn: Fix rcs_rename to properly scope call to dirname. + * img: Pass the align parameter through to the generated img tag. + * Move OpenID pretty-printing from openid plugin to core (smcv) + + -- Joey Hess Thu, 16 Jul 2009 14:37:22 -0400 + + ikiwiki (3.1415) unstable; urgency=low + + * img: Fix extra double quote with alt text. (smcv) + * Updated French debconf templates translation. Closes: #535103 + * openid: Support Net::OpenID 2.x when pretty-printing + openids. (smcv) + * highlight: Fix utf-8 encoding bug. Closes: #535028 + + -- Joey Hess Tue, 07 Jul 2009 16:25:05 -0400 + + ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" form, and document the comment directive syntax.