From: Joey Hess Date: Thu, 14 Nov 2013 00:55:42 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: debian/3.20140102~72 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5ec2d2d40d803ac0288acdcdd5125de6f4c2b769?hp=62483fe5cac6b420d8855b33a06c5dac1f4b2dd9 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index cfcf8a3d9..97ddc4e65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20130904.2) UNRELEASED; urgency=low + + * aggregate: Improve display of post author. + + -- Joey Hess Thu, 05 Sep 2013 10:01:10 -0400 + ikiwiki (3.20130904.1) unstable; urgency=low * Fix cookiejar default setting. diff --git a/doc/bugs/poll_in_inline.mdwn b/doc/bugs/poll_in_inline.mdwn new file mode 100644 index 000000000..f78231f7c --- /dev/null +++ b/doc/bugs/poll_in_inline.mdwn @@ -0,0 +1,4 @@ +When the poll directive appears in an inline, clicking on the button is +supposed to vote and go to the page for that poll. Instead, I see it always +apparantly skip counting my vote, and redirect to the page for that poll. +--[[Joey]] diff --git a/doc/todo/polltrails.mdwn b/doc/todo/polltrails.mdwn new file mode 100644 index 000000000..387ab3fce --- /dev/null +++ b/doc/todo/polltrails.mdwn @@ -0,0 +1,3 @@ +When the poll directive is used on a page in a trail, voting on the poll +should advance to the next page in the trail. This would allow multiple +poll questionairres with a reasonable UI. --[[Joey]] diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl index a89ccfcdf..5a0f6e780 100644 --- a/templates/aggregatepost.tmpl +++ b/templates/aggregatepost.tmpl @@ -12,7 +12,7 @@ [[!meta copyright=""]] -[[!meta author=": "]] +[[!meta author=" ()"]] [[!meta author=""]]