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 e78ce3e1c185ae69de25e13bfc15ccabe6f6abc8..1f73523a4af65737337f5c667297c596c449942a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ikiwiki (3.20110322) UNRELEASED; urgency=low
+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.)
@@ -6,8 +13,10 @@ ikiwiki (3.20110322) UNRELEASED; urgency=low
     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>  Thu, 24 Mar 2011 13:34:34 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 12:23:26 -0400
 
 ikiwiki (3.20110321) unstable; urgency=low