From: Joey Hess Date: Fri, 7 May 2010 16:42:38 +0000 (-0400) Subject: Merge branch 'master' into commentreorg X-Git-Tag: 3.20100515~75 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=3adb47ec4f7374128d18a88cff54269104fc21fe Merge branch 'master' into commentreorg Conflicts: debian/changelog --- 3adb47ec4f7374128d18a88cff54269104fc21fe diff --cc debian/changelog index 5b51a74f9,31d64e237..7f024a84b --- a/debian/changelog +++ b/debian/changelog @@@ -4,14 -4,12 +4,20 @@@ ikiwiki (3.20100505) UNRELEASED; urgenc a single template, page.tmpl. * If you have a locally customised page.tmpl, it needs to be updated to set when BASEURL or FORCEBAREURL is set. + * comments: Comments pending moderation are now stored in the srcdir + alongside accepted comments, but with a `._comment_pending` extension. + * This allows easier byhand moderation, as the "_pending" need + only be stripped off and the comment be committed to version control. + * The `comment_pending()` pagespec can be used to match such unmoderated + comments, which makes it easy to add a feed of them, or a counter + indicating how many there are. + * Belatedly added a `comment()` pagespec. + * Gave comment and page editing forms some CSS and accessability love. + * Renamed postscan hook to indexhtml, to reflect its changed position, + and typical use. + * inline: Call indexhtml when inlining internal pages, so their + text can be indexed for searching. + * Delete hooks are passed deleted internal pages. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400