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 b8a6c8c88149d238e5f9f12f10c02fd5060ed6c3..1f73523a4af65737337f5c667297c596c449942a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+ikiwiki (3.20110329) UNRELEASED; urgency=low
+
+  * meta: Allow adding javascript to pages. Only when htmlscrubber is
+    disabled, naturally. (Thanks, Giuseppe Bilotta)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 13:08:23 -0400
+
+ikiwiki (3.20110328) unstable; urgency=low
+
+  * Yaml formatted setup files are now produced by default.
+    (Perl formatted setup files can still be used.)
+  * Add timezone setting in setup file. This alows time zone to be configured
+    via the web.
+  * comment: Better fix to avoid showing comments of subpages, while
+    not breaking manual inlining of comments.
+  * meta: Security fix; don't allow alternative stylesheets to be added
+    on pages where the htmlscrubber is enabled.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 12:23:26 -0400
+
 ikiwiki (3.20110321) unstable; urgency=low
 
   * comment: Don't show comments of subpages on parent pages.