From 490f4be7f004d67c6d60f2931220ecb9da0180f5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Mar 2008 21:44:27 -0400 Subject: [PATCH 01/20] web commit by XTaran: I'll check what exactly caused the breakage... --- ...an_alternative_config_file_which_may_break_other_usages.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn index 02caac4a3..b029830c6 100644 --- a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn +++ b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn @@ -13,3 +13,5 @@ I see two possibilities how to fix this: > I don't understand why you're talking about setting --write-back. The > htmltidy plugin communicates with tidy using stdio. No files are used, so > write-back settings should be irrelevant. --[[Joey]] + +>> Hmmm, ok. Well, it didn't work. Empty pages, Perl Warnings. I moved my $HOME/.tidyrc away and it worked again. Had a short look into it and the only obvious non-default setting I found was write-back. I'll check what exactly caused the breakage and let you know. --[[XTaran]] From 5a8719f4b090e90ba237233b2bbfce98781f8cfb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Mar 2008 22:06:55 -0400 Subject: [PATCH 02/20] web commit by XTaran: Correction: write-back -> markup --- ...lternative_config_file_which_may_break_other_usages.mdwn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn index b029830c6..d1eaffe55 100644 --- a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn +++ b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn @@ -1,12 +1,12 @@ The htmltidy plugin as in the Backports.org version 2.32.3~bpo40+1 of ikiwiki does not play well with other usages of HTML Tidy since it has no possibility to use an alternative config file. -E.g. since I usually use HTML Tidy manually only to check and not to fix HTML, I have "write-back: no" in my $HOME/.tidyrc which throws an awful lot of Perl warnings and renders all ikiwiki pages empty as soon as I enable htmltidy. +E.g. since I usually use HTML Tidy manually only to check and not to fix HTML, I have "markup: no" in my $HOME/.tidyrc which throws an awful lot of Perl warnings and renders all ikiwiki pages empty as soon as I enable htmltidy. I see two possibilities how to fix this: 1) Replace "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes - -show-warnings no --tidy-mark no');" by "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes - --show-warnings no --tidy-mark no --write-back yes');" -- This is the fastest fix, but not very elegant, since it doesn't solve the general problem. +-show-warnings no --tidy-mark no --markup yes');" -- This is the fastest fix, but not very elegant, since it doesn't solve the general problem. 2) Make it configurable via ikiwiki.setup as e.g.with the tags plugin. Haven't looked into this code yet. @@ -15,3 +15,5 @@ I see two possibilities how to fix this: > write-back settings should be irrelevant. --[[Joey]] >> Hmmm, ok. Well, it didn't work. Empty pages, Perl Warnings. I moved my $HOME/.tidyrc away and it worked again. Had a short look into it and the only obvious non-default setting I found was write-back. I'll check what exactly caused the breakage and let you know. --[[XTaran]] + +>>> Ok, found it. It indeed wasn't `write-back`, but `markup: no`. (I usually only want to see warnings and errors, not the fixed markup.) I now've corrected this in the bug report above. --[[XTaran]] From 4875e7cb8d604da8bda5db0a52d81b917ed4a854 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Mar 2008 08:51:27 -0400 Subject: [PATCH 03/20] web commit by buo: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c576d8c97..8ca9552c1 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 46 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]] +[[poll 46 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From 98844314c30f13fbcd46c8c1ca92b45b3e50a0a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Mar 2008 12:15:59 -0400 Subject: [PATCH 04/20] web commit from 74.251.196.253: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 8ca9552c1..41c7efb58 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 46 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] +[[poll 47 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From 21bb758cdd7a2cdd954bee93686f7491d7757423 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 04:51:47 -0400 Subject: [PATCH 05/20] web commit by https://jaroslav.klaus.myopenid.com/: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 41c7efb58..41bcba9af 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 47 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] +[[poll 48 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From 7695a48fcd79e3a2cf2451efbab1eb2e4015482f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 05:14:28 -0400 Subject: [PATCH 06/20] web commit by http://madduck.net/ --- .../aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn index b9a661e35..a73b1a70c 100644 --- a/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn +++ b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn @@ -6,3 +6,5 @@ It would be nice if the [[aggregate_plugin|plugin/aggregate]] would try to extra # time on record for the new page. utime $mtime, $mtime, pagefile($guid->{page}) if defined $mtime && $mtime <= time; + +>> I'll have to debug this, it's not working here... and this is an ikiwiki aggregator scraping another ikiwiki site. From 8e05c93b4c1e39026ecbd9671d9c6e21332663a7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 05:20:32 -0400 Subject: [PATCH 07/20] web commit by http://madduck.net/ --- ...___39__28__39___if_external_plugins_return_nothing.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn diff --git a/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn b/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn new file mode 100644 index 000000000..6b4587c55 --- /dev/null +++ b/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn @@ -0,0 +1,7 @@ +If the rst2html procedure of the rst external plugin returns None (e.g. when it throws an exception), then ikiwiki will render + +
+ 2/8 +
+ +This seems like a bug in ikiwiki, which should probably output an informational message about the plugin returning an invalid value. From ddab0dbfcc7fb5570087dbb36dfe9f1a0c787a03 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 05:33:48 -0400 Subject: [PATCH 08/20] web commit by http://madduck.net/ --- ...ers___39__28__39___if_external_plugins_return_nothing.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn b/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn index 6b4587c55..b22c44e16 100644 --- a/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn +++ b/doc/bugs/ikiwiki_renders___39__28__39___if_external_plugins_return_nothing.mdwn @@ -4,4 +4,6 @@ If the rst2html procedure of the rst external plugin returns None (e.g. when it 2/8 -This seems like a bug in ikiwiki, which should probably output an informational message about the plugin returning an invalid value. +In addition to the broken plugin, this seems like a bug in ikiwiki, which should probably output an informational message about the plugin returning an invalid value. + +--[[madduck]] From 880dea6af4fd3817f5fb621afadd66816f2edd8e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 05:35:58 -0400 Subject: [PATCH 09/20] web commit by http://madduck.net/ --- ...nfigurable_minimum_length_of_log_message_for_web_edits.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn diff --git a/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn new file mode 100644 index 000000000..0210c38c3 --- /dev/null +++ b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn @@ -0,0 +1,3 @@ +It would be nice to specify a minimum length for the change log for web edits, and if it's only required vs. non-required. I realise this is not going to solve the problem of crap log messages, but it helps guard against accidental submissions which one would have logged. Mediawiki/wikipedia has that option, and I find it a useful reminder. --[[madduck]] + +[[tag wishlist]] From 75ed8630b65b9eb820a80699dc00f789724e3424 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 05:40:37 -0400 Subject: [PATCH 10/20] web commit by http://madduck.net/ --- doc/users/madduck.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/users/madduck.mdwn b/doc/users/madduck.mdwn index 08cdad3e0..22e6b8b3e 100644 --- a/doc/users/madduck.mdwn +++ b/doc/users/madduck.mdwn @@ -1,4 +1,7 @@ - +My sites: + +- [Homepage](http://madduck.net) +- [Debian stuff](http://people.debian.org/~madduck) I track this site with the following feed: From 1bade8e70d87f1b3b1cd1c494eeb12ead4344e07 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 06:04:36 -0400 Subject: [PATCH 11/20] web commit from 128.240.229.68: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 41bcba9af..38051f266 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 48 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] +[[poll 49 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From 46fa95efa3933450b436f70a0ff1e9c54070a2a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 06:24:13 -0400 Subject: [PATCH 12/20] web commit from 128.240.229.68: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 38051f266..44abb5cd8 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 49 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] +[[poll 50 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From 650c0dc8de22b83bb73993cdc43dffd8135ecef3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 07:04:08 -0400 Subject: [PATCH 13/20] web commit from 128.240.229.68: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 44abb5cd8..fbec04c18 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -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 50 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] +[[poll 51 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] From abf90fcbaa014fefcacf98997a7f9465140e0ab9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 07:05:54 -0400 Subject: [PATCH 14/20] web commit by http://alcopop.org/me/openid/ --- doc/news/openid/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 1c5929274..47897b9cd 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -35,3 +35,11 @@ only Apache/iptables rules for this? Maybe it's related to >> Qatar Wikipedia pages and the admins of Wikipedia had to ban all >> IP addresses of that country (fortunately Qatar has only one ISP). >> --[[Paweł|ptecza]] + +---- + +## Error voting + +> Error: /srv/web/ikiwiki.info/todo/Configurable_minimum_length_of_log_message_for_web_edits/index.html independently created, not overwriting with version from todo/Configurable_minimum_length_of_log_message_for_web_edits + +[[jondowland]] From 6574f28dc4742e958a0627c65bc4c42be2dfdf11 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 14:00:33 -0400 Subject: [PATCH 15/20] web commit by tomtest --- doc/sandbox.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index d7172d273..bf2400d18 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,6 +1,5 @@ - This is the SandBox, a page anyone can edit to try out this fab ikiwiki. Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left. @@ -78,6 +77,8 @@ Its a WikiWikiWorld!! ----- +HUHU + This sandbox is also a [[ikiwiki/blog]]! [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] From d84fc540e8d70379a7f852e7e73c246e988f37c7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 14:01:47 -0400 Subject: [PATCH 16/20] web commit by tomtest --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index bf2400d18..3fe0eaae7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,4 @@ - This is the SandBox, a page anyone can edit to try out this fab ikiwiki. Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left. From 90151b6be2800d03dd25fcc89dcbe454a9053c49 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 14:05:18 -0400 Subject: [PATCH 17/20] web commit by tomtest: just playing in sandbox --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 3fe0eaae7..39694e2a6 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,4 +1,3 @@ - This is the SandBox, a page anyone can edit to try out this fab ikiwiki. Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left. From a7886d699e766fb0efb6f5d5db3f6ba390183b40 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 17:36:09 -0400 Subject: [PATCH 18/20] web commit by http://madduck.net/ --- doc/todo/CGI_method_to_pullrefresh.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/CGI_method_to_pullrefresh.mdwn diff --git a/doc/todo/CGI_method_to_pullrefresh.mdwn b/doc/todo/CGI_method_to_pullrefresh.mdwn new file mode 100644 index 000000000..89b7491c0 --- /dev/null +++ b/doc/todo/CGI_method_to_pullrefresh.mdwn @@ -0,0 +1,5 @@ +[[!meta title="CGI method to pull/refresh"]] + +In some situations, it makes sense to have the repository in use by ikiwiki reside on a different machine. In that case, one could juggle SSH keys for the `post-update` hook. A better way may be to provide a different `do` parameter handler for the CGI, which would pull new commits to the working clone and refresh the wiki. Then, the remote `post-update` hook could just `wget` that URL. To prevent simple DoS attacks, one might assign a simple password. + +[[tag wishlist]] From c276bb4eecbfcc5e5e7d9037b75793b7aeb9a7d9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 18:33:38 -0400 Subject: [PATCH 19/20] web commit by http://joey.kitenet.net/ --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 39694e2a6..bda96a70a 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,4 +1,4 @@ -This is the SandBox, a page anyone can edit to try out this fab ikiwiki. +This is the SandBox, a page anyone can edit to try out ikiwiki. Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left. From 3d40fd88a54890d280aec6744d88f9f9ecfe12be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Mar 2008 18:44:52 -0400 Subject: [PATCH 20/20] web commit by http://joey.kitenet.net/ --- doc/sandbox.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index bda96a70a..4634b6f35 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -75,8 +75,6 @@ Its a WikiWikiWorld!! ----- -HUHU - This sandbox is also a [[ikiwiki/blog]]! [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]