From ed8df876a97d5a912844a36bd39ea005241e5feb Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sat, 10 Dec 2011 16:14:06 -0400 Subject: [PATCH 01/15] --- doc/tips/laptop_wiki_with_git/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/tips/laptop_wiki_with_git/discussion.mdwn b/doc/tips/laptop_wiki_with_git/discussion.mdwn index 6ce72ae7b..297a2a6a7 100644 --- a/doc/tips/laptop_wiki_with_git/discussion.mdwn +++ b/doc/tips/laptop_wiki_with_git/discussion.mdwn @@ -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 > 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]] From 6d707f6bafc09908c14cb9d986fc6e9e951e642a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkq11bTnmln5O-k-utYZYK8N9TzG3T1THk" Date: Sat, 10 Dec 2011 21:24:18 -0400 Subject: [PATCH 02/15] --- doc/plugins/contrib/pandoc.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/pandoc.mdwn b/doc/plugins/contrib/pandoc.mdwn index c8e2e9a94..264aafd95 100644 --- a/doc/plugins/contrib/pandoc.mdwn +++ b/doc/plugins/contrib/pandoc.mdwn @@ -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 is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . +This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . From c3f86eaf97e6138626731a82c869e392a8f7f38b Mon Sep 17 00:00:00 2001 From: "https://mukund.startssl.com/" Date: Sat, 10 Dec 2011 21:29:48 -0400 Subject: [PATCH 03/15] Remove Banu (as it no longer uses Ikiwiki) --- doc/ikiwikiusers.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 977641b40..342d1494d 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -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. * [Apua IT](http://apua.se/) * [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/) * [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/) * [The FreedomBox Foundation](http://www.freedomboxfoundation.org/) From a2f201309af3be29fdb6c1814012173068639ae9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 11 Dec 2011 06:32:11 -0400 Subject: [PATCH 04/15] --- doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn new file mode 100644 index 000000000..0c328a9f1 --- /dev/null +++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn @@ -0,0 +1 @@ +Is it possible to display the recent changes on the main site of the wiki or on a sidebar? From 2fc77c6aa552a46f2c271ae4d727a633c51ce6c3 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Sun, 11 Dec 2011 07:42:21 -0400 Subject: [PATCH 05/15] --- doc/todo/websetup_should_link_to_plugin_descriptions.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/websetup_should_link_to_plugin_descriptions.mdwn diff --git a/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn b/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn new file mode 100644 index 000000000..8b15fb7d0 --- /dev/null +++ b/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn @@ -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 (or other suitable location). --liw From d7f7ae730aef794a71fc09b6f5083486884a36e7 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 11 Dec 2011 15:24:36 +0100 Subject: [PATCH 06/15] CREATED BY WEB --- doc/users/jak.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/jak.mdwn diff --git a/doc/users/jak.mdwn b/doc/users/jak.mdwn new file mode 100644 index 000000000..a6516a624 --- /dev/null +++ b/doc/users/jak.mdwn @@ -0,0 +1 @@ +Hello, I am Julian. From 2348c22a4461973bb4e37ae83d46d6b9d9c8704e Mon Sep 17 00:00:00 2001 From: jak Date: Sun, 11 Dec 2011 10:25:21 -0400 Subject: [PATCH 07/15] xxx --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 2f173677b..52140925f 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,6 @@ # Sandbox +Test [[!pagestats pages="/tags/*"]] [[!sidebar content="dfdsfsf"" From dfc7c9d63a005849b00175bd42a0bc12828d2b77 Mon Sep 17 00:00:00 2001 From: jak Date: Sun, 11 Dec 2011 10:34:55 -0400 Subject: [PATCH 08/15] Drop test from sanbox --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 52140925f..2f173677b 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,6 +1,5 @@ # Sandbox -Test [[!pagestats pages="/tags/*"]] [[!sidebar content="dfdsfsf"" From 28b732e15daaf76b6e3912a10516a9c75d2ad265 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 11 Dec 2011 15:38:15 +0100 Subject: [PATCH 09/15] Delete doc/users/jak.mdwn again This was an accident and not supposed to be here. --- doc/users/jak.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/users/jak.mdwn diff --git a/doc/users/jak.mdwn b/doc/users/jak.mdwn deleted file mode 100644 index a6516a624..000000000 --- a/doc/users/jak.mdwn +++ /dev/null @@ -1 +0,0 @@ -Hello, I am Julian. From 74deaeffc19f37e3bf24d64169abf4ec1763c9e6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUumnAo2mLy-vFPwwaDIXsnm1kNhYBVa8" Date: Sun, 11 Dec 2011 19:08:26 -0400 Subject: [PATCH 10/15] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index ddf1ecd84..280eae1d2 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -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 discussions. -All wikis are supposed to have a [[SandBox]], so this one does too. +All wikis are supposed to have a bet365, so this one does too. This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. From 0c60457be436b2b03de951f38bf048e5a5b8a019 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Sun, 11 Dec 2011 19:11:42 -0400 Subject: [PATCH 11/15] remove spam --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 280eae1d2..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -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 discussions. -All wikis are supposed to have a bet365, 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 ikiwiki [[!version ]]. From 03d0c64f526a687ac93a8b084ec2784045b7509c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUumnAo2mLy-vFPwwaDIXsnm1kNhYBVa8" Date: Mon, 12 Dec 2011 08:56:17 -0400 Subject: [PATCH 12/15] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..f9f0de80d 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -11,7 +11,7 @@ There are many other [[features]], including support for [[Setup]] has a tutorial for setting up ikiwiki, or you can read the [[man_page|usage]]. There are some [[examples]] of things you can do 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. All wikis are supposed to have a [[sandbox]], so this one does too. From 299c82705884133b29c508ce65bd3df2f25128cf Mon Sep 17 00:00:00 2001 From: "http://jmtd.net/" Date: Mon, 12 Dec 2011 09:34:07 -0400 Subject: [PATCH 13/15] rm spam This reverts commit 03d0c64f526a687ac93a8b084ec2784045b7509c --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index f9f0de80d..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -11,7 +11,7 @@ There are many other [[features]], including support for [[Setup]] has a tutorial for setting up ikiwiki, or you can read the [[man_page|usage]]. There are some [[examples]] of things you can do 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. All wikis are supposed to have a [[sandbox]], so this one does too. From 8c21227bb645e3cfd0ff73000bfe2183ea88d4fc Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 12 Dec 2011 19:33:58 -0400 Subject: [PATCH 14/15] --- doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn diff --git a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn new file mode 100644 index 000000000..abe0bd098 --- /dev/null +++ b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn @@ -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. ::ffff:10.11.12.13. That being the case, I currently need to specify that (with the ::ffff: 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. + From bf127ccb24c44a0bac9f70fd644dbe2a7376e32c Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 12 Dec 2011 19:38:24 -0400 Subject: [PATCH 15/15] --- doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn index abe0bd098..f3a39c02b 100644 --- a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn +++ b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn @@ -1,4 +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. ::ffff:10.11.12.13. That being the case, I currently need to specify that (with the ::ffff: 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. +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]]