From: Joey Hess Date: Sat, 8 Aug 2009 16:22:10 +0000 (-0400) Subject: Merge commit 'smcv/ready/getsource' X-Git-Tag: 3.15~18 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/79312b2754571ac80253993217da2b0899086342 Merge commit 'smcv/ready/getsource' Conflicts: debian/changelog --- 79312b2754571ac80253993217da2b0899086342 diff --cc debian/changelog index 50bb0b945,90ec2ddac..e370a33ef --- a/debian/changelog +++ b/debian/changelog @@@ -8,14 -8,7 +8,15 @@@ ikiwiki (3.15) UNRELEASED; urgency=lo * Add further build machinery to generate translated underlays from the po file, for use by wikis whose primary language is not English. * Add Danish basewiki translation by Jonas Smedegaard. + * img: Fix adding of dependency from page to the image. + * pagestats: add `among` parameter, which only counts links from specified + pages (smcv) + * pagestats: when making a tag cloud, don't emit links where the tag is + unused (smcv) + * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm) + * inline: Add pagenames parameter that can be used to list a set of + pages to inline, in a specific order, without using a PageSpec. (smcv) + * Add getsource plugin (Will, smcv) -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400