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

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

master
Joey Hess 2010-10-08 19:32:20 -04:00
parent 59ea972fc9 7aba3bd746
commit 726270ad00
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/ikiwiki/directive/aggregate/discussion.mdwn 100644
View File

@ -0,0 +1,3 @@
It would be awesome if table could aggregrate remote CSVs too. I want something like:
!table file="http://cyclehireapp.com/cyclehirelive/cyclehire.csv"

2
doc/news/openid.mdwn
View File

@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
OpenID, and see how OpenID works for you. And let me know your feelings about
making such a switch. --[[Joey]]
[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]]
[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]]

3
doc/templates/discussion.mdwn vendored
View File

@ -7,6 +7,9 @@ note and popups are templates? But they're not in the templates directory, and i
> installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
> --[[Joey]]
> > And how am I able to use e.g. links? It's not listed in `/usr/share/ikiwiki/basewiki/templates`.
> > I intend do (mis)use links for a horizontal navigation. Or may I be better off altering page.tmpl?
> > --z3ttacht
Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki?

2
doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
View File

@ -21,4 +21,6 @@ and decided this time it was really needed to implement this feature.
--[[intrigeri]]
> Ping. --[[intrigeri]]
[[!tag patch]]