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 2011-12-14 17:01:21 -04:00
parent 8eec88bd7c bf127ccb24
commit fbedf85587
7 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn 100644
View File

@ -0,0 +1,4 @@
This is possibly/probably due to my weird setup, which is that I have apache behind nginx, with the result that apache sees the client's IPv4 address as having been mapped to IPv6. i.e. <tt>::ffff:10.11.12.13</tt>. That being the case, I currently need to specify that (with the <tt>::ffff:</tt> prepended) if I want to whitelist (or more importantly blacklist) and IPv4 address.
It strikes me that this is liable to become more of a problem as people finally start using IPv6, so it might be worth ensuring that the code that compares IP addresses be able to treat the two formats (with and without the ffff's) as equivalent. --[[fil]]

1
doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn 100644
View File

@ -0,0 +1 @@
Is it possible to display the recent changes on the main site of the wiki or on a sidebar?

1
doc/ikiwikiusers.mdwn
View File

@ -69,7 +69,6 @@ Projects & Organizations
* [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. * [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
* [Apua IT](http://apua.se/) * [Apua IT](http://apua.se/)
* [PDFpirate Community](http://community.pdfpirate.org/) * [PDFpirate Community](http://community.pdfpirate.org/)
* [Banu](https://banu.com/) uses Ikiwiki for its website, to convert static Markdown pages into PHP scripts which are served along with non-Ikiwiki PHP generated contents. The static contents benefit from use of Ikiwiki's plugins. Ikiwiki is purely used as a CMS and no wiki or web-based editing is allowed. Ikiwiki is run offline, and the resulting scripts are uploaded using rsync to the website.
* [Software in the Public Interest](http://spi-inc.org/) * [Software in the Public Interest](http://spi-inc.org/)
* [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/) * [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/)
* [The FreedomBox Foundation](http://www.freedomboxfoundation.org/) * [The FreedomBox Foundation](http://www.freedomboxfoundation.org/)

2
doc/index.mdwn
View File

@ -14,7 +14,7 @@ with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins
and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
discussions. discussions.
All wikis are supposed to have a [[SandBox]], so this one does too. All wikis are supposed to have a [[sandbox]], so this one does too.
This site generally runs the latest release of ikiwiki; currently, it runs This site generally runs the latest release of ikiwiki; currently, it runs
ikiwiki [[!version ]]. ikiwiki [[!version ]].

2
doc/plugins/contrib/pandoc.mdwn
View File

@ -2,5 +2,5 @@
This plugin enables Markdown processing using [Pandoc](http://johnmacfarlane.net/pandoc/). You can configure it for Pandoc to take over processing of all .mkdn files, or only files with a different extension. Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. This plugin enables Markdown processing using [Pandoc](http://johnmacfarlane.net/pandoc/). You can configure it for Pandoc to take over processing of all .mkdn files, or only files with a different extension. Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX.
This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at <https://github.com/profjim/pandoc-iki>. This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at <https://github.com/dubiousjim/pandoc-iki>.

3
doc/tips/laptop_wiki_with_git/discussion.mdwn
View File

@ -10,3 +10,6 @@ Or, was this last remark about rebuilding after pulling meant to apply to rebuil
> Of course you don't need a web server on the laptop. It is useful for > Of course you don't need a web server on the laptop. It is useful for
> previewing pages before publishing them though. --[[Joey]] > previewing pages before publishing them though. --[[Joey]]
I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?)
[[Micheal]]

3
doc/todo/websetup_should_link_to_plugin_descriptions.mdwn 100644
View File

@ -0,0 +1,3 @@
A [[wishlist]] item.
It would be nice if the websetup plugin could link to plugin descriptions. When it refers to a plugin by name, the name could be a link to <http://ikiwiki.info/plugins/$NAME/> (or other suitable location). --liw