recentchangesdiff: When diffurl is not set, provide inline diffs in the recentchanges...

diff --git a/debian/changelog b/debian/changelog
index ce2ec060a09a2a5d3eabc5d0f39852bb2a5478fb..3a98ed3397cf40168e7bb95e88984ff9e84ed36e 100644 (file)
--- 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 57299f92dd17c0e2fc9e9ac236cdc7a2ca90090d..660a430b956f4848191d19588624317f0e3d970e 100644 (file)
--- 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 98e8663fa0655c016d366bb82c348079423faaee..3bf1bdc33ea56fea6a59d7955d68be8c6f04db78 100644 (file)
--- 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]]