close

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ee6f9adfb019cb3e736f10dda624769f0c5b5fa3..4f7c1a60ccfe59cac215bef7e7f312410908cad2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,17 @@
-ikiwiki (3.20091219) UNRELEASED; urgency=low
+ikiwiki (3.20100104) UNRELEASED; urgency=low
+
+  * inline: Avoid showing edit links if page editing is disabled.
+    (Sjoerd)
+  * signinedit: Auto-disable the plugin when all authentication methods
+    are disabled.
+  * comments: Fix permalinks for comments using new conflict-free filenames.
+  * img: Support alignment of images with captions. (Giuseppe Bilotta)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+
+ikiwiki (3.20100102.3) unstable; urgency=low
+
+  Happy palindrome day!
 
   * pagestats: Add show parameter. Closes: #562129 (David Paleino)
   * toc: Add startlevel parameter. (kerravonsen)
@@ -8,8 +21,17 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low
     can be generated at any time using ikiwiki --dumpsetup so I do
     not see a reason to ship it. Closes: #562183
   * Use env hack in python scripts.
-
- -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
+  * comments: Add a checksum to the name of comment pages, to
+    avoid merge conflicts when comments are posted to two branches of a
+    site.
+  * linkmap: Add option to omit disconnected pages from the map.
+  * inline: Fix bug that limited displayed pages when feedshow was
+    specified w/o show.
+  * Fix several places that did not properly handle capitalization of
+    the discussionpage setting. Specifically, fixes discussion actions
+    on discussion pages, and unbreaks the opendiscussion plugin.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Jan 2010 21:46:16 -0500
 
 ikiwiki (3.20091218) unstable; urgency=low