From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Jul 2012 17:50:07 +0000 (-0400)
Subject: recentchangesdiff: When diffurl is not set, provide inline diffs in the recentchanges... 
X-Git-Tag: 3.20120725~65
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7f883f520356fd1d70cf83677b9a5aabd0554262

recentchangesdiff: When diffurl is not set, provide inline diffs in the recentchanges page, with visibility toggleable via javascript. Thanks, Antoine Beaupré
---

diff --git a/debian/changelog b/debian/changelog
index ce2ec060a..3a98ed339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20120630) UNRELEASED; urgency=low
+
+  * recentchangesdiff: When diffurl is not set, provide inline diffs
+    in the recentchanges page, with visibility toggleable via javascript.
+    Thanks, Antoine Beaupré
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
+
 ikiwiki (3.20120629) unstable; urgency=low
 
   * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
diff --git a/doc/plugins/recentchangesdiff.mdwn b/doc/plugins/recentchangesdiff.mdwn
index 57299f92d..660a430b9 100644
--- a/doc/plugins/recentchangesdiff.mdwn
+++ b/doc/plugins/recentchangesdiff.mdwn
@@ -2,6 +2,8 @@
 [[!tag type/meta]]
 
 This plugin extends the [[recentchanges]] plugin, adding a diff for each
-change. The diffs are by default hidden from display on the recentchanges
-page, but will display in its feeds. The [[rcs]] must have implemented
-support for the `rcs_diff()` function for any diffs to be generated.
+change. The diffs can be toggled on the recentchanges page (requires
+javascript), and are also included in its feeds.
+
+The [[rcs]] must have implemented support for the `rcs_diff()` function for
+any diffs to be generated.
diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
index 98e8663fa..3bf1bdc33 100644
--- a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
+++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
@@ -22,4 +22,6 @@ It would rock if I could view diffs from the web without going via feeds. I envi
 
 > > > I have pushed a new version of this patch to my branch, which fixes all the above issues. I think this is ready to be merged now. -- [[anarcat]] 2012-07-19
 
+>>>> [[done]] --[[Joey]] 
+
 [[!tag wishlist patch]]