From: Simon McVittie Date: Fri, 12 Sep 2014 21:02:54 +0000 (+0100) Subject: more bug-closing X-Git-Tag: 3.20140916~40 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fdfd5ffac7fc3f43868b36b68bf39f7a8c3ab3ed?ds=sidebyside;hp=9be3f951166e5d1256a806a8db25b7c5c7021acb more bug-closing --- diff --git a/debian/changelog b/debian/changelog index e2b5ac523..611e51843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,13 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium * Improve performance and correctness of the [[!if]] directive * Let [[!inline rootpage=foo postform=no]] disable the posting form * Switch default [[!man]] shortcut to manpages.debian.org. Closes: #700322 + * Add UUID and TIME variables to edittemplate. Closes: #752827 + Thanks, Jonathon Anderson + * Display pages in linkmaps as their pagetitle (no underscore escapes). + Thanks, chrysn + * Fix aspect ratio when scaling small images, and add support for + converting SVG and PDF graphics to PNG. + Thanks, chrysn -- Simon McVittie Fri, 12 Sep 2014 21:23:58 +0100 diff --git a/doc/bugs/image_rescaling_distorts_with_small_pictures.mdwn b/doc/bugs/image_rescaling_distorts_with_small_pictures.mdwn index 6425c1ece..9ce091e15 100644 --- a/doc/bugs/image_rescaling_distorts_with_small_pictures.mdwn +++ b/doc/bugs/image_rescaling_distorts_with_small_pictures.mdwn @@ -47,3 +47,5 @@ If you use the rescaling feature of the directive [[ikiwiki/directive/img/]] wit >>> in my copy of the branch. >>> >>> --[[smcv]] + +>>>> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/linkmap_displays_underscore_escapes.mdwn b/doc/bugs/linkmap_displays_underscore_escapes.mdwn index 14164d076..16080358b 100644 --- a/doc/bugs/linkmap_displays_underscore_escapes.mdwn +++ b/doc/bugs/linkmap_displays_underscore_escapes.mdwn @@ -33,3 +33,5 @@ the patch is stored in [[the patch.pl]] as created by git-format-patch, and can be pulled from the abovementioned branch. > update 2014-06-29: branch still merges cleanly and works. --[[chrysn]] + +>> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/svg_and_pdf_conversion_fails.mdwn b/doc/bugs/svg_and_pdf_conversion_fails.mdwn index ac18fe8aa..9910959f9 100644 --- a/doc/bugs/svg_and_pdf_conversion_fails.mdwn +++ b/doc/bugs/svg_and_pdf_conversion_fails.mdwn @@ -56,3 +56,5 @@ should be safe for inclusion. >>> which works, so my biggest fear about the all-to-png change is unwarranted. >>> i'll have a look at that some time, but i think as things are, this is >>> ready now, please review again. --[[chrysn]] + +>>>> [[merged|done]] --[[smcv]] diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn index e5a8d0ab9..6d702fedf 100644 --- a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn +++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn @@ -83,3 +83,5 @@ Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagesp >>>>> almost 5 years ago. Branch replaced by `smcv/ready/edittemplate2` >>>>> which drops `formatted_time` and `html_time`, and adds a suggestion >>>>> to use `\[[!date]]`. --[[smcv]] + +>>>>>> [[merged|done]] --[[smcv]]