aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-19 12:36:01 +0200
committerJoey Hess <joey@gnu.kitenet.net>2009-07-19 12:36:01 +0200
commitec965fc92cd41f597c6e8e88584b9a688407c8c6 (patch)
tree410173c14f66ae62a6436ea00b73bb470c9d1dda /debian
parent86edd73d169600875a10a635ef8df4a644545b0d (diff)
parentfa2c3a3dba2a4589b63cf445ec9e33ec19be627e (diff)
downloadikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar
ikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar.gz
Merge branch 'master' into po
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog45
1 files changed, 38 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index d72efe455..dffab5349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,31 @@
-ikiwiki (3.15) UNRELEASED; urgency=low
+ikiwiki (3.15) unstable; urgency=low
+
+ * Add new hooks: canremove, canrename, rename. (intrigeri)
+ * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
+ * po: New plugin, suporting translation of wiki pages using po files.
+ (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400
+
+ikiwiki (3.14159) unstable; urgency=low
+
+ * svn: Fix rcs_rename to properly scope call to dirname.
+ * img: Pass the align parameter through to the generated img tag.
+ * Move OpenID pretty-printing from openid plugin to core (smcv)
+
+ -- Joey Hess <joeyh@debian.org> Thu, 16 Jul 2009 14:37:22 -0400
+
+ikiwiki (3.1415) unstable; urgency=low
+
+ * img: Fix extra double quote with alt text. (smcv)
+ * Updated French debconf templates translation. Closes: #535103
+ * openid: Support Net::OpenID 2.x when pretty-printing
+ openids. (smcv)
+ * highlight: Fix utf-8 encoding bug. Closes: #535028
+
+ -- Joey Hess <joeyh@debian.org> Tue, 07 Jul 2009 16:25:05 -0400
+
+ikiwiki (3.141) unstable; urgency=low
* comment: Make comment directives no longer use the internal "_comment"
form, and document the comment directive syntax.
@@ -18,12 +45,16 @@ ikiwiki (3.15) UNRELEASED; urgency=low
name, to support several cases including mercurial's long user
names on the RecentChanges page, and urls with spaces being handled
by the 404 plugin.
- * Add new hooks: canremove, canrename, rename. (intrigeri)
- * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
- * po: New plugin, suporting translation of wiki pages using po files.
- (intrigeri)
-
- -- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400
+ * Optimise use of gettext, and avoid ugly warnings if Locale::gettext
+ is not available. Closes: #532285
+ * meta: Add openid delegate parameter to allow delegating only
+ openid or openid2.
+ * Disable the Preferences link if no plugin with an auth hook is enabled.
+ * Updated French translation. Closes: #532654
+ * aggregate: Fix storing of changed md5.
+ * aggregate: Avoid resetting ctime when an item md5 changes.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 12 Jun 2009 19:50:46 -0400
ikiwiki (3.14) unstable; urgency=low