urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2012-07-19 13:48:56 -04:00
parent 9cab856ed7 9fb6451ef9
commit 56de5b2d89
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/todo/provide_inline_diffs_in_recentchanges.mdwn
View File

@ -11,13 +11,15 @@ It would rock if I could view diffs from the web without going via feeds. I envi
> >
> > Unfortunately it has some issues:
> >
> > 1. it assumes the toggle.js code is loaded somehow
> > 2. if the toggle code isn't loaded the diffs are displayed (which is arguably better than showing nothing since we ship the diff to the UA anyways...)
> > 1. <del>it assumes the toggle.js code is loaded somehow</del> - now loaded manually
> > 2. <del>if the toggle code isn't loaded the diffs are displayed (which is arguably better than showing nothing since we ship the diff to the UA anyways...)</del> - i actually think that's fine
> > 3. <del>it will show only if there's a revert URL, which is backwards, but otherwise the display is weird, with each button on its own line</del> fixed!
> > 4. if the diffurl parameter is set in the template, we'd actually see two sets of glasses, which is silly.
> > 4. <del>if the diffurl parameter is set in the template, we'd actually see two sets of glasses, which is silly.</del> - just added a tmp_unless to fix this.
> >
> > I feel this should nevertheless be implemented because if we're going to compile all this crap in the page anyways and send it to the client, why not allow the user to show it? I also feel that showing it by default is a lesser evil for non-javascript users.
> >
> > -- [[anarcat]] 2012-03-03
> > > 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
[[!tag wishlist patch]]

30
doc/users/anarcat.mdwn
View File

@ -1 +1,31 @@
See <https://wiki.koumbit.net/TheAnarcat>
[[!toc]]
My todos
========
... or the ones I commented it, to be more precise.
[[!inline pages="todo/* and !todo/done and !link(todo/done) and
link(users/anarcat) and !todo/*/*" feeds=no actions=yes archive=yes show=0]]
Done
----
[[!inline pages="todo/* and !todo/done and link(todo/done) and
link(users/anarcat) and !todo/*/*" feeds=no actions=yes archive=yes show=0]]
My bugs
=======
... same.
[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
link(users/anarcat) and !bugs/*/*" feeds=no actions=yes archive=yes show=0]]
Fixed
-----
[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
link(users/anarcat) and !bugs/*/*" feeds=no actions=yes archive=yes show=0]]