From: Joey Hess Date: Wed, 17 Dec 2008 19:06:57 +0000 (-0500) Subject: Merge branch 'master' into comments X-Git-Tag: 2.71~78 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/613a54a3cb48ff0bd00c02d44304ce08b6725343?ds=sidebyside;hp=-c Merge branch 'master' into comments --- 613a54a3cb48ff0bd00c02d44304ce08b6725343 diff --combined debian/changelog index 727447023,8f5783208..b884dd596 --- a/debian/changelog +++ b/debian/changelog @@@ -1,6 -1,5 +1,6 @@@ ikiwiki (2.71) UNRELEASED; urgency=low + * comments: Blog-style comment support, contributed by Simon McVittie. * htmlbalance: New plugin contributed by Simon McVittie. * Change deb dependencies to list Text::Markdown before markdown (really this time). @@@ -16,6 -15,9 +16,9 @@@ generated. * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect. * htmlbalance: don't compact whitespace, and set misc other options (smcv) + * rename: Fix double-escaping of page name in edit box. + * monotone: When getting the log, tell monotone how many entries + we want, rather than closing the pipe, which it dislikes. (thm) -- Joey Hess Mon, 17 Nov 2008 14:02:10 -0500