From: intrigeri Date: Thu, 21 May 2009 07:15:55 +0000 (+0200) Subject: Merge commit 'upstream/master' into pub/po X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/df6f6a1d53493de0ee4f451220b8c8d34af6642a?hp=-c Merge commit 'upstream/master' into pub/po --- df6f6a1d53493de0ee4f451220b8c8d34af6642a diff --combined debian/changelog index c684565c5,c0a4afbc8..4e1aa8545 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,3 +1,12 @@@ +ikiwiki (3.14) UNRELEASED; 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 Mon, 20 Apr 2009 19:40:25 -0400 + ikiwiki (3.13) UNRELEASED; urgency=low * ikiwiki-transition: If passed a nonexistant srcdir, or one not @@@ -18,6 -9,8 +18,8 @@@ * Allow curly braces to be used in pagespecs, and avoid a whole class of potential security problems, by avoiding performing any string interpolation on user-supplied data when translating pagespecs. + * ikiwiki-transition: Allow setup files to be passed to all subcommands + that need a srcdir. -- Joey Hess Wed, 06 May 2009 20:45:44 -0400