From 70a48576246c62746a7307f434438af0b6e9b755 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 12 Sep 2014 21:50:20 +0100 Subject: [PATCH 1/1] more changelog and bug-closing --- debian/changelog | 8 ++++++++ ...tform__61__no__93____93___doesn__39__t_disable_it.mdwn | 1 + doc/bugs/editing_gitbranch_template_is_really_slow.mdwn | 2 ++ ...sible_to_post_comments_that_will_not_be_displayed.mdwn | 2 ++ doc/bugs/pythonproxy-utf8_again.mdwn | 2 ++ doc/bugs/trails_depend_on_everything.mdwn | 2 ++ doc/todo/upload__95__figure.mdwn | 2 ++ 7 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 59a9e6ba1..e2b5ac523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,14 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium * Don't double-decode CGI submissions with Encode.pm >= 2.53, fixing "Error: Cannot decode string with wide characters". Thanks, Antoine Beaupré + * Avoid making trails depend on everything in the wiki by giving them + a better way to sort the pages + * Don't let users post comments that won't be displayed + * Fix encoding of Unicode strings in Python plugins. + Thanks, chrysn + * 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 -- Simon McVittie Fri, 12 Sep 2014 21:23:58 +0100 diff --git a/doc/bugs/__91____91____33__inline_postform__61__no__93____93___doesn__39__t_disable_it.mdwn b/doc/bugs/__91____91____33__inline_postform__61__no__93____93___doesn__39__t_disable_it.mdwn index 7e7548657..7b97b40b3 100644 --- a/doc/bugs/__91____91____33__inline_postform__61__no__93____93___doesn__39__t_disable_it.mdwn +++ b/doc/bugs/__91____91____33__inline_postform__61__no__93____93___doesn__39__t_disable_it.mdwn @@ -21,3 +21,4 @@ not the actual inlining of pages, but it's a start. --[[smcv]] >> this looks simple, straightforward and good to me --[[chrysn]] +>>> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn index c7d0ffbe2..22733e6fe 100644 --- a/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn +++ b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn @@ -63,3 +63,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/ > `bestlink` is still the single most expensive function in this refresh > at ~ 9.5s, with `match_glob` at ~ 5.2s as the runner-up. > --[[smcv]] + +>> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/possible_to_post_comments_that_will_not_be_displayed.mdwn b/doc/bugs/possible_to_post_comments_that_will_not_be_displayed.mdwn index bb6cd17d3..83d662cbf 100644 --- a/doc/bugs/possible_to_post_comments_that_will_not_be_displayed.mdwn +++ b/doc/bugs/possible_to_post_comments_that_will_not_be_displayed.mdwn @@ -30,3 +30,5 @@ to comments_pagespec && !comments_closed_pagespec && check_canedit --[[smcv]] + +> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/pythonproxy-utf8_again.mdwn b/doc/bugs/pythonproxy-utf8_again.mdwn index cc6d11de7..f068782b4 100644 --- a/doc/bugs/pythonproxy-utf8_again.mdwn +++ b/doc/bugs/pythonproxy-utf8_again.mdwn @@ -66,3 +66,5 @@ patch. >>>> Joey, I think this is [[ready for merge|users/smcv/ready]] even if it >>>> doesn't fix chrysn's bug - it does fix Python 3 support >>>> in general. --[[smcv]] + +>>>>> [[merged|done]] --[[smcv]] diff --git a/doc/bugs/trails_depend_on_everything.mdwn b/doc/bugs/trails_depend_on_everything.mdwn index babb1e361..8e9edcf43 100644 --- a/doc/bugs/trails_depend_on_everything.mdwn +++ b/doc/bugs/trails_depend_on_everything.mdwn @@ -12,3 +12,5 @@ list of pages. They should just sort the pages instead; they'll already have all the dependencies they need. My branch adds `IkiWiki::sort_pages` but does not make it plugin API just yet. --[[smcv]] + +> [[merged|done]] --[[smcv]] diff --git a/doc/todo/upload__95__figure.mdwn b/doc/todo/upload__95__figure.mdwn index d8dd65921..a63e183e8 100644 --- a/doc/todo/upload__95__figure.mdwn +++ b/doc/todo/upload__95__figure.mdwn @@ -18,3 +18,5 @@ Unfortunately, Github shows [[raw code|https://github.com/paternal/ikiwiki/blob/ > > This particular SVG [[looks good to me|users/smcv/ready]] and I've > mirrored it in my own git repo. --[[smcv]] + +>> [[merged|done]] --[[smcv]] -- 2.39.5