diff options
| author | Joey Hess <joey@kitenet.net> | 2012-03-03 17:34:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-03 17:34:46 -0400 |
| commit | 503869ce88eb712d506082b0a80ef447aca0e646 (patch) | |
| tree | 752dcc0d760454d9a0d7cb98152b46bad125e875 | |
| parent | 4b3ce9df72f4c2204156d0705937f36b0e08e155 (diff) | |
| parent | e74bb57eea8d69b9fc1d878ade695e759fed4fb5 (diff) | |
| download | ikiwiki-503869ce88eb712d506082b0a80ef447aca0e646.tar ikiwiki-503869ce88eb712d506082b0a80ef447aca0e646.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
| -rw-r--r-- | doc/plugins/osm.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/provide_inline_diffs_in_recentchanges.mdwn | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/plugins/osm.mdwn b/doc/plugins/osm.mdwn index e41744eb4..040d175ca 100644 --- a/doc/plugins/osm.mdwn +++ b/doc/plugins/osm.mdwn @@ -13,6 +13,8 @@ You will need the [[!cpan XML::Writer]] perl module to write KML files, which is the default mode of operation. GeoJSON files can also be generated if the [[!cpan JSON]] perl module is installed. +This provides the [[ikiwiki/directive/waypoint]] and [[ikiwiki/directive/osm]] directives. + --- The plugin was originally written by diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn index ed9dd85fd..7e95791c6 100644 --- a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn +++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn @@ -13,7 +13,7 @@ It would rock if I could view diffs from the web without going via feeds. I envi > > > > 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...) -> > 3. 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 +> > 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. > > > > 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. |