handle git-notes breakage

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index bccb8b797dbda23e9711f2f4c1bd802a20e05500..6fbbe0a238a7e209f7e222e72bde95d46f87a972 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,22 @@
-ikiwiki (3.20100102.3) 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)
+  * websetup: Fix utf-8 problems.
+  * websetup: Fix bug in array change detection.
+  * linkmap: Simplify and improve browser compatability by using an img, 
+    not object tag.
+  * git: The new git-notes feature in git 1.6.6 changes git log output
+    in a way that broke ikiwiki's parser if notes are added to commits.
+    Deal with this.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+
+ikiwiki (3.20100102.3) unstable; urgency=low

 
   Happy palindrome day!
 
 
   Happy palindrome day!
 


@@ -20,7 +38,7 @@ ikiwiki (3.20100102.3) UNRELEASED; urgency=low
     the discussionpage setting. Specifically, fixes discussion actions
     on discussion pages, and unbreaks the opendiscussion plugin.
 
     the discussionpage setting. Specifically, fixes discussion actions
     on discussion pages, and unbreaks the opendiscussion plugin.
 

- -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Jan 2010 21:46:16 -0500

 
 ikiwiki (3.20091218) unstable; urgency=low
 
 
 ikiwiki (3.20091218) unstable; urgency=low
 


@@ -247,7 +265,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)

-  * po: New plugin<F11>, suporting translation of wiki pages using po files.
+  * po: New plugin, suporting translation of wiki pages using po files.

     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from