Merge branch 'bugfix'

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

diff --git a/debian/changelog b/debian/changelog
index ecd028a0c92214ee1f4d92766e33b5ca81f62427..ec85743a7ad82f0541967ef0e3a521c8467500f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,29 @@
-ikiwiki (3.20101113) UNRELEASED; urgency=low
+ikiwiki (3.20101201) unstable; urgency=low
+
+  * meta: Fix calling of htmlscrubber to pass the page parameter.
+    The change of the htmlscrubber to look at page rather than destpage
+    caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 01 Dec 2010 20:28:01 -0400
+
+ikiwiki (3.20101130) UNRELEASED; urgency=low
+
+  * Better support for serving the same site on multiple urls. (Such as
+    a http and a https url, or a ipv4 and an ipv6 url.)
+    (Thanks, smcv)
+  * API: urlto without a defined second parameter now generates an url
+    that starts with "/" (when possible; eg when the site's url and cgiurl
+    are on the same domain).
+  * Now when users log in via https, ikiwiki sends a secure cookie, that can
+    only be used over https. If the user switches to using http, they will
+    need to re-login. (smcv)
+  * meta: Fix calling of htmlscrubber to pass the page parameter.
+    The change of the htmlscrubber to look at page rather than destpage
+    caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
+
+ikiwiki (3.20101129) unstable; urgency=low

 
   * websetup: Fix encoding problem when restoring old setup file.
   * more: Add pages parameter to limit where the more is displayed.
 
   * websetup: Fix encoding problem when restoring old setup file.
   * more: Add pages parameter to limit where the more is displayed.


@@ -11,8 +36,15 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
   * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
   * highlight: Support new format of filetypes.conf used by version 3.2
     of the highlight package.
   * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
   * highlight: Support new format of filetypes.conf used by version 3.2
     of the highlight package.

-
- -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+  * edittemplate: Fix crash if using a .tmpl file or other non-page file
+    as a template for a new page.
+  * git: Fix temp file location.
+  * rename: Fix to pass named parameters to rcs_commit.
+  * git: Avoid adding files when committing, so as not to implicitly add
+    files like recentchanges files that are not normally checked in,
+    when fixing links after rename.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 13:59:10 -0400

 
 ikiwiki (3.20101112) unstable; urgency=HIGH
 
 
 ikiwiki (3.20101112) unstable; urgency=HIGH