prep release

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e7856c01b7d90886f46824b0f4e165b951e5cc62..41559ea37933166fb9cf26941479ae2cb57cace0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20130904.2) UNRELEASED; urgency=low
+ikiwiki (3.20140125) unstable; urgency=medium
+
+  * inline: Allow overriding the title of the feed. Closes: #735123
+    Thanks, Christophe Rhodes
+  * osm: Escape name parameter. Closes: #731797
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 25 Jan 2014 16:40:32 -0400
+
+ikiwiki (3.20140102) unstable; urgency=low
 
   * aggregate: Improve display of post author.
   * poll: Fix behavior of poll buttons when inlined.
@@ -10,8 +18,20 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
     refresh by querying git to find the files that were changed, rather
     than looking at the work tree. Not enabled by default as it can
     break some setups where not all files get committed to git.
-
- -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400
+  * comments: Write pending moderation comments to the transient underlay
+    to avoid conflict with only_committed_changes.
+  * search: Added google_search option, which makes it search google
+    rather than using the internal xapain database.
+    (googlesearch plugin is too hard to turn on when xapain databases
+    corrupt themselves, which happens all too frequently).
+  * osm: Remove invalid use of charset on embedded javascript tags.
+    Closes: #731197
+  * style.css: Add compatibility definitions for more block-level
+    html5 elements. Closes: #731199
+  * aggregrate: Fix several bugs in handling of empty and colliding
+    titles when generating filenames.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Jan 2014 12:22:22 -0400
 
 ikiwiki (3.20130904.1) unstable; urgency=low