Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6d333a8438fbff96ad106d53fd611480b00798f0..582a8e36ae15ea13f62294474963b030ad8d45f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,31 @@
-ikiwiki (3.20100927) UNRELEASED; urgency=low
+ikiwiki (3.20101112) unstable; urgency=HIGH
+
+  * txt: Fix display when used inside a format directive.
+  * highlight: Ensure that other, more-specific format plugins,
+    like txt are used in preference to this one in case of ties.
+  * htmltidy, sortnaturally: Add missing checkconfig hook
+    registration. Closes: #601912
+    (Thanks, Craig Lennox and Tuomas Jormola)
+  * git: Use author date, not committer date. Closes: #602012
+    (Thanks, Tuomas Jormola)
+  * Fix htmlscrubber_skip to be matched on the source page, not the page it is
+    inlined into. Should allow setting to "* and !comment(*)" to scrub
+    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
+  * comments: Make postcomment() pagespec work when previewing a comment,
+    including during moderation. CVE-2010-1673
+  * comments: Make comment() pagespec also match comments that are being
+    posted. CVE-2010-1673
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
+
+ikiwiki (3.20101023) unstable; urgency=low
+
+  * Fix typo that broke anonymous git push.
+  * Fix web reversion when the srcdir is in a subdir of the git repo.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 16:36:50 -0400
+
+ikiwiki (3.20101019) unstable; urgency=low
 
   * Fix test suite failure on other side of date line.
   * htmltidy: Allow configuring tidy parameters in setup file.
@@ -12,8 +39,14 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
   * actiontabs: More consistent styling of Hn tags.
   * websetup: Fix saving of advanced mode changes.
   * websetup: Fix defaults of checkboxes in advanced mode.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
+  * monotone: Fix recentchanges page when the srcdir is not at the top
+    of the monotone workspace. Thanks, tommyd.
+  * img: If a class is specified, don't also put the img in the img
+    class.
+  * auto-blog.setup: Don't enable opendiscussion by default; require users be
+    logged in to post comments.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 19 Oct 2010 02:32:23 -0400
 
 ikiwiki (3.20100926) unstable; urgency=low