Merge remote branch 'smcv/ready/sslcookie-auto'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6f97399d8d1e9474e9d74cff4c252422729c209a..ec995a08aaa731d599badc17b720d8bbe59ca4f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-ikiwiki (3.20101113) UNRELEASED; urgency=low
+ikiwiki (3.20101130) UNRELEASED; urgency=low
+
+  * Better support for serving the same site by both http and https.
+    Links generated by the CGI will now remain on https if it was accessed
+    via https.
+    (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).
+
+ -- 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.
@@ -14,8 +26,12 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
   * 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>  Tue, 16 Nov 2010 14:23:47 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 13:59:10 -0400
 
 ikiwiki (3.20101112) unstable; urgency=HIGH