Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index a514c42d9f30aafdb9dc3093aac5197d6f82f2a3..9085d97cb6c0167186faaf220b9949ea5b857f73 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-ikiwiki (2.41) UNRELEASED; urgency=low
+ikiwiki (2.42) UNRELEASED; urgency=low
+
+  * aggregate: Correct a mistake in the code that dummy up a guid for feeds
+    lacking one.
+  * inline: Correct handling of urls relative to baseurl in feeds.
+  * Fix CSRF attacks against the preferences and edit forms. The fix involved
+    embedding the session id in the forms, and not allowing the forms to be
+    submitted if the embedded id does not match the session id. Closes: #475445
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 03 Apr 2008 02:35:39 -0400
+
+ikiwiki (2.41) unstable; urgency=low
 
   [ Adeodato Simó ]
   * Preprocessor directives generated by the shortcut plugin accept a `desc`
@@ -63,8 +74,11 @@ ikiwiki (2.41) UNRELEASED; urgency=low
     a special sentinal value.
   * inline: Allow the "feedshow" parameter to take values greater than the
     value for "show".
+  * Added a hardlink option in the setup file, useful if the source and
+    dest are on the same filesystem and the wiki includes large media files,
+    which would normally be copied, wasting time and space.
 
- -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100
+ -- Joey Hess <joeyh@debian.org>  Sat, 29 Mar 2008 21:07:22 -0400
 
 ikiwiki (2.40) unstable; urgency=low