diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-27 23:29:23 +0000 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-27 23:29:23 +0000 |
| commit | 3650d0265bc501219bc6d5cd4fa91a6b6ecd793a (patch) | |
| tree | bc69471b66086744218a6f402d6f055eca037de0 | |
| parent | 6e97574598534c4d81d2039bc044ceceaaf44fbd (diff) | |
99 files changed, 7017 insertions, 1 deletions
diff --git a/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change b/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change new file mode 100644 index 000000000..703d0dced --- /dev/null +++ b/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change @@ -0,0 +1,56 @@ +[[!meta author="""http://pmate.myopenid.com/"""]] + +[[!meta authorurl="""http://pmate.myopenid.com/"""]] + +[[!meta title="""change to ikiwikiusers on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-03f04d48d53a3cd77215d6b086b416a1965e2feb"]] + +<div id="change-03f04d48d53a3cd77215d6b086b416a1965e2feb" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwikiusers.mdwn;h=699eeda7d4f1cdd0ac7cb88eb2b45f5ca27f95e0;hp=d8e55bace4cd1eea5d9f4fed21ec552097fa82a4;hb=03f04d48d53a3cd77215d6b086b416a1965e2feb;hpb=dd9796375895752621cdcce103d1ad8d8a31d6cb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwikiusers&do=goto" rel="nofollow">ikiwikiusers</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://pmate.myopenid.com/" rel="nofollow">pmate [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 17 Nov 2010 08:03:09 +0000">08:03:09 11/17/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=03f04d48d53a3cd77215d6b086b416a1965e2feb&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn +index d8e55ba..699eeda 100644 +--- a/doc/ikiwikiusers.mdwn ++++ b/doc/ikiwikiusers.mdwn +@@ -161,6 +161,7 @@ Personal sites and blogs + * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend + * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 + * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... ++* [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/) + + Please feel free to add your own ikiwiki site! + + +</pre> +</div> + +<!-- 03f04d48d53a3cd77215d6b086b416a1965e2feb --> diff --git a/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change b/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change new file mode 100644 index 000000000..e55c80e85 --- /dev/null +++ b/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change @@ -0,0 +1,62 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-08a20a3deaca2cb1f68fba993411b51c19e4c362"]] + +<div id="change-08a20a3deaca2cb1f68fba993411b51c19e4c362" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=b63128702d85c80ba625c217f9288660ac94ab7a;hp=0a9d8c69c4c35a230f5080d1fd1f4cacb6b806ae;hb=08a20a3deaca2cb1f68fba993411b51c19e4c362;hpb=e810fe394b49955971299329136d46548d95ec6b" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 10 Nov 2010 11:37:59 -0400">11:37:59 11/10/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=08a20a3deaca2cb1f68fba993411b51c19e4c362&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +benchmarks<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index 0a9d8c6..b631287 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -6,6 +6,9 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + > `memoize(glob2re)` next to the other memoize calls, would be a less + > verbose way to do this? --[[smcv]] + ++>> I think so, yeah. Anyway, do you have any benchmark results handy, ++>> Kathryn? --[[Joey]] ++ + -------------------------------------------------------------- + <pre> + diff --git a/IkiWiki.pm b/IkiWiki.pm + +</pre> +</div> + +<!-- 08a20a3deaca2cb1f68fba993411b51c19e4c362 --> diff --git a/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change b/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change new file mode 100644 index 000000000..5140dc1ad --- /dev/null +++ b/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change @@ -0,0 +1,57 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]] + +[[!meta title="""change to index on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0a7db85f06674311b80b490dfc238a1eaed040f8"]] + +<div id="change-0a7db85f06674311b80b490dfc238a1eaed040f8" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/index.mdwn;h=90713d1f261480985b6f6c85cd0f215933332eef;hp=06acc9cecf56ee178b488e06a136009f9f1e0938;hb=0a7db85f06674311b80b490dfc238a1eaed040f8;hpb=8806a9795116e73ec851dfea89af45a786fbe6da" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=index&do=goto" rel="nofollow">index</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE" rel="nofollow">Sarfaraz</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 11 Nov 2010 19:01:14 -0400">19:01:14 11/11/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=0a7db85f06674311b80b490dfc238a1eaed040f8&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/index.mdwn b/doc/index.mdwn +index 06acc9c..90713d1 100644 +--- a/doc/index.mdwn ++++ b/doc/index.mdwn +@@ -17,7 +17,7 @@ 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 ]]. + +-## developer resources ++## developer resources sas + + The [[RoadMap]] describes where the project is going. + The [[forum]] is open for discussions. + +</pre> +</div> + +<!-- 0a7db85f06674311b80b490dfc238a1eaed040f8 --> diff --git a/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change b/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change new file mode 100644 index 000000000..63830fd4c --- /dev/null +++ b/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change @@ -0,0 +1,74 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0e4e3f7cae25082fc90a93dee41b397b0ae9be09"]] + +<div id="change-0e4e3f7cae25082fc90a93dee41b397b0ae9be09" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/transient_in-memory_pages.mdwn;h=9808ffdfe476a9ed70e54a7e00748103e21e0f65;hp=0000000000000000000000000000000000000000;hb=0e4e3f7cae25082fc90a93dee41b397b0ae9be09;hpb=93e15cc84f47a1340f8bd06d7056ba423fe510bb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Ftransient_in-memory_pages&do=goto" rel="nofollow">todo/transient in-memory pages</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 08:10:20 -0400">08:10:20 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=0e4e3f7cae25082fc90a93dee41b397b0ae9be09&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +suggested in two places => useful?<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn +new file mode 100644 +index 0000000..9808ffd +--- /dev/null ++++ b/doc/todo/transient_in-memory_pages.mdwn +@@ -0,0 +1,20 @@ ++On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]] ++suggests: ++ ++> Instead of creating a file that gets checked in into the RCS, the ++> source files could be left out and the output files be written as ++> long as there is no physical source file (think of a virtual underlay). ++> Something similar would be required to implement alias directive, ++> which couldn't be easily done by writing to the RCS as the page's ++> contents can change depending on which other pages claim it as an alias. ++ ++`add_autofile` could be adapted to do this, or a similar API could be ++added. ++ ++This would also be useful for autoindex, as suggested on ++[[plugins/autoindex/discussion]]. I'd also like to use it for ++[[plugins/contrib/album]]. ++ ++One refinement I'd suggest is that if the transient page is edited, ++its transient contents are evaluated and used as the initial ++content for the edit box; after that, it'd become a static page. --[[smcv]] + +</pre> +</div> + +<!-- 0e4e3f7cae25082fc90a93dee41b397b0ae9be09 --> diff --git a/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change b/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change new file mode 100644 index 000000000..99f032a4c --- /dev/null +++ b/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change @@ -0,0 +1,69 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to security on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0ea5f43790fe2ce3cc40e9513191e72c67a1ee51"]] + +<div id="change-0ea5f43790fe2ce3cc40e9513191e72c67a1ee51" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/security.mdwn;h=33b199247dbf541362097124a984ceba6d93658e;hp=34a0052397fa857552051fc7e06cef84a1ccab01;hb=0ea5f43790fe2ce3cc40e9513191e72c67a1ee51;hpb=d5056fb61e8332fea658363e931ec28a35681ffe" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=security&do=goto" rel="nofollow">security</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 00:24:52 -0400">00:24:52 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=0ea5f43790fe2ce3cc40e9513191e72c67a1ee51&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +security issue<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/security.mdwn b/doc/security.mdwn +index 34a0052..33b1992 100644 +--- a/doc/security.mdwn ++++ b/doc/security.mdwn +@@ -440,3 +440,16 @@ with the release of ikiwiki 3.20100312. + A fix was also backported to Debian etch, as version 2.53.5. I recommend + upgrading to one of these versions if your wiki can be edited by third + parties. ++ ++## javascript insertation via insufficient htmlscrubbing of comments ++ ++Kevin Riggle noticed that it was not possible to configure ++`htmlscrubber_skip` to scrub comments while leaving unscubbed the text ++of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not ++scrub comments. ++ ++Additionally, it was discovered that comments' html was never scrubbed during ++preview or moderation of comments. ++ ++These problems were discovered on 12 November 2010 and fixed the same ++hour with the release of ikiwiki 3.20101112. + +</pre> +</div> + +<!-- 0ea5f43790fe2ce3cc40e9513191e72c67a1ee51 --> diff --git a/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change b/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change new file mode 100644 index 000000000..0ff2e8207 --- /dev/null +++ b/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change @@ -0,0 +1,93 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-171c429f829aac53cb449e3bb574d2a1669e025e"]] + +<div id="change-171c429f829aac53cb449e3bb574d2a1669e025e" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=8f70f1dde4bbe7fd7b66807c36e6f4d7fd0b08b0;hp=0000000000000000000000000000000000000000;hb=171c429f829aac53cb449e3bb574d2a1669e025e;hpb=9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 09 Nov 2010 20:53:10 -0400">20:53:10 11/09/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=171c429f829aac53cb449e3bb574d2a1669e025e&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +make match_glob faster - patch!<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +new file mode 100644 +index 0000000..8f70f1d +--- /dev/null ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -0,0 +1,39 @@ ++I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob. This matcher is a good one to improve the speed of, because it gets called so many times. ++ ++Here's my patch - please consider it! -- [[KathrynAndersen]] ++ ++-------------------------------------------------------------- ++<pre> ++diff --git a/IkiWiki.pm b/IkiWiki.pm ++index 08a3d78..c187b98 100644 ++--- a/IkiWiki.pm +++++ b/IkiWiki.pm ++@@ -2482,6 +2482,8 @@ sub derel ($$) { ++ return $path; ++ } ++ +++my %glob_cache; +++ ++ sub match_glob ($$;@) { ++ my $page=shift; ++ my $glob=shift; ++@@ -2489,8 +2491,15 @@ sub match_glob ($$;@) { ++ ++ $glob=derel($glob, $params{location}); ++ ++- my $regexp=IkiWiki::glob2re($glob); ++- if ($page=~/^$regexp$/i) { +++ # Instead of converting the glob to a regex every time, +++ # cache the compiled regex to save time. +++ if (!exists $glob_cache{$glob} +++ or !defined $glob_cache{$glob}) +++ { +++ my $re=IkiWiki::glob2re($glob); +++ $glob_cache{$glob} = qr/^$re$/i; +++ } +++ if ($page =~ $glob_cache{$glob}) { ++ if (! IkiWiki::isinternal($page) || $params{internal}) { ++ return IkiWiki::SuccessReason->new("$glob matches $page"); ++ } ++</pre> ++-------------------------------------------------------------- + +</pre> +</div> + +<!-- 171c429f829aac53cb449e3bb574d2a1669e025e --> diff --git a/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change b/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change new file mode 100644 index 000000000..3c15ef1e3 --- /dev/null +++ b/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change @@ -0,0 +1,66 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-172f41f6de288814fbd013f3465e658c562b10b1"]] + +<div id="change-172f41f6de288814fbd013f3465e658c562b10b1" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment;h=0000000000000000000000000000000000000000;hp=6e29f0c19bf51ce19ca55d82ffbc0575392fe6fa;hb=172f41f6de288814fbd013f3465e658c562b10b1;hpb=9b01c9779ef682af0874efc062d9fb2e91676c23" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FNeed_something_more_powerful_than_Exclude%2Fcomment_1_b454ead16d90479690ad8ee72cfd1428&do=goto" rel="nofollow">forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 10:43:40 +0000">10:43:40 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=172f41f6de288814fbd013f3465e658c562b10b1&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +removed<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment +deleted file mode 100644 +index 6e29f0c..0000000 +--- a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment ++++ /dev/null +@@ -1,12 +0,0 @@ +-[[!comment format=mdwn +- username="http://smcv.pseudorandom.co.uk/" +- nickname="smcv" +- subject="expression anchored too closely?" +- date="2010-11-23T10:43:08Z" +- content=""" +-It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.) +- +-The match operation in `&file_pruned` ends up a bit like this: +- +- \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$} +-"""]] + +</pre> +</div> + +<!-- 172f41f6de288814fbd013f3465e658c562b10b1 --> diff --git a/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change b/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change new file mode 100644 index 000000000..eda883858 --- /dev/null +++ b/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change @@ -0,0 +1,62 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to tips/nearlyfreespeech on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1739dbe0a8dc943c736d69f3747251ad72a53278"]] + +<div id="change-1739dbe0a8dc943c736d69f3747251ad72a53278" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/tips/nearlyfreespeech.mdwn;h=a3d1ec678141dc57b81263ec3fa695af9d7d8ba6;hp=4b3b02eac8acbb2e35cfa4c930c9b5c7808f0bac;hb=1739dbe0a8dc943c736d69f3747251ad72a53278;hpb=9f8cfe998e5ced7e4b2e1dd819a025b0745935ff" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=tips%2Fnearlyfreespeech&do=goto" rel="nofollow">tips/nearlyfreespeech</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 18:57:46 +0000">18:57:46 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=1739dbe0a8dc943c736d69f3747251ad72a53278&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +úpdate<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn +index 4b3b02e..a3d1ec6 100644 +--- a/doc/tips/nearlyfreespeech.mdwn ++++ b/doc/tips/nearlyfreespeech.mdwn +@@ -14,7 +14,8 @@ After you [get an account](https://www.nearlyfreespeech.net/about/start.php), + create a site using their web interface. + + Mine is named `ikiwiki-test` and I used their DNS instead of getting my +-own, resulting in <http://ikiwiki-test.nfshost.com/> ++own, resulting in <http://ikiwiki-test.nfshost.com/>. (Not being kept up ++anymore.) + + They gave me 2 cents free funding for signing up, which is enough to pay + for 10 megabytes of bandwidth, or about a thousand typical page views, at + +</pre> +</div> + +<!-- 1739dbe0a8dc943c736d69f3747251ad72a53278 --> diff --git a/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change b/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change new file mode 100644 index 000000000..0e44d6398 --- /dev/null +++ b/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change @@ -0,0 +1,90 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039"]] + +<div id="change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=4fafc2bbc249ac9e22869129f8702e0a6d54a5ba;hp=20d22b9ab837dfc3d5c9e0a787479b49fd2d6043;hb=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039;hpb=a6c3d71787c528888c3f66c7ded8dd0c8f430b7e" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 18:05:37 +0000">18:05:37 11/22/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +comments (finally)<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index 20d22b9..4fafc2b 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -181,6 +181,16 @@ New API added by this branch: + + * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` + ++ > Yikes. I see why you wanted to keep it to 3 parameters (4 is too many, ++ > and po overrides it), but I dislike overloading the third parameter ++ > like that. ++ > ++ > There are fairly few calls to `urlto($foo, $bar)`, so why not ++ > make that always return the semi-local url form, and leave the third ++ > parameter for the cases that need a true fully-qualified url. ++ > The new form for local urls will typically be only a little bit longer, ++ > except in the unusual case where the cgiurl is elsewhere. --[[Joey]] ++ + * `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + +@@ -199,9 +209,13 @@ Bugs: + `cgiurl(cgiurl => $config{cgiurl}, ...)`, + although that does look a bit strange + ++ > I agree that makes sense. --[[Joey]] ++ + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + ++ > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] ++ + * Or, to reduce use of the unexported `baseurl` function, it might make + sense to give `urlto` a special case that references the root of the wiki, + with a trailing slash ready to append stuff: perhaps `urlto('/')`, +@@ -210,3 +224,6 @@ Bugs: + do_something(baseurl => urlto('/', undef, local)`); + do_something_else(urlto('/').'style.css'); + IkiWiki::redirect(urlto('/', undef, 1)); ++ ++ > AFACIS, `baseurl` is only called in 3 places so I don't think that's ++ > needed. --[[Joey]] + +</pre> +</div> + +<!-- 178d6a16c2fff68edfbe6a1af5c8a9fa91db6039 --> diff --git a/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change b/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change new file mode 100644 index 000000000..cb4c2167a --- /dev/null +++ b/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change @@ -0,0 +1,67 @@ +[[!meta author="""http://churchkey.org/author/ian/"""]] + +[[!meta authorurl="""http://churchkey.org/author/ian/"""]] + +[[!meta title="""change to bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1968317cacc2f555af17286acf26a60ce616cc40"]] + +<div id="change-1968317cacc2f555af17286acf26a60ce616cc40" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn;h=45481bf21b60d52b3dcf82ffde4172231109cc00;hp=0000000000000000000000000000000000000000;hb=1968317cacc2f555af17286acf26a60ce616cc40;hpb=5954915a4fe8a889b8217cac99fae53cbe7f1e97" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Finline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec&do=goto" rel="nofollow">bugs/inline action buttons circumvent exclude criteria from edittemplate's match="" pagespec</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://churchkey.org/author/ian/" rel="nofollow">ian [churchkey.org/author]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 21:26:27 +0000">21:26:27 11/22/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=1968317cacc2f555af17286acf26a60ce616cc40&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +added edittemplate bug for ikiwiki verison: 3.20100815.2<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn +new file mode 100644 +index 0000000..45481bf +--- /dev/null ++++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn +@@ -0,0 +1,13 @@ ++ikiwiki verison: 3.20100815.2 ++ ++If I instruct editemplate to only match the top level pages in a directory using ++ ++ match="foo/* and !foo/*/* and !foo/*/*/*" ++ ++everything works as expected for pages created via links on other wiki pages. So, if I open foo/bar (or any other page on the wiki) and create a link to foo/bar/bug, edittemplate appropriately does not insert any text into the new page. ++ ++However, if I use an inline directive like the following ++ ++ !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes ++ ++every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. + +</pre> +</div> + +<!-- 1968317cacc2f555af17286acf26a60ce616cc40 --> diff --git a/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change b/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change new file mode 100644 index 000000000..f05151ec1 --- /dev/null +++ b/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change @@ -0,0 +1,51 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1b770bea3fd5b5dfb4e75237218db204139d9189"]] + +<div id="change-1b770bea3fd5b5dfb4e75237218db204139d9189" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=ad89f4c2d18bcb55c42c8b39222cba2ae8ae465b;hp=0000000000000000000000000000000000000000;hb=1b770bea3fd5b5dfb4e75237218db204139d9189;hpb=99749dfdeac07b975cfba6eef617f3d7362eec73" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" rel="nofollow">Dave</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 10:38:32 -0400">10:38:32 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=1b770bea3fd5b5dfb4e75237218db204139d9189&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +new file mode 100644 +index 0000000..ad89f4c +--- /dev/null ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -0,0 +1 @@ ++It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? + +</pre> +</div> + +<!-- 1b770bea3fd5b5dfb4e75237218db204139d9189 --> diff --git a/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change b/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change new file mode 100644 index 000000000..e75b5bc23 --- /dev/null +++ b/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change @@ -0,0 +1,55 @@ +[[!meta author="""harishcm"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fharishcm&do=goto"""]] + +[[!meta title="""change to users/harishcm on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1f32f5e6184b6354f671ae71578f1158c49168b6"]] + +<div id="change-1f32f5e6184b6354f671ae71578f1158c49168b6" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/users/harishcm.mdwn;h=292a3bfad43f11eb5c073343e5c5dca27c39e175;hp=1647110220d604e5a69b178740086f459669690e;hb=1f32f5e6184b6354f671ae71578f1158c49168b6;hpb=415effbb43663ad756d78b3e957ac593d0227a74" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fharishcm&do=goto" rel="nofollow">users/harishcm</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fharishcm&do=goto" rel="nofollow">harishcm</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 05 Nov 2010 05:01:58 -0400">05:01:58 11/05/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=1f32f5e6184b6354f671ae71578f1158c49168b6&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Put link to personal website<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn +index 1647110..292a3bf 100644 +--- a/doc/users/harishcm.mdwn ++++ b/doc/users/harishcm.mdwn +@@ -1 +1 @@ +-Using ikiwiki for my yet to be published personal website :) ++Using ikiwiki for my personal website <http://harish.19thsc.com> + +</pre> +</div> + +<!-- 1f32f5e6184b6354f671ae71578f1158c49168b6 --> diff --git a/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change b/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change new file mode 100644 index 000000000..bd0ea25df --- /dev/null +++ b/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change @@ -0,0 +1,56 @@ +[[!meta author="""http://dtaht.myopenid.com/"""]] + +[[!meta authorurl="""http://dtaht.myopenid.com/"""]] + +[[!meta title="""change to ikiwikiusers on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-238259dfa199e217e34cc02462f55df6b2b1fcc5"]] + +<div id="change-238259dfa199e217e34cc02462f55df6b2b1fcc5" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwikiusers.mdwn;h=54fa1d57be49ff817886c018dbc44a7c600972fc;hp=2836d96e550f15d3b27225f31b263d04944837e4;hb=238259dfa199e217e34cc02462f55df6b2b1fcc5;hpb=0c18b347aa286647ee5d3bdb36653ef3585ba61f" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwikiusers&do=goto" rel="nofollow">ikiwikiusers</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://dtaht.myopenid.com/" rel="nofollow">dtaht [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 31 Oct 2010 18:23:03 -0400">18:23:03 10/31/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=238259dfa199e217e34cc02462f55df6b2b1fcc5&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn +index 2836d96..54fa1d5 100644 +--- a/doc/ikiwikiusers.mdwn ++++ b/doc/ikiwikiusers.mdwn +@@ -159,6 +159,7 @@ Personal sites and blogs + * [weakish](http://weakish.github.com) + * [Thomas Kane](http://planetkane.org/) + * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend ++* [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 + + Please feel free to add your own ikiwiki site! + + +</pre> +</div> + +<!-- 238259dfa199e217e34cc02462f55df6b2b1fcc5 --> diff --git a/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change b/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change new file mode 100644 index 000000000..8ad9336d8 --- /dev/null +++ b/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change @@ -0,0 +1,69 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]] + +[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047"]] + +<div id="change-23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn;h=3e6c23241c525fb70a47afa7f14ec695c27a766f;hp=0000000000000000000000000000000000000000;hb=23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047;hpb=c3624227620f5034fa84b3cb1294a61fc08eeea9" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FBlog_posting_times_and_ikiwiki_state&do=goto" rel="nofollow">forum/Blog posting times and ikiwiki state</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" rel="nofollow">Matt</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 03 Nov 2010 19:34:53 -0400">19:34:53 11/03/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +new file mode 100644 +index 0000000..3e6c232 +--- /dev/null ++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +@@ -0,0 +1,19 @@ ++What I wanted ++------------- ++ ++I thought to myself it would be nice to see from the console the dates that my ikiwiki blog posts were published. Especially as I would like to know the order of my todo list without having to view the webpage. ++ ++What I discovered ++----------------- ++ ++Looked at the code and saw the functions for grabbing the ctime from git but couldn't reconcile them to the "Posted" date in the RSS feed. Some more reading and I figured out that the Posted time is taken from the UNIX ctime when first uploaded into the repository and this information is stored in the page state via a Perl storable database - indexdb. (I'm sure most know this but to be clear in UNIX ctime is *not* the actual creation time of a file. UNIX has no facility for recording the actual creation time - however on first upload to the wiki it's good enough). ++ ++Wrote a Perl script to query and sort indexdb. Now I can list my todos or blog posts in the order they appear on the web. Handy. ++ ++However the ikiwiki state is specifically excluded via '.gitignore'. I work a lot on trains and not having this file in my cloned wiki means I can't list published posts or my todos in the proper order. I can get an approximation from git logs but, dam it, I want it the same! ++ ++What can I do? ++-------------- ++ ++Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? ++ + +</pre> +</div> + +<!-- 23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047 --> diff --git a/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change b/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change new file mode 100644 index 000000000..57edc92b2 --- /dev/null +++ b/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change @@ -0,0 +1,64 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-263cfa7d1e938e3b41d1b6826427f0d613b2b97c"]] + +<div id="change-263cfa7d1e938e3b41d1b6826427f0d613b2b97c" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=cb5e6df73b09ee9087a571dcfb772631af8e8c3d;hp=0000000000000000000000000000000000000000;hb=263cfa7d1e938e3b41d1b6826427f0d613b2b97c;hpb=ffeee19216182d633d251852ab62fe79c1367796" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 06:08:30 -0400">06:08:30 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=263cfa7d1e938e3b41d1b6826427f0d613b2b97c&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +aggregate: too long filenames<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +new file mode 100644 +index 0000000..cb5e6df +--- /dev/null ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -0,0 +1,10 @@ ++the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename. This results in long filenames. I have hit a filesystem length limitation on several occasions. Some (ab)uses of RSS, e.g., twitter, ++generate long titles. Especially once you throw escaping into the mix: ++ ++ $ ikiwiki --setup testsetup --aggregate --refresh ++ failed to write ./test/lifestream/Hidden_Features_Of_Perl__44___PHP__44___Javascript__44___C__44___C++__44___C__35____44___Java__44___Ruby___46____46____46__._aggregated.ikiwiki-new: File name too long ++ aggregation failed with code 9216 ++ $ echo $? ++ 25 ++ ++-- [[Jon]] + +</pre> +</div> + +<!-- 263cfa7d1e938e3b41d1b6826427f0d613b2b97c --> diff --git a/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change b/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change new file mode 100644 index 000000000..52a0e5bd0 --- /dev/null +++ b/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change @@ -0,0 +1,64 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2a452ddf146c4148155095e400f56b4674d76953"]] + +<div id="change-2a452ddf146c4148155095e400f56b4674d76953" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=c38ad6c7b84bba739f7deea2e40519b65b56792a;hp=40decb392b97533a833dec37768399bfa417a8cc;hb=2a452ddf146c4148155095e400f56b4674d76953;hpb=8de7fde49c295a6c9098767b9fdfea79de8476eb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 13:34:41 -0400">13:34:41 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=2a452ddf146c4148155095e400f56b4674d76953&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +but it already checks length..<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +index 40decb3..c38ad6c 100644 +--- a/doc/bugs/aggregate_generates_long_filenames.mdwn ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -11,3 +11,11 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi + + + -- [[Jon]] ++ ++> I have to wonder what filesystem you have there where 147 characters ++> is a long filename. Ikiwiki already uses `POSIX::pathconf` on the srcdir ++> to look up `_PC_NAME_MAX` ++> to see if the filename is too long, and shortens it, so it seems ++> that, in additional to having a rather antique long filename limit, your ++> system also doesn't properly expose it via pathconf. Not sure what ++> ikiwiki can do here. --[[Joey]] + +</pre> +</div> + +<!-- 2a452ddf146c4148155095e400f56b4674d76953 --> diff --git a/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change b/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change new file mode 100644 index 000000000..999f73b87 --- /dev/null +++ b/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change @@ -0,0 +1,63 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2c17255b6641e33374a446ca281a0ad6d46af1dc"]] + +<div id="change-2c17255b6641e33374a446ca281a0ad6d46af1dc" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/autoindex/discussion.mdwn;h=b09481cdc7800921433da69bb4cbed33c125b05e;hp=d8b9be6e05720924788f257cf2ae69937631cc60;hb=2c17255b6641e33374a446ca281a0ad6d46af1dc;hpb=db3fb406733b98535d426acedd58f1633df79ade" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fautoindex%2Fdiscussion&do=goto" rel="nofollow">plugins/autoindex/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 08:14:26 -0400">08:14:26 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=2c17255b6641e33374a446ca281a0ad6d46af1dc&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +cross-references<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn +index d8b9be6..b09481c 100644 +--- a/doc/plugins/autoindex/discussion.mdwn ++++ b/doc/plugins/autoindex/discussion.mdwn +@@ -4,7 +4,9 @@ for the html output and not place the markdown files in the wiki source? + > Or better still, add a mechanism for ikiwiki to hold transient source + > pages in memory and render them as if they existed, without actually + > writing them out, as [[JoeRayhawk]] suggests below? I think +-> add_autofile would be the way to do this. --[[smcv]] ++> add_autofile would be the way to do this. ++> I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]] ++> and [[todo/transient in-memory pages]]. --[[smcv]] + + The reason being that I have a lot of directories which need to be autoindexed, + but I would prefer if the index files didn't clutter up my git repository. + +</pre> +</div> + +<!-- 2c17255b6641e33374a446ca281a0ad6d46af1dc --> diff --git a/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change b/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change new file mode 100644 index 000000000..af18ef4de --- /dev/null +++ b/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change @@ -0,0 +1,58 @@ +[[!meta author="""143.215.206.35"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F143.215.206.35&do=goto"""]] + +[[!meta title="""change to news/openid on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2fdda536ec6bee1eff3b71c214753078cd588f8f"]] + +<div id="change-2fdda536ec6bee1eff3b71c214753078cd588f8f" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/openid.mdwn;h=02f7afbc064175bcfb55931f6cb57f3eb3896858;hp=05991ff72871e277651c0e4c5944f48484dfe153;hb=2fdda536ec6bee1eff3b71c214753078cd588f8f;hpb=af75602391ac9651e7594c65588da86d591f2c01" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=news%2Fopenid&do=goto" rel="nofollow">news/openid</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2F143.215.206.35&do=goto" rel="nofollow">143.215.206.35</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 16:54:58 -0400">16:54:58 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=2fdda536ec6bee1eff3b71c214753078cd588f8f&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +poll vote (Accept both)<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn +index 05991ff..02f7afb 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 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] ++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] + +</pre> +</div> + +<!-- 2fdda536ec6bee1eff3b71c214753078cd588f8f --> diff --git a/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change b/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change new file mode 100644 index 000000000..b473074e1 --- /dev/null +++ b/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change @@ -0,0 +1,63 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-313a28b8f68b76aee4b94413e4e9d47dca93a34e"]] + +<div id="change-313a28b8f68b76aee4b94413e4e9d47dca93a34e" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn;h=0a435cea33a4220b3ada48df349662374c407ee4;hp=85c3176699789ecb37825b6df4fc483f93c1c2d5;hb=313a28b8f68b76aee4b94413e4e9d47dca93a34e;hpb=0bfcc8da5d769ff4ba9425a99d2c495175ea685e" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Frss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields&do=goto" rel="nofollow">bugs/rss feeds do not use recommended encoding of entities for some fields</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 30 Oct 2010 12:50:26 -0400">12:50:26 10/30/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=313a28b8f68b76aee4b94413e4e9d47dca93a34e&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +index 85c3176..0a435ce 100644 +--- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn ++++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +@@ -43,3 +43,10 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo + >> have "more" apply to the front page of the blog. Is there a way to do that? + >> -- [[dtaht]] + >> ++>>> To be clear, the RSS spec sucks to such an extent that, as far as ++>>> I know, there is no sort of title escaping that will work in all ++>>> RSS consumers. Titles are currently escaped in the way ++>>> that tends to break the fewest according to what I've read. ++>>> If you're unlucky enough to ++>>> have a "&" or "<" in your **name**, then you may still run into ++>>> problems with how that is escaped in rss feeds. --[[Joey]] + +</pre> +</div> + +<!-- 313a28b8f68b76aee4b94413e4e9d47dca93a34e --> diff --git a/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change b/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change new file mode 100644 index 000000000..4fd8dace1 --- /dev/null +++ b/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change @@ -0,0 +1,68 @@ +[[!meta author="""JoeRayhawk"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2FJoeRayhawk&do=goto"""]] + +[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-408af2bb9e10d2ed899e17f9814a5514c0254dc8"]] + +<div id="change-408af2bb9e10d2ed899e17f9814a5514c0254dc8" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/autoindex/discussion.mdwn;h=a48fe9df130758e796d422ca5cc8b5868eeb52d7;hp=2d6b6f1f0ad3b4e0944e4f81884442011765055f;hb=408af2bb9e10d2ed899e17f9814a5514c0254dc8;hpb=cbcd9077ad5fbef8c0622ea9c78a66c9baece804" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fautoindex%2Fdiscussion&do=goto" rel="nofollow">plugins/autoindex/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2FJoeRayhawk&do=goto" rel="nofollow">JoeRayhawk</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 07 Nov 2010 00:37:14 -0400">00:37:14 11/07/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=408af2bb9e10d2ed899e17f9814a5514c0254dc8&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +A wish for a noninvasive autoindex.<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn +index 2d6b6f1..a48fe9d 100644 +--- a/doc/plugins/autoindex/discussion.mdwn ++++ b/doc/plugins/autoindex/discussion.mdwn +@@ -61,3 +61,15 @@ If you just don't want to clutter your git repo, below it's a patch does the fol + + + Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] ++ ++------ ++ ++`autoindex_commit => 0` would be nice, but uncommited files are definitely not. ++<pre> ++remote: From /srv/git/test3 ++remote: 3047077..1df636c master -> origin/master ++remote: error: Untracked working tree file 'test.mdwn' would be overwritten by merge. Aborting ++remote: 'git pull --prune origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 201. ++</pre> ++ ++It'd be nice if we were able to notice directories with no associated compilable markup files and compile a simple map directive straight to HTML without any intermediate markup file being involved at all. -- JoeRayhawk + +</pre> +</div> + +<!-- 408af2bb9e10d2ed899e17f9814a5514c0254dc8 --> diff --git a/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change b/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change new file mode 100644 index 000000000..5ef53989c --- /dev/null +++ b/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change @@ -0,0 +1,55 @@ +[[!meta author="""civiccents"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]] + +[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-415effbb43663ad756d78b3e957ac593d0227a74"]] + +<div id="change-415effbb43663ad756d78b3e957ac593d0227a74" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/sandbox/D-Liberative.wiki;h=b8c94f310660c9e6ced3c7f9f73ddf6ae857918e;hp=69071521a7b26daa0744be2d2371743f954442df;hb=415effbb43663ad756d78b3e957ac593d0227a74;hpb=a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=sandbox%2FD-Liberative&do=goto" rel="nofollow">sandbox/D-Liberative</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto" rel="nofollow">civiccents</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 04 Nov 2010 16:40:10 -0400">16:40:10 11/04/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=415effbb43663ad756d78b3e957ac593d0227a74&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +grammer<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki +index 6907152..b8c94f3 100644 +--- a/doc/sandbox/D-Liberative.wiki ++++ b/doc/sandbox/D-Liberative.wiki +@@ -1 +1 @@ +-For now its just a concept... what if we could map deliberative capacity? ++For now its just a concept... what if a community could map its deliberative capacity? + +</pre> +</div> + +<!-- 415effbb43663ad756d78b3e957ac593d0227a74 --> diff --git a/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change b/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change new file mode 100644 index 000000000..21b129fb0 --- /dev/null +++ b/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change @@ -0,0 +1,58 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-471ac78068532da53e4dad49d52c5ddccfcbff21"]] + +<div id="change-471ac78068532da53e4dad49d52c5ddccfcbff21" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=3d98ee8b2638c23c53f4d3d3ffea52de6cf58d5d;hp=cb5e6df73b09ee9087a571dcfb772631af8e8c3d;hb=471ac78068532da53e4dad49d52c5ddccfcbff21;hpb=263cfa7d1e938e3b41d1b6826427f0d613b2b97c" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 06:09:41 -0400">06:09:41 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=471ac78068532da53e4dad49d52c5ddccfcbff21&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +typo<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +index cb5e6df..3d98ee8 100644 +--- a/doc/bugs/aggregate_generates_long_filenames.mdwn ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -1,4 +1,4 @@ +-the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename. This results in long filenames. I have hit a filesystem length limitation on several occasions. Some (ab)uses of RSS, e.g., twitter, ++the [[plugins/aggregate]] plugin mashes the `title` of an aggregated post into a filename. This results in long filenames. I have hit a filesystem length limitation on several occasions. Some (ab)uses of RSS, e.g., twitter, + generate long titles. Especially once you throw escaping into the mix: + + $ ikiwiki --setup testsetup --aggregate --refresh + +</pre> +</div> + +<!-- 471ac78068532da53e4dad49d52c5ddccfcbff21 --> diff --git a/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change b/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change new file mode 100644 index 000000000..19d7c3035 --- /dev/null +++ b/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change @@ -0,0 +1,73 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47726461a4119741affa6536deec7dd1fe52ef0d"]] + +<div id="change-47726461a4119741affa6536deec7dd1fe52ef0d" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment;h=3e10dbbd9e2f662397f924a7493561a843d59768;hp=0000000000000000000000000000000000000000;hb=47726461a4119741affa6536deec7dd1fe52ef0d;hpb=8935a131d02ac13b6024dff9cbf7a5f837fcdc04" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2Ffield_and_forms%2Fcomment_1_a0e976cb79f03dcff5e9a4511b90d160&do=goto" rel="nofollow">forum/field and forms/comment 1 a0e976cb79f03dcff5e9a4511b90d160</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 02:18:52 +0000">02:18:52 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=47726461a4119741affa6536deec7dd1fe52ef0d&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added a comment: Limitations<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment +new file mode 100644 +index 0000000..3e10dbb +--- /dev/null ++++ b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment +@@ -0,0 +1,19 @@ ++[[!comment format=mdwn ++ username="http://kerravonsen.dreamwidth.org/" ++ ip="60.241.8.244" ++ subject="Limitations" ++ date="2010-11-23T02:18:52Z" ++ content=""" ++I'd already had a look at this idea before you posted this suggestion, and I ran into difficulties. ++So far as I can see, it makes most sense to use the mechanisms already in place for editing pages, and enhance them. ++Unfortunately, the whole edit-page setup expects a template file (by default, when editing pages, editpage.tmpl) ++and anything apart from \"submit\" buttons must have a placeholder in the template file, or it doesn't get displayed at all in the form. ++At least, that's what I've found - I could be mistaken. ++ ++But if it's true, that rather puts the kybosh on dynamically generated forms, so far as I can see. ++I mean, if you knew beforehand what all your fields were going to be, you could make a copy of editpage.tmpl, add in your fields where you want, and then make a plugin that uses that template instead of editpage.tmpl, but that's very limited. ++ ++If someone could come up with a way of making dynamic forms, that would solve the problem, but I've come up against a brick wall myself. Joey? Anyone? ++ ++-- [[KathrynAndersen]] ++"""]] + +</pre> +</div> + +<!-- 47726461a4119741affa6536deec7dd1fe52ef0d --> diff --git a/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change b/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change new file mode 100644 index 000000000..e212c09e4 --- /dev/null +++ b/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change @@ -0,0 +1,60 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47b9f10e6254277918873a980af0cf0631326165"]] + +<div id="change-47b9f10e6254277918873a980af0cf0631326165" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=5df19c40575a7857d35a6b90957b94f213b6004c;hp=9f974be156571c76e96800f09320ca9a0af6f7b5;hb=47b9f10e6254277918873a980af0cf0631326165;hpb=ea48e1c038bfdab5820383cb885360c1d3fe2a14" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 15:39:22 -0400">15:39:22 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=47b9f10e6254277918873a980af0cf0631326165&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +index 9f974be..5df19c4 100644 +--- a/doc/bugs/logout_in_ikiwiki.mdwn ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -1,3 +1,7 @@ + It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? + + > Click on "Preferences". There is a logout button there. --liw ++ ++> It would be nice if it were not buried there, but putting it on the ++> action bar statically would be confusing. The best approach might be to ++> use javascript. --[[Joey]] + +</pre> +</div> + +<!-- 47b9f10e6254277918873a980af0cf0631326165 --> diff --git a/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change b/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change new file mode 100644 index 000000000..05105eacc --- /dev/null +++ b/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change @@ -0,0 +1,112 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-53e519931f3a6b7cea0af652d749344757d4e2bc"]] + +<div id="change-53e519931f3a6b7cea0af652d749344757d4e2bc" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn;h=70af505c124ac6ddb6e987c2625f92629de4690b;hp=0000000000000000000000000000000000000000;hb=53e519931f3a6b7cea0af652d749344757d4e2bc;hpb=5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fargument_isn__39__t_numeric%3A_mixing_templates_and_creation__95__date&do=goto" rel="nofollow">bugs/argument isn't numeric: mixing templates and creation_date</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:23:01 -0400">10:23:01 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=53e519931f3a6b7cea0af652d749344757d4e2bc&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +template files being treated as regular pages and the problems that can cause<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +new file mode 100644 +index 0000000..70af505 +--- /dev/null ++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +@@ -0,0 +1,58 @@ ++I get the following error when building my wiki ++ ++ Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547. ++ Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547. ++ ++that line corresponds to ++ ++ sub match_creation_year ($$;@) { ++ if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { <-- this one ++ return IkiWiki::SuccessReason->new('creation_year matched'); ++ } ++ ++A git bisect shows that the offending commit introduced this hunk ++ ++ ++ --- /dev/null ++ +++ b/templates/all_entry.mdwn ++ @@ -0,0 +1,23 @@ ++ +## <TMPL_VAR year> ++ + ++ +There ++ +<TMPL_IF current> ++ +have been ++ +<TMPL_ELSE> ++ +were ++ +</TMPL_IF> ++ +[[!pagecount pages=" ++ +log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft) ++ +and creation_year(<TMPL_VAR year>) ++ +and !*.png and !*.jpg ++ +"]] posts ++ +<TMPL_IF current> ++ +so far ++ +</TMPL_IF> ++ +in <TMPL_VAR year>. ++ + ++ +[[!inline pages=" ++ + log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft) ++ + and creation_year(<TMPL_VAR year>) ++ + and !*.png and !*.jpg ++ + " archive=yes feeds=no]] ++ ++The lines which feature creation_year(<TMPL_VAR year>) are most likely the culprits. That would explain why the error was repeated twice, and would tally with the file in `templates/` being rendered, rather than the inclusionists. ++ ++A workaround is to move the template outside of the srcdir into the external templates directory and include the file suffix when using it, e.g. ++ ++ \[[!template id=all_entry.tmpl year=2010 current=true]] ++ ++An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g. ++ ++ ++ \[[!if test="included()" then=""" ++ ...template... ++ """ else=""" ++ Nothing to see here. ++ """]] ++ ++In fact, this is probably best practice for in-srcdir templates. I'd consider this done if the documentation for the directive suggested it. -- [[Jon]] + +</pre> +</div> + +<!-- 53e519931f3a6b7cea0af652d749344757d4e2bc --> diff --git a/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change b/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change new file mode 100644 index 000000000..68bd2fc0c --- /dev/null +++ b/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change @@ -0,0 +1,70 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5430d5dc3bc37df92eb01cd65382c0f2be78b8e7"]] + +<div id="change-5430d5dc3bc37df92eb01cd65382c0f2be78b8e7" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn;h=83093895b37a4fb3be524cd237fc5ce8f5b2169d;hp=5485bba9ca2244260ae4ecb0894e935817bf377d;hb=5430d5dc3bc37df92eb01cd65382c0f2be78b8e7;hpb=62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fargument_isn__39__t_numeric%3A_mixing_templates_and_creation__95__date&do=goto" rel="nofollow">bugs/argument isn't numeric: mixing templates and creation_date</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:43:35 -0400">10:43:35 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=5430d5dc3bc37df92eb01cd65382c0f2be78b8e7&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +not quite done yet: if/included() doesn't work that way.<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +index 5485bba..8309389 100644 +--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn ++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +@@ -46,8 +46,7 @@ A workaround is to move the template outside of the srcdir into the external tem + + \[[!template id=all_entry.tmpl year=2010 current=true]] + +-An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g. +- ++I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with the `included()` test, would be an option here, E.g. + + \[[!if test="included()" then=""" + ...template... +@@ -55,6 +54,4 @@ An alternative fix is to wrap the entire template inside a test to see whether t + Nothing to see here. + """]] + +-In fact, this is probably best practice for in-srcdir templates. I'd consider this done if the documentation for the directive suggested it. -- [[Jon]] +- +-> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]] ++However this doesn't work. I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]] + +</pre> +</div> + +<!-- 5430d5dc3bc37df92eb01cd65382c0f2be78b8e7 --> diff --git a/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change b/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change new file mode 100644 index 000000000..518a8c974 --- /dev/null +++ b/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change @@ -0,0 +1,108 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5954915a4fe8a889b8217cac99fae53cbe7f1e97"]] + +<div id="change-5954915a4fe8a889b8217cac99fae53cbe7f1e97" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=f8ec4c420469f47168ced54b93dbe75fa39dfdab;hp=80925b458287767620d8862f782e77b1bd7dda63;hb=5954915a4fe8a889b8217cac99fae53cbe7f1e97;hpb=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 20:04:11 +0000">20:04:11 11/22/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=5954915a4fe8a889b8217cac99fae53cbe7f1e97&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index 80925b4..f8ec4c4 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -201,6 +201,10 @@ New API added by this branch: + >> + >> I personally think breaking the docwiki is enough to block that. + >> ++ >>> Well, the docwiki doesn't have an url configured at all, so I assumed ++ >>> it would need to fall back to current behavior in that case. I had ++ >>> not thought about browsing wiki's html files though, good point. ++ >> + >> How about this? + >> + >> * `urlto($link, $page)` with `$page` defined: relative +@@ -210,12 +214,24 @@ New API added by this branch: + >> normally undef): absolute, starts with `http[s]://` + >> + >> --[[smcv]] ++ >> ++ >>> That makes a great deal of sense, bravo for actually removing ++ >>> parameters in the common case while maintaining backwards ++ >>> compatability! ++ >>> ++ >>> It does highlight that it would be better to have a ++ >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` ) ++ >>> rather than the 3 parameter form. --[[Joey]] + + * `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + + > I assume you have no objection to this --[[smcv]] + ++ >> It's so little used that I don't really care if it's a bit ugly. ++ >> (But I assume changes to `urlto` will follow through here anyway.) ++ >> --[[Joey]] ++ + * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + + > Possibly changed to making this always be local unless `cgiurl => $x` +@@ -225,6 +241,8 @@ New API added by this branch: + except `cgiurl` and/or `local_cgiurl` + + > I assume you have no objection to this --[[smcv]] ++ > ++ >> Nod, although I don't know of a use case. --[[Joey]] + + Bugs: + +@@ -243,6 +261,10 @@ Bugs: + >> would you accept a patch that makes `cgiurl` default to a local + >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]] + ++ >>> Yes, I absolutely think it should default to local. (Note that ++ >>> if `absolute()` were implemented as suggested above, it could also ++ >>> be used with cgiurl if necessary.) --[[Joey]] ++ + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + + +</pre> +</div> + +<!-- 5954915a4fe8a889b8217cac99fae53cbe7f1e97 --> diff --git a/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change b/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change new file mode 100644 index 000000000..554057cb7 --- /dev/null +++ b/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change @@ -0,0 +1,140 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to security on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5dbf25127fb776cc52a3a142b805a0c7f3cef242"]] + +<div id="change-5dbf25127fb776cc52a3a142b805a0c7f3cef242" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/security.mdwn;h=2c342b19986104ed27b46c6c736768d34ad82c15;hp=33b199247dbf541362097124a984ceba6d93658e;hb=5dbf25127fb776cc52a3a142b805a0c7f3cef242;hpb=d8de98911ec98f9e4560ab2939b4edf8fb04066b" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=security&do=goto" rel="nofollow">security</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 00:45:00 -0400">00:45:00 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=5dbf25127fb776cc52a3a142b805a0c7f3cef242&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +releasing version 3.20101112<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/debian/changelog b/debian/changelog +index 2c4c927..f8dc04e 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,4 +1,4 @@ +-ikiwiki (3.20101024) UNRELEASED; urgency=low ++ikiwiki (3.20101112) unstable; urgency=HIGH + + * txt: Fix display when used inside a format directive. + * highlight: Ensure that other, more-specific format plugins, +@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low + * comments: Make comment() pagespec also match comments that are being + posted. + +- -- Joey Hess <joeyh@debian.org> Mon, 25 Oct 2010 22:30:29 -0400 ++ -- Joey Hess <joeyh@debian.org> Fri, 12 Nov 2010 00:36:06 -0400 + + ikiwiki (3.20101023) unstable; urgency=low + +diff --git a/doc/security.mdwn b/doc/security.mdwn +index 33b1992..2c342b1 100644 +--- a/doc/security.mdwn ++++ b/doc/security.mdwn +@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not + scrub comments. + + Additionally, it was discovered that comments' html was never scrubbed during +-preview or moderation of comments. ++preview or moderation of comments with such a configuration. + + These problems were discovered on 12 November 2010 and fixed the same + hour with the release of ikiwiki 3.20101112. +diff --git a/ikiwiki.spec b/ikiwiki.spec +index 7653ac6..5ef4390 100644 +--- a/ikiwiki.spec ++++ b/ikiwiki.spec +@@ -1,5 +1,5 @@ + Name: ikiwiki +-Version: 3.20101023 ++Version: 3.20101112 + Release: 1%{?dist} + Summary: A wiki compiler + +diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot +index fa65b6f..e4274d0 100644 +--- a/po/ikiwiki.pot ++++ b/po/ikiwiki.pot +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2010-10-23 17:21-0400\n" ++"POT-Creation-Date: 2010-11-12 00:37-0400\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <LL@li.org>\n" +@@ -203,7 +203,7 @@ msgstr "" + msgid "moderation" + msgstr "" + +-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 ++#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 + #, perl-format + msgid "unsupported page format %s" + msgstr "" +@@ -268,7 +268,7 @@ msgstr "" + msgid "comment moderation" + msgstr "" + +-#: ../IkiWiki/Plugin/comments.pm:822 ++#: ../IkiWiki/Plugin/comments.pm:828 + #, perl-format + msgid "%i comment" + msgid_plural "%i comments" +@@ -278,7 +278,7 @@ msgstr[1] "" + #. translators: Here "Comment" is a verb; + #. translators: the user clicks on it to + #. translators: post a comment. +-#: ../IkiWiki/Plugin/comments.pm:832 ++#: ../IkiWiki/Plugin/comments.pm:838 + msgid "Comment" + msgstr "" + +@@ -411,7 +411,7 @@ msgid "" + "warning: highlight perl module not available; falling back to pass through" + msgstr "" + +-#: ../IkiWiki/Plugin/htmltidy.pm:62 ++#: ../IkiWiki/Plugin/htmltidy.pm:63 + msgid "htmltidy failed to parse this html" + msgstr "" + + +</pre> +</div> + +<!-- 5dbf25127fb776cc52a3a142b805a0c7f3cef242 --> diff --git a/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change b/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change new file mode 100644 index 000000000..0c598219d --- /dev/null +++ b/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change @@ -0,0 +1,74 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9"]] + +<div id="change-5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/transient_in-memory_pages.mdwn;h=edf056e4a5ef5284366bc0d9c32979459b5b7db2;hp=816e95c382dd64c51783cd549ca343194d3dfaab;hb=5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9;hpb=85ee24a9e53aec7d70bb4fb758428e59ea76e853" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Ftransient_in-memory_pages&do=goto" rel="nofollow">todo/transient in-memory pages</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 07:14:21 -0400">07:14:21 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +more discussion<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn +index 816e95c..edf056e 100644 +--- a/doc/todo/transient_in-memory_pages.mdwn ++++ b/doc/todo/transient_in-memory_pages.mdwn +@@ -46,3 +46,21 @@ Refinements that could be made if this approach seems reasonable: + >> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that? + >> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay. + >> --[[KathrynAndersen]] ++ ++>>> What I had in mind was more like `tag_autocreate_transient => 1` or ++>>> `autoindex_transient => 1`; you might conceivably want tags to be ++>>> checked in but autoindices to be transient, and it's fine for each ++>>> plugin to make its own decision. Going from that to one boolean ++>>> (or just always-transient if people don't think that's too ++>>> astonishing) would be trivial, though. ++>>> ++>>> I don't think relocating the transient underlay really makes sense, ++>>> except for prototyping: you only want one, and `.ikiwiki` is as good ++>>> a place as any (ikiwiki already needs to be able to write there). ++>>> ++>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer ++>>> pages always-transient - you can always make a transient page ++>>> permanent by editing it, after all. ++>>> ++>>> Do you think this approach has enough potential that I should ++>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]] + +</pre> +</div> + +<!-- 5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9 --> diff --git a/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change b/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change new file mode 100644 index 000000000..cb1e325e8 --- /dev/null +++ b/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change @@ -0,0 +1,77 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to security on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5f750e16b8c32d2fd69209f433e7d19efa53a71f"]] + +<div id="change-5f750e16b8c32d2fd69209f433e7d19efa53a71f" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/security.mdwn;h=4fa531eb14a4c842f401fee72d845c19e481c1da;hp=2c342b19986104ed27b46c6c736768d34ad82c15;hb=5f750e16b8c32d2fd69209f433e7d19efa53a71f;hpb=65ecc73755348f1ed13b77b2f4bdf9db4e465be4" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=security&do=goto" rel="nofollow">security</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 10:25:21 -0400">10:25:21 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=5f750e16b8c32d2fd69209f433e7d19efa53a71f&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +CVE id<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/debian/changelog b/debian/changelog +index f8dc04e..582a8e3 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH + (Thanks, Tuomas Jormola) + * Fix htmlscrubber_skip to be matched on the source page, not the page it is + inlined into. Should allow setting to "* and !comment(*)" to scrub +- comments, but leave your blog posts unscrubbed, etc. ++ comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673 + * comments: Make postcomment() pagespec work when previewing a comment, +- including during moderation. ++ including during moderation. CVE-2010-1673 + * comments: Make comment() pagespec also match comments that are being +- posted. ++ posted. CVE-2010-1673 + + -- Joey Hess <joeyh@debian.org> Fri, 12 Nov 2010 00:36:06 -0400 + +diff --git a/doc/security.mdwn b/doc/security.mdwn +index 2c342b1..4fa531e 100644 +--- a/doc/security.mdwn ++++ b/doc/security.mdwn +@@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during + preview or moderation of comments with such a configuration. + + These problems were discovered on 12 November 2010 and fixed the same +-hour with the release of ikiwiki 3.20101112. ++hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]]) + +</pre> +</div> + +<!-- 5f750e16b8c32d2fd69209f433e7d19efa53a71f --> diff --git a/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change b/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change new file mode 100644 index 000000000..7ee29dff3 --- /dev/null +++ b/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change @@ -0,0 +1,61 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-608cef54d63ba60efd24ae14012dda7ff8d014a9"]] + +<div id="change-608cef54d63ba60efd24ae14012dda7ff8d014a9" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=43571ead77346a1c5528360eec0e369958f2de7c;hp=c4d3a8ecb07bd1722646aba5a3eddfc4b2866fb6;hb=608cef54d63ba60efd24ae14012dda7ff8d014a9;hpb=9d26a72468fad69d633875b4ffb4aff8abd80023" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 14 Nov 2010 22:01:21 -0400">22:01:21 11/14/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=608cef54d63ba60efd24ae14012dda7ff8d014a9&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +theory about differences in speed of memoize and non-memoize patches<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index c4d3a8e..43571ea 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -20,6 +20,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >>>> is less verbose than Kathryn's patch but also not as + >>>> fast; I'm not sure why, tbh. --[[smcv]] + ++>>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]] ++ + -------------------------------------------------------------- + Benchmarks done with Devel::Profile on the same testbed IkiWiki setup. I'm just showing the start of the profile output, since that's what's relevant. + + +</pre> +</div> + +<!-- 608cef54d63ba60efd24ae14012dda7ff8d014a9 --> diff --git a/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change b/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change new file mode 100644 index 000000000..b2e825460 --- /dev/null +++ b/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change @@ -0,0 +1,66 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/use_secure_cookies_for_ssl_logins on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-61218e338a7517b25fc82697c3a11fff1edb6803"]] + +<div id="change-61218e338a7517b25fc82697c3a11fff1edb6803" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/use_secure_cookies_for_ssl_logins.mdwn;h=a91a15b987874ac3b160b6689322d508a51272d8;hp=0000000000000000000000000000000000000000;hb=61218e338a7517b25fc82697c3a11fff1edb6803;hpb=9180381728e252cf474eb8a4b0460755b5c28340" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fuse_secure_cookies_for_ssl_logins&do=goto" rel="nofollow">todo/use secure cookies for ssl logins</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 23:59:03 +0000">23:59:03 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=61218e338a7517b25fc82697c3a11fff1edb6803&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +another branch<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn +new file mode 100644 +index 0000000..a91a15b +--- /dev/null ++++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn +@@ -0,0 +1,12 @@ ++[[!template id=gitbranch branch=smcv/ready/sslcookie-auto author="[[smcv]]"]] ++[[!tag patch]] ++ ++At the moment `sslcookie => 0` never creates secure cookies, so if you log in ++with SSL, your browser will send the session cookie even over plain HTTP. ++Meanwhile `sslcookie => 1` always creates secure cookies, so you can't ++usefully log in over plain http. ++ ++This branch adds `sslcookie => 0, sslcookie_auto => 1` as an option; this ++uses the `HTTPS` environment variable, so if you log in over SSL you'll ++get a secure session cookie, but if you log in over HTTP, you won't. ++(The syntax for the setup file is pretty rubbish - any other suggestions?) + +</pre> +</div> + +<!-- 61218e338a7517b25fc82697c3a11fff1edb6803 --> diff --git a/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change b/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change new file mode 100644 index 000000000..22b4e9219 --- /dev/null +++ b/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change @@ -0,0 +1,65 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-615bf4fe15e7300bc033724bf86eecb6a2efef49"]] + +<div id="change-615bf4fe15e7300bc033724bf86eecb6a2efef49" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment;h=bd964d5407de1e01e11e5bda195e2499c155004b;hp=0000000000000000000000000000000000000000;hb=615bf4fe15e7300bc033724bf86eecb6a2efef49;hpb=61218e338a7517b25fc82697c3a11fff1edb6803" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FNeed_something_more_powerful_than_Exclude%2Fcomment_2_f577ab6beb9912471949d8d18c790267&do=goto" rel="nofollow">forum/Need something more powerful than Exclude/comment 2 f577ab6beb9912471949d8d18c790267</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 25 Nov 2010 02:55:21 +0000">02:55:21 11/25/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=615bf4fe15e7300bc033724bf86eecb6a2efef49&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added a comment: Missed It By That Much<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment +new file mode 100644 +index 0000000..bd964d5 +--- /dev/null ++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment +@@ -0,0 +1,11 @@ ++[[!comment format=mdwn ++ username="http://kerravonsen.dreamwidth.org/" ++ ip="60.241.8.244" ++ subject="Missed It By That Much" ++ date="2010-11-25T02:55:20Z" ++ content=""" ++I discovered that I not only needed to change the regexp, but I also needed to delete .ikiwiki/indexdb because `file_pruned` only gets called for files that aren't in the `%pagesources` hash, and since the file in question was already there because it had been put there before the exclude regex was changed, it wasn't even being checked! ++ ++[[KathrynAndersen]] ++ ++"""]] + +</pre> +</div> + +<!-- 615bf4fe15e7300bc033724bf86eecb6a2efef49 --> diff --git a/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change new file mode 100644 index 000000000..b784d2250 --- /dev/null +++ b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change @@ -0,0 +1,102 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14"]] + +<div id="change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/template.mdwn;h=9e3ae54dfd6209c92528ace49ad5ae2b3279d486;hp=df391f99e0a23dd7cda85a8c29c1aef80baa707f;hb=62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14;hpb=9d0ac3170a8f90d2139ef75698e8af21a6435fb4" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Ftemplate&do=goto" rel="nofollow">ikiwiki/directive/template</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:41:40 -0400">10:41:40 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +I totally misinterpreted what included() is supposed to be for.<br /> + + + + + +This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn +index df391f9..9e3ae54 100644 +--- a/doc/ikiwiki/directive/template.mdwn ++++ b/doc/ikiwiki/directive/template.mdwn +@@ -60,30 +60,22 @@ few things: + `<TMPL_IF variable>text</TMPL_IF>`. + * To use one block of text if a variable is set and a second if it's not, + use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>` +-* Each template file included in the wiki's source will also generate a regular +- wiki page. In many cases you might want to prevent some of your template +- being interpreted for the regular page. Use the [[if]] directive with the +- `included()` test to guard the template code. + + Here's a sample template: + +- \[[!if test="included()" then=""" +- <span class="infobox"> +- Name: \[[<TMPL_VAR raw_name>]]<br /> +- Age: <TMPL_VAR age><br /> +- <TMPL_IF color> +- Favorite color: <TMPL_VAR color><br /> +- <TMPL_ELSE> +- No favorite color.<br /> +- </TMPL_IF> +- <TMPL_IF notes> +- <hr /> +- <TMPL_VAR notes> +- </TMPL_IF> +- </span> +- """ else=""" +- This is a template page. +- """]] ++ <span class="infobox"> ++ Name: \[[<TMPL_VAR raw_name>]]<br /> ++ Age: <TMPL_VAR age><br /> ++ <TMPL_IF color> ++ Favorite color: <TMPL_VAR color><br /> ++ <TMPL_ELSE> ++ No favorite color.<br /> ++ </TMPL_IF> ++ <TMPL_IF notes> ++ <hr /> ++ <TMPL_VAR notes> ++ </TMPL_IF> ++ </span> + + The filled out template will be formatted the same as the rest of the page + that contains it, so you can include WikiLinks and all other forms of wiki + +</pre> +</div> + +<!-- 62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14 --> diff --git a/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change b/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change new file mode 100644 index 000000000..3924a71bd --- /dev/null +++ b/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change @@ -0,0 +1,63 @@ +[[!meta author="""http://cristian.regolo.cc/"""]] + +[[!meta authorurl="""http://cristian.regolo.cc/"""]] + +[[!meta title="""change to examples/blog on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65873fee5e1dda78d6cf561cdd81a5dcd6d2735d"]] + +<div id="change-65873fee5e1dda78d6cf561cdd81a5dcd6d2735d" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/examples/blog.mdwn;h=5f8f6c3ce192bc2e02d7d566e8032fdb3810316d;hp=b25601227b41ae39e51728d8e7747ee03e27db98;hb=65873fee5e1dda78d6cf561cdd81a5dcd6d2735d;hpb=1f32f5e6184b6354f671ae71578f1158c49168b6" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=examples%2Fblog&do=goto" rel="nofollow">examples/blog</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://cristian.regolo.cc/" rel="nofollow">cristiangreco</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 05 Nov 2010 11:49:36 -0400">11:49:36 11/05/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=65873fee5e1dda78d6cf561cdd81a5dcd6d2735d&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +add link to tag plugin page<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn +index b256012..5f8f6c3 100644 +--- a/doc/examples/blog.mdwn ++++ b/doc/examples/blog.mdwn +@@ -10,8 +10,8 @@ Some additional configuration you might want to do, if not using + + * Make sure to configure ikiwiki to generate RSS or Atom feeds. + +-* Make sure you have the tag plugin enabled, and the `tagbase` set to +- "tags". Tag pages will then automatically be created. ++* Make sure you have the [[tag|plugins/tag]] plugin enabled, and the ++ `tagbase` set to "tags". Tag pages will then automatically be created. + An example of how to tag a post is: + \[[!tag life]] + + +</pre> +</div> + +<!-- 65873fee5e1dda78d6cf561cdd81a5dcd6d2735d --> diff --git a/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change b/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change new file mode 100644 index 000000000..a70dbb1af --- /dev/null +++ b/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change @@ -0,0 +1,90 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65e726f201d7b9919271cfe7e8a7314a6abf0fc3"]] + +<div id="change-65e726f201d7b9919271cfe7e8a7314a6abf0fc3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn;h=d55fc0aa82b247be8532bddbc91f46bb22d4578c;hp=9725b6541855c79fc8360e74857bd5737fb43834;hb=65e726f201d7b9919271cfe7e8a7314a6abf0fc3;hpb=2a452ddf146c4148155095e400f56b4674d76953" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Freplace_HTML%3A%3ATemplate_with_Template_Toolkit&do=goto" rel="nofollow">todo/replace HTML::Template with Template Toolkit</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 13:42:52 -0400">13:42:52 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=65e726f201d7b9919271cfe7e8a7314a6abf0fc3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +index 9725b65..d55fc0a 100644 +--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn ++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +@@ -5,9 +5,14 @@ features and thus makes it rather hard to give an ikiwiki site a consistent + look. If you browse the templates provided in the tarball, you'll notice that + more than one of them contain the `<html>` tag, which is unnecessary. + ++> Note that is no longer true, and I didn't have to do such an intrusive ++> change to fix it either. --[[Joey]] ++ + Maybe it's just me, I also find HTML::Template cumbersome to use, due in part + to its use of capital letters. + ++> Its entirely optional use of capital letters? --[[Joey]] ++ + Finally, the software seems unmaintained: the mailing list and searchable + archives linked from + <http://html-template.sourceforge.net/html_template.html#frequently%20asked%20questions> +@@ -62,4 +67,21 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer + + I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian + +-> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs. However, I also agree that HTML::Template has its own problems too. The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess. One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends. There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]] ++> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as ++> others have said above, it's overkill for my needs. However, I also ++> agree that HTML::Template has its own problems too. The idea of making ++> the template system modular, with a choice of which backend to use - I ++> really like that idea. It would enable me to use some other template ++> system I like better, such as Text::Template or Text::NeatTemplate. But I ++> think it would be a lot of work to implement, though perhaps no more work ++> than making the revision-control backend modular, I guess. One would ++> need to write an IkiWiki template interface that didn't care what the ++> backend was, and yet is somehow still flexible enough to take advantage ++> of special features of different backends. There are an *awful lot* of ++> things that use templates - not just the `pagetemplate` and `template` ++> plugins, but a number of others which have specialized templates of their ++> own. -- [[KathrynAndersen]]a ++ ++>> A modular template system in ikiwiki is unlikely, as template objects ++>> are part of the API, notably the `pagetemplate` hook. Unless the other ++>> system has a compatible template object. --[[Joey]] + +</pre> +</div> + +<!-- 65e726f201d7b9919271cfe7e8a7314a6abf0fc3 --> diff --git a/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change b/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change new file mode 100644 index 000000000..24d7bd43d --- /dev/null +++ b/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change @@ -0,0 +1,109 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to news/version_3.20100831 news/version_3.20101112 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65ecc73755348f1ed13b77b2f4bdf9db4e465be4"]] + +<div id="change-65ecc73755348f1ed13b77b2f4bdf9db4e465be4" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/version_3.20100831.mdwn;h=0000000000000000000000000000000000000000;hp=152e3c2f771ab83fd1e6a99b243eeba3fac3eb38;hb=65ecc73755348f1ed13b77b2f4bdf9db4e465be4;hpb=5dbf25127fb776cc52a3a142b805a0c7f3cef242" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=news%2Fversion_3.20100831&do=goto" rel="nofollow">news/version 3.20100831</a> + + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/version_3.20101112.mdwn;h=ad591445f5e2476e6085d6731485578e99efb1c6;hp=0000000000000000000000000000000000000000;hb=65ecc73755348f1ed13b77b2f4bdf9db4e465be4;hpb=5dbf25127fb776cc52a3a142b805a0c7f3cef242" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=news%2Fversion_3.20101112&do=goto" rel="nofollow">news/version 3.20101112</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 00:46:29 -0400">00:46:29 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=65ecc73755348f1ed13b77b2f4bdf9db4e465be4&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +add news item for ikiwiki 3.20101112<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn +deleted file mode 100644 +index 152e3c2..0000000 +--- a/doc/news/version_3.20100831.mdwn ++++ /dev/null +@@ -1,27 +0,0 @@ +-ikiwiki 3.20100831 released with [[!toggle text="these changes"]] +-[[!toggleable text=""" +- * filecheck: Fall back to using the file command if the freedesktop +- magic file cannot identify a file. +- * flattr: New plugin. (Thanks to jaywalk for the initial implementation +- at a flattr plugin! This one is less configurable, but simpler.) +- * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) +- * openid: Syntax tweak to the javascript code to make it work with MSIE 7 +- (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting +- the bug and providing access to debug it. +- * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. +- * htmlscrubber: Do not scrub url anchors that contain colons. +- * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673) +- * highlight: Make location of highlight's files configurable in setup +- file to allow for nonstandard installations. +- * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. +- * Run the preprocess hooks in scan mode *before* the scan hooks. +- This allows the po plugin to register a scan hook that runs +- last and rescans pages after all data from the first scan pass is +- completed. This avoids the po plugin needing to rebuild some pages. +- (intrigeri) +- * po: Fix some bugs that affected l10n.ikiwiki.info's unusual +- setup. (intrigeri) +- * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure +- bzr whoami before committing. +- * httpauth: Avoid redirecting the user to the cgiauthurl if +- they already have a login session."""]] +\ No newline at end of file +diff --git a/doc/news/version_3.20101112.mdwn b/doc/news/version_3.20101112.mdwn +new file mode 100644 +index 0000000..ad59144 +--- /dev/null ++++ b/doc/news/version_3.20101112.mdwn +@@ -0,0 +1,17 @@ ++ikiwiki 3.20101112 released with [[!toggle text="these changes"]] ++[[!toggleable text=""" ++ * txt: Fix display when used inside a format directive. ++ * highlight: Ensure that other, more-specific format plugins, ++ like txt are used in preference to this one in case of ties. ++ * htmltidy, sortnaturally: Add missing checkconfig hook ++ registration. Closes: #[601912](http://bugs.debian.org/601912) ++ (Thanks, Craig Lennox and Tuomas Jormola) ++ * git: Use author date, not committer date. Closes: #[602012](http://bugs.debian.org/602012) ++ (Thanks, Tuomas Jormola) ++ * Fix htmlscrubber\_skip to be matched on the source page, not the page it is ++ inlined into. Should allow setting to "* and !comment(*)" to scrub ++ comments, but leave your blog posts unscrubbed, etc. ++ * comments: Make postcomment() pagespec work when previewing a comment, ++ including during moderation. ++ * comments: Make comment() pagespec also match comments that are being ++ posted."""]] +\ No newline at end of file + +</pre> +</div> + +<!-- 65ecc73755348f1ed13b77b2f4bdf9db4e465be4 --> diff --git a/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change b/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change new file mode 100644 index 000000000..2e82b0982 --- /dev/null +++ b/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change @@ -0,0 +1,52 @@ +[[!meta author="""http://liw.fi/"""]] + +[[!meta authorurl="""http://liw.fi/"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-663d2578832dd0808ea98a624b49cec4bf3c0243"]] + +<div id="change-663d2578832dd0808ea98a624b49cec4bf3c0243" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=9f974be156571c76e96800f09320ca9a0af6f7b5;hp=ad89f4c2d18bcb55c42c8b39222cba2ae8ae465b;hb=663d2578832dd0808ea98a624b49cec4bf3c0243;hpb=1b770bea3fd5b5dfb4e75237218db204139d9189" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://liw.fi/" rel="nofollow">Lars_Wirzenius</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 13:39:29 -0400">13:39:29 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=663d2578832dd0808ea98a624b49cec4bf3c0243&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +index ad89f4c..9f974be 100644 +--- a/doc/bugs/logout_in_ikiwiki.mdwn ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -1 +1,3 @@ + It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? ++ ++> Click on "Preferences". There is a logout button there. --liw + +</pre> +</div> + +<!-- 663d2578832dd0808ea98a624b49cec4bf3c0243 --> diff --git a/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change b/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change new file mode 100644 index 000000000..685541d22 --- /dev/null +++ b/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change @@ -0,0 +1,80 @@ +[[!meta author="""dark"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]] + +[[!meta title="""change to todo/selective_more_directive on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-69a22a6f4b4dfc47a7ce39476758742036b70e63"]] + +<div id="change-69a22a6f4b4dfc47a7ce39476758742036b70e63" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/selective_more_directive.mdwn;h=24e6ab568a7e8aa4f2acc2a113bd554ef62dc2c9;hp=0000000000000000000000000000000000000000;hb=69a22a6f4b4dfc47a7ce39476758742036b70e63;hpb=ca166361973e09b6756acbfe46b4a1bcfa4148d7" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fselective_more_directive&do=goto" rel="nofollow">todo/selective more directive</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto" rel="nofollow">dark</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 01 Nov 2010 16:55:20 -0400">16:55:20 11/01/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=69a22a6f4b4dfc47a7ce39476758742036b70e63&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +proposal plus patch<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn +new file mode 100644 +index 0000000..24e6ab5 +--- /dev/null ++++ b/doc/todo/selective_more_directive.mdwn +@@ -0,0 +1,26 @@ ++I'm setting up a blog for NaNoWriMo and other story-writing, which means long posts every day. I want to have excerpts on the front page, which link to the full length story posts. I also want a dedicated page for each story which inlines the story in full and in chronological order. I can use the "more" directive to achieve this effect on the front page but then it spoils the story page. My solution was to add a pages= parameter to the more directive to make it more selective. ++ ++ --- /usr/share/perl5/IkiWiki/Plugin/more.pm 2010-10-09 00:09:24.000000000 +0000 ++ +++ .ikiwiki/IkiWiki/Plugin/more.pm 2010-11-01 20:24:59.000000000 +0000 ++ @@ -26,7 +26,10 @@ ++ ++ $params{linktext} = $linktext unless defined $params{linktext}; ++ ++ - if ($params{page} ne $params{destpage}) { ++ + if ($params{page} ne $params{destpage} && ++ + (! exists $params{pages} || ++ + pagespec_match($params{destpage}, $params{pages}, ++ + location => $params{page}))) { ++ return "\n". ++ htmllink($params{page}, $params{destpage}, $params{page}, ++ linktext => $params{linktext}, ++ ++I can now call it as ++ ++ \[[!more pages="index" linktext="Chapter 1" text=""" ++ etc ++ """]] ++ ++I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. ++ ++-- [[dark]] + +</pre> +</div> + +<!-- 69a22a6f4b4dfc47a7ce39476758742036b70e63 --> diff --git a/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change b/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change new file mode 100644 index 000000000..81292322e --- /dev/null +++ b/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change @@ -0,0 +1,59 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-78a2e59834d35da7a7ab8145beb7a30b59b95c90"]] + +<div id="change-78a2e59834d35da7a7ab8145beb7a30b59b95c90" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Need_something_more_powerful_than_Exclude.mdwn;h=5e8043258d7aa29acf6e4edbdf63a96c7c2bc68f;hp=0000000000000000000000000000000000000000;hb=78a2e59834d35da7a7ab8145beb7a30b59b95c90;hpb=47726461a4119741affa6536deec7dd1fe52ef0d" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FNeed_something_more_powerful_than_Exclude&do=goto" rel="nofollow">forum/Need something more powerful than Exclude</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 02:47:38 +0000">02:47:38 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=78a2e59834d35da7a7ab8145beb7a30b59b95c90&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +exclusion doesn't exclude<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Need_something_more_powerful_than_Exclude.mdwn b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn +new file mode 100644 +index 0000000..5e80432 +--- /dev/null ++++ b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn +@@ -0,0 +1,5 @@ ++When I originally looked at the "exclude" option, I thought it meant that it excluded pages completely, but it apparently doesn't. What I've found in practice is that a file which matches the "exclude" regex is excluded from *processing*, but it is still copied over to the destination directory. Thus, for example, if I have "^Makefile$" as the exclude pattern, and I have a file `src/foo/Makefile`, then that file is copied unaltered into `dest/foo/Makefile`. However, what I want is for `src/foo/Makefile` to be completely ignored: that it is not only not processed, but not even *copied* into the destination directory. ++ ++I'm not sure if the current behaviour is a bug or a feature, but I would like a "totally ignore this file" feature if it's possible to have one. ++ ++-- [[KathrynAndersen]] + +</pre> +</div> + +<!-- 78a2e59834d35da7a7ab8145beb7a30b59b95c90 --> diff --git a/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change b/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change new file mode 100644 index 000000000..11774dd92 --- /dev/null +++ b/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change @@ -0,0 +1,62 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to ikiwiki/directive/if on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-84fff62948ad7c7aef664585e8afed86398e7fd4"]] + +<div id="change-84fff62948ad7c7aef664585e8afed86398e7fd4" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/if.mdwn;h=492adf4993239ea775ba2756eaa0a08c3a8fe12a;hp=2cbf70cdf4af699f2ec30ad72bd1fc6aac14cf56;hb=84fff62948ad7c7aef664585e8afed86398e7fd4;hpb=5430d5dc3bc37df92eb01cd65382c0f2be78b8e7" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Fif&do=goto" rel="nofollow">ikiwiki/directive/if</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:46:13 -0400">10:46:13 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=84fff62948ad7c7aef664585e8afed86398e7fd4&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +note about template inclusion<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn +index 2cbf70c..492adf4 100644 +--- a/doc/ikiwiki/directive/if.mdwn ++++ b/doc/ikiwiki/directive/if.mdwn +@@ -43,6 +43,8 @@ with the following additional tests: + + * included() + +- Tests whether the page is being included onto another page. ++ Tests whether the page is being included onto another page, for example ++ via [[inline]] or [[map]]. Note that pages inserted into other pages ++ via [[template]] are not matched here. + + [[!meta robots="noindex, follow"]] + +</pre> +</div> + +<!-- 84fff62948ad7c7aef664585e8afed86398e7fd4 --> diff --git a/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change b/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change new file mode 100644 index 000000000..4a0b34b6b --- /dev/null +++ b/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change @@ -0,0 +1,55 @@ +[[!meta author="""http://edrex.myopenid.com/"""]] + +[[!meta authorurl="""http://edrex.myopenid.com/"""]] + +[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85d262e4cab2bfa55194b445d7fd251fa5818bc6"]] + +<div id="change-85d262e4cab2bfa55194b445d7fd251fa5818bc6" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/auto-create_tag_pages_according_to_a_template.mdwn;h=676e2bc00dba7a139a1d606da79a46c46104c257;hp=92c3b769509f6600ff4878842cfa747d7c6b5829;hb=85d262e4cab2bfa55194b445d7fd251fa5818bc6;hpb=b62581583107f6fc3e9bccf66a87a491c236757f" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fauto-create_tag_pages_according_to_a_template&do=goto" rel="nofollow">todo/auto-create tag pages according to a template</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://edrex.myopenid.com/" rel="nofollow">edrex</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 30 Oct 2010 17:24:17 -0400">17:24:17 10/30/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=85d262e4cab2bfa55194b445d7fd251fa5818bc6&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +index 92c3b76..676e2bc 100644 +--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn ++++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +@@ -260,5 +260,6 @@ required to implement [[todo/alias directive]], which couldn't be easily done + by writing to the RCS as the page's contents can change depending on which + other pages claim it as an alias. --[[chrysn]] + ++I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]] + + [[!tag done]] + +</pre> +</div> + +<!-- 85d262e4cab2bfa55194b445d7fd251fa5818bc6 --> diff --git a/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change b/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change new file mode 100644 index 000000000..11cb32339 --- /dev/null +++ b/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change @@ -0,0 +1,56 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85ee24a9e53aec7d70bb4fb758428e59ea76e853"]] + +<div id="change-85ee24a9e53aec7d70bb4fb758428e59ea76e853" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=40decb392b97533a833dec37768399bfa417a8cc;hp=3d98ee8b2638c23c53f4d3d3ffea52de6cf58d5d;hb=85ee24a9e53aec7d70bb4fb758428e59ea76e853;hpb=471ac78068532da53e4dad49d52c5ddccfcbff21" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 06:11:40 -0400">06:11:40 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=85ee24a9e53aec7d70bb4fb758428e59ea76e853&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +index 3d98ee8..40decb3 100644 +--- a/doc/bugs/aggregate_generates_long_filenames.mdwn ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -7,4 +7,7 @@ generate long titles. Especially once you throw escaping into the mix: + $ echo $? + 25 + ++It would also appear this abrubtly terminates aggregate processing (if not ikiwiki itself). Only after moving my test repo to `/tmp` to shorten the filename did I see newer RSS feeds (from a totally different source) picked up. ++ ++ + -- [[Jon]] + +</pre> +</div> + +<!-- 85ee24a9e53aec7d70bb4fb758428e59ea76e853 --> diff --git a/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change b/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change new file mode 100644 index 000000000..cb834a317 --- /dev/null +++ b/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change @@ -0,0 +1,55 @@ +[[!meta author="""http://jugglingbits.wordpress.com/"""]] + +[[!meta authorurl="""http://jugglingbits.wordpress.com/"""]] + +[[!meta title="""change to forum/How_to_list_new_pages__44___inline__63__ on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-87a42450e1ac8e2e01b7ed2785ed43040fd14ed3"]] + +<div id="change-87a42450e1ac8e2e01b7ed2785ed43040fd14ed3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/How_to_list_new_pages__44___inline__63__.mdwn;h=f28e8b99b73dedae2eebc0cbc83115cdbdc5fe39;hp=0000000000000000000000000000000000000000;hb=87a42450e1ac8e2e01b7ed2785ed43040fd14ed3;hpb=65873fee5e1dda78d6cf561cdd81a5dcd6d2735d" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FHow_to_list_new_pages__44___inline__63__&do=goto" rel="nofollow">forum/How to list new pages, inline?</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jugglingbits.wordpress.com/" rel="nofollow">thomas11</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 06 Nov 2010 03:51:29 -0400">03:51:29 11/06/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=87a42450e1ac8e2e01b7ed2785ed43040fd14ed3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn +new file mode 100644 +index 0000000..f28e8b9 +--- /dev/null ++++ b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn +@@ -0,0 +1,5 @@ ++Hi, I'd love to include a "New posts" list into my front page, like at <http://danhixon.github.com/> for example. ++ ++It should be different from recent changes in that it shouldn't show modifications of existing pages, and in that it would be inside a page with other content. ++ ++Thanks, Thomas + +</pre> +</div> + +<!-- 87a42450e1ac8e2e01b7ed2785ed43040fd14ed3 --> diff --git a/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change b/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change new file mode 100644 index 000000000..9b90d51aa --- /dev/null +++ b/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change @@ -0,0 +1,58 @@ +[[!meta author="""dark"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]] + +[[!meta title="""change to news/openid on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8806a9795116e73ec851dfea89af45a786fbe6da"]] + +<div id="change-8806a9795116e73ec851dfea89af45a786fbe6da" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/openid.mdwn;h=87f640321b15a4399c04a9bebd62e569b247376e;hp=5b145fee4f4e9d926807bd19501c2703120865e0;hb=8806a9795116e73ec851dfea89af45a786fbe6da;hpb=f35f79a0b831e8b47f62c430c1bba538d4687521" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=news%2Fopenid&do=goto" rel="nofollow">news/openid</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto" rel="nofollow">dark</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 11 Nov 2010 17:49:10 -0400">17:49:10 11/11/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=8806a9795116e73ec851dfea89af45a786fbe6da&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +poll vote (Accept both)<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn +index 5b145fe..87f6403 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 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]] ++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 41 "Accept both"]] + +</pre> +</div> + +<!-- 8806a9795116e73ec851dfea89af45a786fbe6da --> diff --git a/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change b/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change new file mode 100644 index 000000000..12ef0e9ab --- /dev/null +++ b/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change @@ -0,0 +1,161 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8935a131d02ac13b6024dff9cbf7a5f837fcdc04"]] + +<div id="change-8935a131d02ac13b6024dff9cbf7a5f837fcdc04" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=8b0501041379278330dbdb52c3232dc26fef5d2c;hp=f8ec4c420469f47168ced54b93dbe75fa39dfdab;hb=8935a131d02ac13b6024dff9cbf7a5f837fcdc04;hpb=1968317cacc2f555af17286acf26a60ce616cc40" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 00:37:28 +0000">00:37:28 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=8935a131d02ac13b6024dff9cbf7a5f837fcdc04&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +updated branch, not tested properly yet<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index f8ec4c4..8b05010 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -147,7 +147,7 @@ you don't like my approach: + + ---- + +-[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] ++[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] + [[!tag patch]] + + OK, here's an alternative approach, closer in spirit to what was initially +@@ -165,14 +165,17 @@ whether `url` and `cgiurl` are on the same server with the the same URL + scheme. In theory you could use things like `//static.example.com/wiki/` + and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https + while switching server, but I don't know how consistently browsers +-suppot that. ++support that. + + "local" here is short for "locally valid", because these URLs are neither + fully relative nor fully absolute, and there doesn't seem to be a good name + for them... + +-I've tested this on a demo website with the CGI enabled, and it seems to ++I tested an earlier version on a demo website with the CGI enabled, and it seemed to + work nicely (there might be bugs in some plugins, I didn't try all of them). ++I haven't yet re-tested with my updated branch, which is why it's not `ready/` ++yet. ++ + The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable + `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log + in via that, links all end up in the HTTPS version. +@@ -217,11 +220,19 @@ New API added by this branch: + >> + >>> That makes a great deal of sense, bravo for actually removing + >>> parameters in the common case while maintaining backwards +- >>> compatability! ++ >>> compatability! --[[Joey]] ++ >>> ++ >>>> Done in my `localurl` branch; not tested in a whole-wiki way ++ >>>> yet, but I did add a regression test. I've used ++ >>>> `urlto(x, undef)` rather than `urlto(x)` so far, but I could ++ >>>> go back through the codebase using the short form if you'd ++ >>>> prefer. --[[smcv]] + >>> + >>> It does highlight that it would be better to have a + >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` ) + >>> rather than the 3 parameter form. --[[Joey]] ++ >>> ++ >>> Possibly. I haven't added this. + + * `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` +@@ -232,19 +243,34 @@ New API added by this branch: + >> (But I assume changes to `urlto` will follow through here anyway.) + >> --[[Joey]] + ++ >>> I had to use it a bit more, as a replacement for `$config{url}` ++ >>> when doing things like referencing stylesheets or redirecting to ++ >>> the top of the wiki. ++ >>> ++ >>> I ended up redoing this without the extra parameter. Previously, ++ >>> `baseurl(undef)` was the absolute URL; now, `baseurl(undef)` is ++ >>> the local path. I know you objected to me using `baseurl()` in ++ >>> an earlier branch, because `baseurl().$x` looks confusingly ++ >>> similar to `baseurl($x)` but has totally different semantics; ++ >>> I've generally written it `baseurl(undef)` now, to be more ++ >>> explicit. --[[smcv]] ++ + * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + +- > Possibly changed to making this always be local unless `cgiurl => $x` +- > is given: see below --[[smcv]] ++ > Now changed to always use the `$local_cgiurl`. --[[smcv]] + + * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters + except `cgiurl` and/or `local_cgiurl` + + > I assume you have no objection to this --[[smcv]] + > +- >> Nod, although I don't know of a use case. --[[Joey]] ++ >> Nod, although I don't know of a use case. --[[Joey]] ++ ++ >>> The use-case is that I can replace `$config{cgiurl}` with ++ >>> `IkiWiki::cgiurl()` for things like the action attribute of ++ >>> forms. --[[smcv]] + +-Bugs: ++Fixed bugs: + + * I don't think anything except `openid` calls `cgiurl` without also + passing in `local_cgiurl => 1`, so perhaps that should be the default; +@@ -265,6 +291,10 @@ Bugs: + >>> if `absolute()` were implemented as suggested above, it could also + >>> be used with cgiurl if necessary.) --[[Joey]] + ++ >>>> Done (minus `absolute()`). --[[smcv]] ++ ++Potential future things: ++ + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + +@@ -285,4 +315,7 @@ Bugs: + > AFACIS, `baseurl` is only called in 3 places so I don't think that's + > needed. --[[Joey]] + +- >> OK, wontfix. --[[smcv]] ++ >> OK, wontfix. For what it's worth, my branch has 6 uses in IkiWiki ++ >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage) ++ >> and 5 in plugins, since I used it for things like redirection back ++ >> to the top of the wiki --[[smcv]] + +</pre> +</div> + +<!-- 8935a131d02ac13b6024dff9cbf7a5f837fcdc04 --> diff --git a/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change b/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change new file mode 100644 index 000000000..f89be517c --- /dev/null +++ b/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change @@ -0,0 +1,59 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8de7fde49c295a6c9098767b9fdfea79de8476eb"]] + +<div id="change-8de7fde49c295a6c9098767b9fdfea79de8476eb" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn;h=b1053fc38149f4ac10d960081a092f4d1642290c;hp=83093895b37a4fb3be524cd237fc5ce8f5b2169d;hb=8de7fde49c295a6c9098767b9fdfea79de8476eb;hpb=9a7387a53be2b1e182003f3e86cb76d7f10c4b67" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fargument_isn__39__t_numeric%3A_mixing_templates_and_creation__95__date&do=goto" rel="nofollow">bugs/argument isn't numeric: mixing templates and creation_date</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 13:24:50 -0400">13:24:50 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=8de7fde49c295a6c9098767b9fdfea79de8476eb&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +already fixed<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +index 8309389..b1053fc 100644 +--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn ++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +@@ -55,3 +55,6 @@ I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with th + """]] + + However this doesn't work. I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]] ++ ++> As far as I know, this bug was fixed in ++> 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]] + +</pre> +</div> + +<!-- 8de7fde49c295a6c9098767b9fdfea79de8476eb --> diff --git a/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change b/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change new file mode 100644 index 000000000..617d642b9 --- /dev/null +++ b/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change @@ -0,0 +1,75 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9180381728e252cf474eb8a4b0460755b5c28340"]] + +<div id="change-9180381728e252cf474eb8a4b0460755b5c28340" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=264eb968844d6f766794cc8f737f68299a052de8;hp=8b0501041379278330dbdb52c3232dc26fef5d2c;hb=9180381728e252cf474eb8a4b0460755b5c28340;hpb=172f41f6de288814fbd013f3465e658c562b10b1" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 23:50:29 +0000">23:50:29 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9180381728e252cf474eb8a4b0460755b5c28340&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +tested and seems to work<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index 8b05010..264eb96 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -147,7 +147,7 @@ you don't like my approach: + + ---- + +-[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] ++[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] + [[!tag patch]] + + OK, here's an alternative approach, closer in spirit to what was initially +@@ -171,10 +171,10 @@ support that. + fully relative nor fully absolute, and there doesn't seem to be a good name + for them... + +-I tested an earlier version on a demo website with the CGI enabled, and it seemed to ++I've tested this on a demo website with the CGI enabled, and it seemed to + work nicely (there might be bugs in some plugins, I didn't try all of them). +-I haven't yet re-tested with my updated branch, which is why it's not `ready/` +-yet. ++The branch at [[todo/use secure cookies for SSL logins]] goes well with ++this one. + + The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable + `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log + +</pre> +</div> + +<!-- 9180381728e252cf474eb8a4b0460755b5c28340 --> diff --git a/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change b/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change new file mode 100644 index 000000000..2df071529 --- /dev/null +++ b/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change @@ -0,0 +1,60 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-93e15cc84f47a1340f8bd06d7056ba423fe510bb"]] + +<div id="change-93e15cc84f47a1340f8bd06d7056ba423fe510bb" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/autoindex/discussion.mdwn;h=d8b9be6e05720924788f257cf2ae69937631cc60;hp=a48fe9df130758e796d422ca5cc8b5868eeb52d7;hb=93e15cc84f47a1340f8bd06d7056ba423fe510bb;hpb=408af2bb9e10d2ed899e17f9814a5514c0254dc8" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fautoindex%2Fdiscussion&do=goto" rel="nofollow">plugins/autoindex/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 08:02:36 -0400">08:02:36 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=93e15cc84f47a1340f8bd06d7056ba423fe510bb&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn +index a48fe9d..d8b9be6 100644 +--- a/doc/plugins/autoindex/discussion.mdwn ++++ b/doc/plugins/autoindex/discussion.mdwn +@@ -1,6 +1,11 @@ + Would it be possible to add an option to only generate the index files + for the html output and not place the markdown files in the wiki source? + ++> Or better still, add a mechanism for ikiwiki to hold transient source ++> pages in memory and render them as if they existed, without actually ++> writing them out, as [[JoeRayhawk]] suggests below? I think ++> add_autofile would be the way to do this. --[[smcv]] ++ + The reason being that I have a lot of directories which need to be autoindexed, + but I would prefer if the index files didn't clutter up my git repository. + + +</pre> +</div> + +<!-- 93e15cc84f47a1340f8bd06d7056ba423fe510bb --> diff --git a/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change b/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change new file mode 100644 index 000000000..1ca5dd2b1 --- /dev/null +++ b/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change @@ -0,0 +1,137 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-98d0883c8949e6cde8db019bb282d5fa815ffc1a"]] + +<div id="change-98d0883c8949e6cde8db019bb282d5fa815ffc1a" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=c4d3a8ecb07bd1722646aba5a3eddfc4b2866fb6;hp=ff9784dd163c255867ba9958827447472fb20350;hb=98d0883c8949e6cde8db019bb282d5fa815ffc1a;hpb=f942c2db05e4da9188f36c5df1d42aea709208bf" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 14 Nov 2010 12:50:31 -0400">12:50:31 11/14/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=98d0883c8949e6cde8db019bb282d5fa815ffc1a&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +branches imported into git; benchmark results<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index ff9784d..c4d3a8e 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -15,6 +15,11 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >>> rather than /$re/ so I think that would make sense. + >>> -- [[KathrynAndersen]] + ++>>>> Git branch `smcv/ka-glob-cache` has Kathryn's patch. Git ++>>>> branch `smcv/memoize-glob2re` does as I suggested, which ++>>>> is less verbose than Kathryn's patch but also not as ++>>>> fast; I'm not sure why, tbh. --[[smcv]] ++ + -------------------------------------------------------------- + Benchmarks done with Devel::Profile on the same testbed IkiWiki setup. I'm just showing the start of the profile output, since that's what's relevant. + +@@ -51,6 +56,72 @@ Note that the seconds per call for match_glob in the "after" case has gone down + K.A. + + -------------------------------------------------------------- ++ ++A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4 ++like so: ++ ++ perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose ++ ++The docwiki appears to use fewer glob matches than Kathryn's wiki. ++ ++With master: ++ ++ time elapsed (wall): 29.6970 ++ time running program: 24.6930 (83.15%) ++ time profiling (est.): 5.0041 (16.85%) ++ number of calls: 1359180 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 13.62 3.3629 3406 0.000987 Text::Balanced::_match_tagged ++ 10.84 2.6773 79442 0.000034 IkiWiki::PageSpec::match_glob ++ 3.08 0.7598 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ 3.07 0.7593 29830 0.000025 IkiWiki::bestlink ++ 2.99 0.7378 10231 0.000072 IkiWiki::PageSpec::match_link ++ ++With my `smcv/memoize-glob2re` branch: ++ ++ time elapsed (wall): 30.4931 ++ time running program: 25.1248 (82.39%) ++ time profiling (est.): 5.3683 (17.61%) ++ number of calls: 1439943 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 13.19 3.3146 3406 0.000973 Text::Balanced::_match_tagged ++ 8.41 2.1123 79442 0.000027 IkiWiki::PageSpec::match_glob ++ 3.97 0.9979 86905 0.000011 Memoize::_memoizer ++ 3.05 0.7654 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ 3.02 0.7576 29830 0.000025 IkiWiki::bestlink ++ ++and in a repeated run: ++ ++ 8.40 2.0905 79442 0.000026 IkiWiki::PageSpec::match_glob ++ ++With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch: ++ ++ time elapsed (wall): 27.7567 ++ time running program: 22.9941 (82.84%) ++ time profiling (est.): 4.7627 (17.16%) ++ number of calls: 1279946 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 14.29 3.2867 3406 0.000965 Text::Balanced::_match_tagged ++ 7.89 1.8136 79442 0.000023 IkiWiki::PageSpec::match_glob ++ 3.30 0.7577 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ 3.24 0.7461 29830 0.000025 IkiWiki::bestlink ++ 3.19 0.7332 143 0.005127 ? IkiWiki::pagespec_match_list ++ ++and in a repeated run: ++ ++ 7.84 1.8253 79442 0.000023 IkiWiki::PageSpec::match_glob ++ ++--[[smcv]] ++ ++-------------------------------------------------------------- ++ ++ + <pre> + diff --git a/IkiWiki.pm b/IkiWiki.pm + index 08a3d78..c187b98 100644 + +</pre> +</div> + +<!-- 98d0883c8949e6cde8db019bb282d5fa815ffc1a --> diff --git a/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change b/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change new file mode 100644 index 000000000..71b01cedf --- /dev/null +++ b/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change @@ -0,0 +1,61 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-99749dfdeac07b975cfba6eef617f3d7362eec73"]] + +<div id="change-99749dfdeac07b975cfba6eef617f3d7362eec73" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/more_and_RSS_generation.mdwn;h=72d636f186a4425ffdb8dd916d57181733fb0e8a;hp=0000000000000000000000000000000000000000;hb=99749dfdeac07b975cfba6eef617f3d7362eec73;hpb=34ef3fb40f0a8a5d595ce5cf5f0b6470b7c78198" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fmore_and_RSS_generation&do=goto" rel="nofollow">bugs/more and RSS generation</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" rel="nofollow">Dave</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 10:28:04 -0400">10:28:04 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=99749dfdeac07b975cfba6eef617f3d7362eec73&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +more plugin and rss<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn +new file mode 100644 +index 0000000..72d636f +--- /dev/null ++++ b/doc/bugs/more_and_RSS_generation.mdwn +@@ -0,0 +1,7 @@ ++I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed. ++ ++Maybe there is a different plugin (I also tried toggle)? ++ ++I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. ++ ++see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] + +</pre> +</div> + +<!-- 99749dfdeac07b975cfba6eef617f3d7362eec73 --> diff --git a/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change b/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change new file mode 100644 index 000000000..335d14a87 --- /dev/null +++ b/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change @@ -0,0 +1,76 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9a7387a53be2b1e182003f3e86cb76d7f10c4b67"]] + +<div id="change-9a7387a53be2b1e182003f3e86cb76d7f10c4b67" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=0fc059ad7d169c2e35f3ea869bdc2f69be649857;hp=43571ead77346a1c5528360eec0e369958f2de7c;hb=9a7387a53be2b1e182003f3e86cb76d7f10c4b67;hpb=ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 13:19:13 -0400">13:19:13 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9a7387a53be2b1e182003f3e86cb76d7f10c4b67&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +thoughts<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index 43571ea..0fc059a 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -22,6 +22,23 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + + >>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]] + ++>>>>>> What may be going on is that glob2re is already a fairly fast ++>>>>>> function, so the overhead of memoizing it with the very generic ++>>>>>> `_memoizer` (see its source) swamps the memoization gain. Note ++>>>>>> that the few functions memoized with the Memoizer before were much ++>>>>>> more expensive, so that little overhead was acceptable then. ++>>>>>> ++>>>>>> It also may be that Kathryn's patch is slightly faster due to using ++>>>>>> the construct `$foo =~ $regexp` rather than `$foo =~ /$regexp/` ++>>>>>> (probably avoids a copy or something like that internally) -- ++>>>>>> this despite checking both `exists` and `defined` on the hash, which ++>>>>>> should be reundant AFAICS. ++>>>>>> ++>>>>>> My guess is that the best of both worlds would be to move ++>>>>>> the byhand memoization to glob2re and have it return a compiled ++>>>>>> `/^/i` regexp that can be used without further modifiction in most ++>>>>>> cases. --[[Joey]] ++ + -------------------------------------------------------------- + Benchmarks done with Devel::Profile on the same testbed IkiWiki setup. I'm just showing the start of the profile output, since that's what's relevant. + + +</pre> +</div> + +<!-- 9a7387a53be2b1e182003f3e86cb76d7f10c4b67 --> diff --git a/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change b/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change new file mode 100644 index 000000000..db8fdff3e --- /dev/null +++ b/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change @@ -0,0 +1,66 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9b01c9779ef682af0874efc062d9fb2e91676c23"]] + +<div id="change-9b01c9779ef682af0874efc062d9fb2e91676c23" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment;h=7842caeac04f2e150792cc51e17f414ad40c3df5;hp=0000000000000000000000000000000000000000;hb=9b01c9779ef682af0874efc062d9fb2e91676c23;hpb=efba19b3379b0b4e4199ece869c71f80be3a82d1" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FNeed_something_more_powerful_than_Exclude%2Fcomment_2_0019cd6b34c8d8678b2532de57a92d15&do=goto" rel="nofollow">forum/Need something more powerful than Exclude/comment 2 0019cd6b34c8d8678b2532de57a92d15</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 10:43:21 +0000">10:43:21 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9b01c9779ef682af0874efc062d9fb2e91676c23&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added a comment: expression anchored too closely?<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment +new file mode 100644 +index 0000000..7842cae +--- /dev/null ++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment +@@ -0,0 +1,12 @@ ++[[!comment format=mdwn ++ username="http://smcv.pseudorandom.co.uk/" ++ nickname="smcv" ++ subject="expression anchored too closely?" ++ date="2010-11-23T10:43:21Z" ++ content=""" ++It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.) ++ ++The match operation in `&file_pruned` ends up a bit like this: ++ ++ \"foo/Makefile\" =~ m{…|…|…|(^|/)Makefile$} ++"""]] + +</pre> +</div> + +<!-- 9b01c9779ef682af0874efc062d9fb2e91676c23 --> diff --git a/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change b/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change new file mode 100644 index 000000000..f235de4ed --- /dev/null +++ b/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change @@ -0,0 +1,70 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c42f5786601429a0b921d6591ebf5e4c1eb4da8"]] + +<div id="change-9c42f5786601429a0b921d6591ebf5e4c1eb4da8" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/autoindex/discussion.mdwn;h=6b13d2342fa62ccc48671f0f30d2479b085dd38f;hp=b09481cdc7800921433da69bb4cbed33c125b05e;hb=9c42f5786601429a0b921d6591ebf5e4c1eb4da8;hpb=2c17255b6641e33374a446ca281a0ad6d46af1dc" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fautoindex%2Fdiscussion&do=goto" rel="nofollow">plugins/autoindex/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 08:17:07 -0400">08:17:07 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9c42f5786601429a0b921d6591ebf5e4c1eb4da8&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +put the problematic patch in a toggleable to make discussion more visible<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn +index b09481c..6b13d23 100644 +--- a/doc/plugins/autoindex/discussion.mdwn ++++ b/doc/plugins/autoindex/discussion.mdwn +@@ -22,6 +22,8 @@ If you just don't want to clutter your git repo, below it's a patch does the fol + + * If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend. + ++[[!toggle id="patch-for-autoindex_commit" text="patch for autoindex_commit"]] ++[[!toggleable id="patch-for-autoindex_commit" text=""" + <pre> + --- autoindex.pm.orig 2009-10-01 17:13:51.000000000 +0800 + +++ autoindex.pm 2009-10-01 17:21:09.000000000 +0800 +@@ -65,7 +67,7 @@ If you just don't want to clutter your git repo, below it's a patch does the fol + gettext("automatic index generation"), + undef, undef); + </pre> +- ++"""]] + + Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] + + +</pre> +</div> + +<!-- 9c42f5786601429a0b921d6591ebf5e4c1eb4da8 --> diff --git a/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change b/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change new file mode 100644 index 000000000..44bac63c5 --- /dev/null +++ b/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change @@ -0,0 +1,58 @@ +[[!meta author="""134.100.5.65"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F134.100.5.65&do=goto"""]] + +[[!meta title="""change to news/openid on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2"]] + +<div id="change-9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/news/openid.mdwn;h=5b145fee4f4e9d926807bd19501c2703120865e0;hp=02f7afbc064175bcfb55931f6cb57f3eb3896858;hb=9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2;hpb=2fdda536ec6bee1eff3b71c214753078cd588f8f" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=news%2Fopenid&do=goto" rel="nofollow">news/openid</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2F134.100.5.65&do=goto" rel="nofollow">134.100.5.65</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 09 Nov 2010 16:05:26 -0400">16:05:26 11/09/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +poll vote (Accept both)<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn +index 02f7afb..5b145fe 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 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] ++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]] + +</pre> +</div> + +<!-- 9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2 --> diff --git a/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change b/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change new file mode 100644 index 000000000..e65592910 --- /dev/null +++ b/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change @@ -0,0 +1,58 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d0ac3170a8f90d2139ef75698e8af21a6435fb4"]] + +<div id="change-9d0ac3170a8f90d2139ef75698e8af21a6435fb4" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn;h=5485bba9ca2244260ae4ecb0894e935817bf377d;hp=70af505c124ac6ddb6e987c2625f92629de4690b;hb=9d0ac3170a8f90d2139ef75698e8af21a6435fb4;hpb=da9e1ea667f82d5fca9168dbed19be08040570ff" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fargument_isn__39__t_numeric%3A_mixing_templates_and_creation__95__date&do=goto" rel="nofollow">bugs/argument isn't numeric: mixing templates and creation_date</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:28:50 -0400">10:28:50 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9d0ac3170a8f90d2139ef75698e8af21a6435fb4&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +done with commit da9e1ea667f82d5fca916<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +index 70af505..5485bba 100644 +--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn ++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +@@ -56,3 +56,5 @@ An alternative fix is to wrap the entire template inside a test to see whether t + """]] + + In fact, this is probably best practice for in-srcdir templates. I'd consider this done if the documentation for the directive suggested it. -- [[Jon]] ++ ++> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]] + +</pre> +</div> + +<!-- 9d0ac3170a8f90d2139ef75698e8af21a6435fb4 --> diff --git a/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change b/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change new file mode 100644 index 000000000..c53b0bfea --- /dev/null +++ b/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change @@ -0,0 +1,105 @@ +[[!meta author="""smcv"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]] + +[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template todo/autoindex_should_use_add__95__autofile todo/transient_in-memory_pages on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d26a72468fad69d633875b4ffb4aff8abd80023"]] + +<div id="change-9d26a72468fad69d633875b4ffb4aff8abd80023" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/auto-create_tag_pages_according_to_a_template.mdwn;h=e065c4a3d6646cd4ede0ec96e93bd32d8f4f3a55;hp=676e2bc00dba7a139a1d606da79a46c46104c257;hb=9d26a72468fad69d633875b4ffb4aff8abd80023;hpb=98d0883c8949e6cde8db019bb282d5fa815ffc1a" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fauto-create_tag_pages_according_to_a_template&do=goto" rel="nofollow">todo/auto-create tag pages according to a template</a> + + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/autoindex_should_use_add__95__autofile.mdwn;h=64f81c82e3970ea09784097d39be481fd61d16b0;hp=517567e583fb5a9d3489419f6f50c208fcc6bf32;hb=9d26a72468fad69d633875b4ffb4aff8abd80023;hpb=98d0883c8949e6cde8db019bb282d5fa815ffc1a" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fautoindex_should_use_add__95__autofile&do=goto" rel="nofollow">todo/autoindex should use add_autofile</a> + + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/transient_in-memory_pages.mdwn;h=5dbbe4f8271b2d6519363618e1f2b50e8923af33;hp=9808ffdfe476a9ed70e54a7e00748103e21e0f65;hb=9d26a72468fad69d633875b4ffb4aff8abd80023;hpb=98d0883c8949e6cde8db019bb282d5fa815ffc1a" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Ftransient_in-memory_pages&do=goto" rel="nofollow">todo/transient in-memory pages</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 14 Nov 2010 14:19:46 -0400">14:19:46 11/14/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9d26a72468fad69d633875b4ffb4aff8abd80023&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +point to my 'transient' branch<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +index 676e2bc..e065c4a 100644 +--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn ++++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +@@ -262,4 +262,6 @@ other pages claim it as an alias. --[[chrysn]] + + I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]] + ++> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]] ++ + [[!tag done]] +diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn +index 517567e..64f81c8 100644 +--- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn ++++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn +@@ -1,2 +1,4 @@ + `add_autofile` is a generic version of [[plugins/autoindex]]'s code, + so the latter should probably use the former. --[[smcv]] ++ ++> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]] +diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn +index 9808ffd..5dbbe4f 100644 +--- a/doc/todo/transient_in-memory_pages.mdwn ++++ b/doc/todo/transient_in-memory_pages.mdwn +@@ -18,3 +18,26 @@ This would also be useful for autoindex, as suggested on + One refinement I'd suggest is that if the transient page is edited, + its transient contents are evaluated and used as the initial + content for the edit box; after that, it'd become a static page. --[[smcv]] ++ ++-------------------------- ++ ++[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]] ++[[!tag patch]] ++ ++I had a look at implementing this. It turns out to be harder than I thought ++to have purely in-memory pages (several plugins want to be able to access the ++source file as a file), but I did get this proof-of-concept branch ++to write tag and autoindex pages into an underlay. ++ ++This loses the ability to delete the auto-created pages (although they don't ++clutter up git this way, at least), and a lot of the code in autoindex is ++probably now redundant, so this is probably not quite ready for merge, but ++I'd welcome opinions. ++ ++Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path, ++which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`. ++ ++Refinements that could be made if this approach seems reasonable: ++ ++* make these options boolean, and have the path always be `.ikiwiki/transient` ++* improve the `remove` plugin so it also deletes from this special underlay + +</pre> +</div> + +<!-- 9d26a72468fad69d633875b4ffb4aff8abd80023 --> diff --git a/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change b/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change new file mode 100644 index 000000000..14b34496c --- /dev/null +++ b/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change @@ -0,0 +1,59 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9f8cfe998e5ced7e4b2e1dd819a025b0745935ff"]] + +<div id="change-9f8cfe998e5ced7e4b2e1dd819a025b0745935ff" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/tips/nearlyfreespeech/discussion.mdwn;h=0d1f1f08236f9ffc6b2675284a1e5feee3832eb6;hp=73da608bed29a706cce45c13af9c8cc85500be39;hb=9f8cfe998e5ced7e4b2e1dd819a025b0745935ff;hpb=a2c040f1fc565b546750e014df2e412ab0e68cc1" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=tips%2Fnearlyfreespeech%2Fdiscussion&do=goto" rel="nofollow">tips/nearlyfreespeech/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 18:57:10 +0000">18:57:10 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=9f8cfe998e5ced7e4b2e1dd819a025b0745935ff&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn +index 73da608..0d1f1f0 100644 +--- a/doc/tips/nearlyfreespeech/discussion.mdwn ++++ b/doc/tips/nearlyfreespeech/discussion.mdwn +@@ -15,3 +15,6 @@ Hi!<br /> + How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br> + But now if I want to upgrade it to a newer version?<br /> + Thanks for your incredible work! ++ ++> You can move `~/ikiwiki` out of the way and then re-download and install ++> it ikiwiki. --[[Joey]] + +</pre> +</div> + +<!-- 9f8cfe998e5ced7e4b2e1dd819a025b0745935ff --> diff --git a/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change b/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change new file mode 100644 index 000000000..0ea9a66ce --- /dev/null +++ b/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change @@ -0,0 +1,60 @@ +[[!meta author="""http://lovesgoodfood.com/jason/"""]] + +[[!meta authorurl="""http://lovesgoodfood.com/jason/"""]] + +[[!meta title="""change to ikiwikiusers on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a194fbc5bced565fa751008b8ada666c411d097d"]] + +<div id="change-a194fbc5bced565fa751008b8ada666c411d097d" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwikiusers.mdwn;h=d8e55bace4cd1eea5d9f4fed21ec552097fa82a4;hp=54fa1d57be49ff817886c018dbc44a7c600972fc;hb=a194fbc5bced565fa751008b8ada666c411d097d;hpb=ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwikiusers&do=goto" rel="nofollow">ikiwikiusers</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://lovesgoodfood.com/jason/" rel="nofollow">Jason_Riedy</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 03 Nov 2010 17:12:48 -0400">17:12:48 11/03/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=a194fbc5bced565fa751008b8ada666c411d097d&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Add myself.<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn +index 54fa1d5..d8e55ba 100644 +--- a/doc/ikiwikiusers.mdwn ++++ b/doc/ikiwikiusers.mdwn +@@ -160,6 +160,7 @@ Personal sites and blogs + * [Thomas Kane](http://planetkane.org/) + * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend + * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 ++* [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... + + Please feel free to add your own ikiwiki site! + + +</pre> +</div> + +<!-- a194fbc5bced565fa751008b8ada666c411d097d --> diff --git a/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change b/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change new file mode 100644 index 000000000..bfbbc74f9 --- /dev/null +++ b/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change @@ -0,0 +1,62 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]] + +[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3"]] + +<div id="change-a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment;h=62bae02b0984933b47509d49a63cd1a0e8a159a8;hp=0000000000000000000000000000000000000000;hb=a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3;hpb=c8537b41320e1f38b2369f24431423dfb2f14b15" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FBlog_posting_times_and_ikiwiki_state%2Fcomment_1_87304dfa2caea7e526cdb04917524e8c&do=goto" rel="nofollow">forum/Blog posting times and ikiwiki state/comment 1 87304dfa2caea7e526cdb04917524e8c</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" rel="nofollow">Matt</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 04 Nov 2010 07:52:53 -0400">07:52:53 11/04/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added a comment<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment +new file mode 100644 +index 0000000..62bae02 +--- /dev/null ++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment +@@ -0,0 +1,8 @@ ++[[!comment format=mdwn ++ username="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" ++ nickname="Matt" ++ subject="comment 1" ++ date="2010-11-04T11:52:53Z" ++ content=""" ++Perhaps I have a different setup from you but on my laptop I don't have ikiwiki installed - only a clone of the git repo. You mean to run --gettime on the post-update git hook? ++"""]] + +</pre> +</div> + +<!-- a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3 --> diff --git a/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change b/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change new file mode 100644 index 000000000..eab83ca54 --- /dev/null +++ b/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change @@ -0,0 +1,59 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a4cb86d73327e7850eeb524ef387b17ac5e1614d"]] + +<div id="change-a4cb86d73327e7850eeb524ef387b17ac5e1614d" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=fae8333ab81718a1dfdc72694609ebd6a408ea43;hp=33e7b743bab78b6a38cf82d2cd7ced97a67de85f;hb=a4cb86d73327e7850eeb524ef387b17ac5e1614d;hpb=c02f9d224cb78a3ad880cb749ef4a11eadfad79a" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 17 Nov 2010 17:20:29 +0000">17:20:29 11/17/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=a4cb86d73327e7850eeb524ef387b17ac5e1614d&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +index 33e7b74..fae8333 100644 +--- a/doc/bugs/aggregate_generates_long_filenames.mdwn ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -32,3 +32,6 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi + >> I don't fully grok the aggregate source yet, but I wouldn't rule out + >> a bug in the path length checking, personally. I'm happy to try and + >> find it myself though :) -- [[Jon]] ++ ++>>> Path length seems unlikely, since the max is 4096 there. ++>>> --[[Joey]] + +</pre> +</div> + +<!-- a4cb86d73327e7850eeb524ef387b17ac5e1614d --> diff --git a/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change b/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change new file mode 100644 index 000000000..61a399c0a --- /dev/null +++ b/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change @@ -0,0 +1,57 @@ +[[!meta author="""http://slowdog.myopenid.com/"""]] + +[[!meta authorurl="""http://slowdog.myopenid.com/"""]] + +[[!meta title="""change to index on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a6c3d71787c528888c3f66c7ded8dd0c8f430b7e"]] + +<div id="change-a6c3d71787c528888c3f66c7ded8dd0c8f430b7e" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/index.mdwn;h=06acc9cecf56ee178b488e06a136009f9f1e0938;hp=90713d1f261480985b6f6c85cd0f215933332eef;hb=a6c3d71787c528888c3f66c7ded8dd0c8f430b7e;hpb=f80469c34d8d81e79d4894f7a1789a949bc766c3" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=index&do=goto" rel="nofollow">index</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://slowdog.myopenid.com/" rel="nofollow">slowdog [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sun, 21 Nov 2010 19:38:10 +0000">19:38:10 11/21/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=a6c3d71787c528888c3f66c7ded8dd0c8f430b7e&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/index.mdwn b/doc/index.mdwn +index 90713d1..06acc9c 100644 +--- a/doc/index.mdwn ++++ b/doc/index.mdwn +@@ -17,7 +17,7 @@ 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 ]]. + +-## developer resources sas ++## developer resources + + The [[RoadMap]] describes where the project is going. + The [[forum]] is open for discussions. + +</pre> +</div> + +<!-- a6c3d71787c528888c3f66c7ded8dd0c8f430b7e --> diff --git a/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change b/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change new file mode 100644 index 000000000..a9c8f9653 --- /dev/null +++ b/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change @@ -0,0 +1,64 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf"]] + +<div id="change-ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/transient_in-memory_pages.mdwn;h=9c1be736262f6fb77454690d7ced4f45a6e68981;hp=edf056e4a5ef5284366bc0d9c32979459b5b7db2;hb=ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf;hpb=eb13521f5276cdd21a3f5990b1a1a17234e40174" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Ftransient_in-memory_pages&do=goto" rel="nofollow">todo/transient in-memory pages</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 19:23:08 -0400">19:23:08 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +further thoughts<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn +index edf056e..9c1be73 100644 +--- a/doc/todo/transient_in-memory_pages.mdwn ++++ b/doc/todo/transient_in-memory_pages.mdwn +@@ -64,3 +64,11 @@ Refinements that could be made if this approach seems reasonable: + >>> + >>> Do you think this approach has enough potential that I should + >>> continue to hack on it? Any thoughts on the implementation? --[[smcv]] ++ ++>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`. ++>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss. ++>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository. ++>>>> ++>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind. ++>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around. ++>>>> -- [[KathrynAndersen]] + +</pre> +</div> + +<!-- ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf --> diff --git a/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change b/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change new file mode 100644 index 000000000..d66b4872d --- /dev/null +++ b/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change @@ -0,0 +1,57 @@ +[[!meta author="""http://pmate.myopenid.com/"""]] + +[[!meta authorurl="""http://pmate.myopenid.com/"""]] + +[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af0bfcc07820008f0387bfd1b35a594ed40a0246"]] + +<div id="change-af0bfcc07820008f0387bfd1b35a594ed40a0246" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/tips/nearlyfreespeech/discussion.mdwn;h=daebee2a0e95aae28242ca90e1b39df57aed0c17;hp=a003760b98403010742f37f3ef6e6f9400dcea2b;hb=af0bfcc07820008f0387bfd1b35a594ed40a0246;hpb=af5f162ca7c8cd14d64f6282e05a3032dbd7c2fb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=tips%2Fnearlyfreespeech%2Fdiscussion&do=goto" rel="nofollow">tips/nearlyfreespeech/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://pmate.myopenid.com/" rel="nofollow">pmate [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 17:56:35 +0000">17:56:35 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=af0bfcc07820008f0387bfd1b35a594ed40a0246&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn +index a003760..daebee2 100644 +--- a/doc/tips/nearlyfreespeech/discussion.mdwn ++++ b/doc/tips/nearlyfreespeech/discussion.mdwn +@@ -9,3 +9,8 @@ BEGIN failed--compilation aborted at (eval 19) line 2. + perl is 5.8.9 + + > This is fixed in 3.1415926. --[[Joey]] ++ ++Hi! ++How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here. ++But now if I want to upgrade it to a newer version? ++Thanks for your incredible work! + +</pre> +</div> + +<!-- af0bfcc07820008f0387bfd1b35a594ed40a0246 --> diff --git a/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change b/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change new file mode 100644 index 000000000..34bad8586 --- /dev/null +++ b/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change @@ -0,0 +1,51 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]] + +[[!meta title="""change to sandbox/Mooooo on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af75602391ac9651e7594c65588da86d591f2c01"]] + +<div id="change-af75602391ac9651e7594c65588da86d591f2c01" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/sandbox/Mooooo.mdwn;h=6f11d357ccbfb93bbadbf664eeb0cad801e85f56;hp=0000000000000000000000000000000000000000;hb=af75602391ac9651e7594c65588da86d591f2c01;hpb=9c42f5786601429a0b921d6591ebf5e4c1eb4da8" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=sandbox%2FMooooo&do=goto" rel="nofollow">sandbox/Mooooo</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc" rel="nofollow">Andrew</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 09:31:35 -0400">09:31:35 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=af75602391ac9651e7594c65588da86d591f2c01&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn +new file mode 100644 +index 0000000..6f11d35 +--- /dev/null ++++ b/doc/sandbox/Mooooo.mdwn +@@ -0,0 +1 @@ ++Hrm. + +</pre> +</div> + +<!-- af75602391ac9651e7594c65588da86d591f2c01 --> diff --git a/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change b/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change new file mode 100644 index 000000000..9cd21da53 --- /dev/null +++ b/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change @@ -0,0 +1,51 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]] + +[[!meta title="""change to forum/ikiwiki_+_mathjax on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-b62581583107f6fc3e9bccf66a87a491c236757f"]] + +<div id="change-b62581583107f6fc3e9bccf66a87a491c236757f" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/ikiwiki_+_mathjax.mdwn;h=1279a2c8058177f0f10c27fa5ab037e75b5eed44;hp=0000000000000000000000000000000000000000;hb=b62581583107f6fc3e9bccf66a87a491c236757f;hpb=cb45d3cf44760411746414ba1218c925ad097149" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2Fikiwiki_%2B_mathjax&do=goto" rel="nofollow">forum/ikiwiki + mathjax</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8" rel="nofollow">micheal</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 30 Oct 2010 16:26:45 -0400">16:26:45 10/30/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=b62581583107f6fc3e9bccf66a87a491c236757f&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/ikiwiki_+_mathjax.mdwn b/doc/forum/ikiwiki_+_mathjax.mdwn +new file mode 100644 +index 0000000..1279a2c +--- /dev/null ++++ b/doc/forum/ikiwiki_+_mathjax.mdwn +@@ -0,0 +1 @@ ++Is it possible to use [mathjax](http://www.mathjax.org/) in ikiwiki to typeset math formulas? If so, is this compatible with the [wmd](http://ikiwiki.info/plugins/wmd/) plugin? + +</pre> +</div> + +<!-- b62581583107f6fc3e9bccf66a87a491c236757f --> diff --git a/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change b/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change new file mode 100644 index 000000000..e22162fac --- /dev/null +++ b/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change @@ -0,0 +1,58 @@ +[[!meta author="""jmtd"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjmtd&do=goto"""]] + +[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c02f9d224cb78a3ad880cb749ef4a11eadfad79a"]] + +<div id="change-c02f9d224cb78a3ad880cb749ef4a11eadfad79a" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn;h=ff98ba55f02c086c2bc5bd6c5d596ffdf4f336b4;hp=b1053fc38149f4ac10d960081a092f4d1642290c;hb=c02f9d224cb78a3ad880cb749ef4a11eadfad79a;hpb=03f04d48d53a3cd77215d6b086b416a1965e2feb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fargument_isn__39__t_numeric%3A_mixing_templates_and_creation__95__date&do=goto" rel="nofollow">bugs/argument isn't numeric: mixing templates and creation_date</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjmtd&do=goto" rel="nofollow">jmtd</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 17 Nov 2010 10:13:32 +0000">10:13:32 11/17/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=c02f9d224cb78a3ad880cb749ef4a11eadfad79a&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +sorry, I'll try against master in future.<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +index b1053fc..ff98ba5 100644 +--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn ++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn +@@ -58,3 +58,5 @@ However this doesn't work. I assume "included" in this context means e.g. via a + + > As far as I know, this bug was fixed in + > 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]] ++ ++>> Sorry Joey, I'll make sure to reproduce stuff against master in future. [[Jon]] + +</pre> +</div> + +<!-- c02f9d224cb78a3ad880cb749ef4a11eadfad79a --> diff --git a/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change b/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change new file mode 100644 index 000000000..340fc6c39 --- /dev/null +++ b/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change @@ -0,0 +1,60 @@ +[[!meta author="""http://pmate.myopenid.com/"""]] + +[[!meta authorurl="""http://pmate.myopenid.com/"""]] + +[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3"]] + +<div id="change-c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/tips/nearlyfreespeech/discussion.mdwn;h=73da608bed29a706cce45c13af9c8cc85500be39;hp=daebee2a0e95aae28242ca90e1b39df57aed0c17;hb=c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3;hpb=af0bfcc07820008f0387bfd1b35a594ed40a0246" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=tips%2Fnearlyfreespeech%2Fdiscussion&do=goto" rel="nofollow">tips/nearlyfreespeech/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://pmate.myopenid.com/" rel="nofollow">pmate [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 17:57:56 +0000">17:57:56 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn +index daebee2..73da608 100644 +--- a/doc/tips/nearlyfreespeech/discussion.mdwn ++++ b/doc/tips/nearlyfreespeech/discussion.mdwn +@@ -10,7 +10,8 @@ perl is 5.8.9 + + > This is fixed in 3.1415926. --[[Joey]] + +-Hi! +-How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here. +-But now if I want to upgrade it to a newer version? ++ ++Hi!<br /> ++How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br> ++But now if I want to upgrade it to a newer version?<br /> + Thanks for your incredible work! + +</pre> +</div> + +<!-- c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3 --> diff --git a/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change b/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change new file mode 100644 index 000000000..f6790d834 --- /dev/null +++ b/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change @@ -0,0 +1,55 @@ +[[!meta author="""civiccents"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]] + +[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c3624227620f5034fa84b3cb1294a61fc08eeea9"]] + +<div id="change-c3624227620f5034fa84b3cb1294a61fc08eeea9" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/sandbox/D-Liberative.wiki;h=69071521a7b26daa0744be2d2371743f954442df;hp=0000000000000000000000000000000000000000;hb=c3624227620f5034fa84b3cb1294a61fc08eeea9;hpb=a194fbc5bced565fa751008b8ada666c411d097d" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=sandbox%2FD-Liberative&do=goto" rel="nofollow">sandbox/D-Liberative</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto" rel="nofollow">civiccents</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 03 Nov 2010 17:54:17 -0400">17:54:17 11/03/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=c3624227620f5034fa84b3cb1294a61fc08eeea9&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +test<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki +new file mode 100644 +index 0000000..6907152 +--- /dev/null ++++ b/doc/sandbox/D-Liberative.wiki +@@ -0,0 +1 @@ ++For now its just a concept... what if we could map deliberative capacity? + +</pre> +</div> + +<!-- c3624227620f5034fa84b3cb1294a61fc08eeea9 --> diff --git a/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change b/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change new file mode 100644 index 000000000..faf921e65 --- /dev/null +++ b/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change @@ -0,0 +1,61 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c8537b41320e1f38b2369f24431423dfb2f14b15"]] + +<div id="change-c8537b41320e1f38b2369f24431423dfb2f14b15" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn;h=0c1da5b97bc54f0c3e04b899693e70a504d2818f;hp=3e6c23241c525fb70a47afa7f14ec695c27a766f;hb=c8537b41320e1f38b2369f24431423dfb2f14b15;hpb=23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FBlog_posting_times_and_ikiwiki_state&do=goto" rel="nofollow">forum/Blog posting times and ikiwiki state</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 04 Nov 2010 06:58:53 -0400">06:58:53 11/04/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=c8537b41320e1f38b2369f24431423dfb2f14b15&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +index 3e6c232..0c1da5b 100644 +--- a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn ++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +@@ -17,3 +17,12 @@ What can I do? + + Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? + ++> Have you tried running ikiwiki with the `--gettime` option on your laptop, ++> to force it to retrieve initial commit times from git? You should only ++> need to do that once, and it'll be cached in the pagestate thereafter. ++> ++> Because that functionality is slow on every supported VCS except git, ++> ikiwiki tries to avoid using it unless it's really needed. [[rcs]] ++> lists it as "fast" for git, though, so depending how fast it really is ++> and how large your wiki is, you might be able to get away with running ++> ikiwiki with `--gettime` all the time? --[[smcv]] + +</pre> +</div> + +<!-- c8537b41320e1f38b2369f24431423dfb2f14b15 --> diff --git a/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change b/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change new file mode 100644 index 000000000..6ea4e0e20 --- /dev/null +++ b/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change @@ -0,0 +1,98 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c9b737cc8596f9421ba968e56839eb052e80e794"]] + +<div id="change-c9b737cc8596f9421ba968e56839eb052e80e794" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=4fe14540fa3c543fb3240acdb63aa057e259bcfb;hp=de3cf48d3aae963943dfeb3aaffb2edd6f472ef8;hb=c9b737cc8596f9421ba968e56839eb052e80e794;hpb=d6ff694ff7a6a4700ccbbd5819907eac73cf065a" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 00:36:29 +0000">00:36:29 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=c9b737cc8596f9421ba968e56839eb052e80e794&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +one more patch: but expanding the memoization is actually a slowdown for the docwiki<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index de3cf48..4fe1454 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -43,12 +43,19 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >>>>>> `/^/i` regexp that can be used without further modifiction in most + >>>>>> cases. --[[Joey]] + +->>>>>>> Done, see `smcv/ready/glob-cache`. ++>>>>>>> Done, see `smcv/ready/glob-cache` and `smcv/glob-cache-too-far`. ++>>>>>>> + >>>>>>> Kathryn's patch is a significant improvement; my first patch on top of +->>>>>>> that is a trivial cleanup that speeds it up a little, and the other two ++>>>>>>> that is a trivial cleanup that speeds it up a little, and the next two + >>>>>>> patches (using precompiled regexes) have surprisingly little effect + >>>>>>> (they don't slow it down either though, so either omit them or merge +->>>>>>> them, whichever). Detailed benchmark results --[[smcv]] ++>>>>>>> them, whichever). Detailed benchmark results below. ++>>>>>>> ++>>>>>>> Moving the memoization to `glob2re` actually seems to slow things down ++>>>>>>> again - I suspect the docwiki has few enough mentions of `user()` etc. ++>>>>>>> that caching them is a waste of time, but perhaps it's not the most ++>>>>>>> representative. ++>>>>>>> --[[smcv]] + + -------------------------------------------------------------- + +@@ -120,9 +127,21 @@ master at time of branch: + 7.70 1.7814 79514 0.000022 IkiWiki::PageSpec::match_glob + 3.35 0.7756 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 + +-"""]] ++`move memoization from match_glob to glob2re`: ++ ++ time elapsed (wall): 28.7677 ++ time running program: 23.9473 (83.24%) ++ time profiling (est.): 4.8205 (16.76%) ++ number of calls: 1360181 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 13.98 3.3469 3408 0.000982 Text::Balanced::_match_tagged ++ 8.85 2.1194 79514 0.000027 IkiWiki::PageSpec::match_glob ++ 3.24 0.7750 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 + + --[[smcv]] ++"""]] + + -------------------------------------------------------------- + + +</pre> +</div> + +<!-- c9b737cc8596f9421ba968e56839eb052e80e794 --> diff --git a/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change b/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change new file mode 100644 index 000000000..3bfe0d0a0 --- /dev/null +++ b/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change @@ -0,0 +1,53 @@ +[[!meta author="""dark"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]] + +[[!meta title="""change to users/dark on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ca166361973e09b6756acbfe46b4a1bcfa4148d7"]] + +<div id="change-ca166361973e09b6756acbfe46b4a1bcfa4148d7" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/users/dark.mdwn;h=e1d06d0b0054f4f4370b150a9815bbf0a3755eb7;hp=0000000000000000000000000000000000000000;hb=ca166361973e09b6756acbfe46b4a1bcfa4148d7;hpb=e68f29eebb3917909b939869e57b985add724598" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto" rel="nofollow">users/dark</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto" rel="nofollow">dark</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 01 Nov 2010 16:53:42 -0400">16:53:42 11/01/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ca166361973e09b6756acbfe46b4a1bcfa4148d7&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/users/dark.mdwn b/doc/users/dark.mdwn +new file mode 100644 +index 0000000..e1d06d0 +--- /dev/null ++++ b/doc/users/dark.mdwn +@@ -0,0 +1,3 @@ ++[[!meta title="Richard Braakman"]] ++ ++Lars Wirzenius convinced me to try ikiwiki for blogging :) + +</pre> +</div> + +<!-- ca166361973e09b6756acbfe46b4a1bcfa4148d7 --> diff --git a/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change b/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change new file mode 100644 index 000000000..5bd6a2199 --- /dev/null +++ b/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change @@ -0,0 +1,65 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cb45d3cf44760411746414ba1218c925ad097149"]] + +<div id="change-cb45d3cf44760411746414ba1218c925ad097149" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=d9b6df677209039153d27981bf7bd76484998efc;hp=3ca85fddcb3578beaecfb04a8850d49cc6e61866;hb=cb45d3cf44760411746414ba1218c925ad097149;hpb=313a28b8f68b76aee4b94413e4e9d47dca93a34e" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 30 Oct 2010 12:59:31 -0400">12:59:31 10/30/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=cb45d3cf44760411746414ba1218c925ad097149&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +re the openid_provider cookie<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +index 3ca85fd..d9b6df6 100644 +--- a/doc/bugs/logout_in_ikiwiki.mdwn ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -12,6 +12,12 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y + >> (I'd argue also in favor of the openid_provider cookie expiring + >> in less time than it does now, and being session based) + ++>>> (The `openid_provider` cookie is purely a convenience cookie to ++>>> auto-select the user's openid provider the next time they log ++>>> in. As such, it cannot be a session cookie. It does not provide any ++>>> personally-identifying information so it should not really matter ++>>> when it expires.) --[[Joey]] ++ + >> It would be nice to move navigational elements to the upper right corner + >> of the page... + + +</pre> +</div> + +<!-- cb45d3cf44760411746414ba1218c925ad097149 --> diff --git a/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change b/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change new file mode 100644 index 000000000..f9603cdfd --- /dev/null +++ b/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change @@ -0,0 +1,57 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]] + +[[!meta title="""change to sandbox/Testing_blog_entry on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cbcd9077ad5fbef8c0622ea9c78a66c9baece804"]] + +<div id="change-cbcd9077ad5fbef8c0622ea9c78a66c9baece804" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/sandbox/Testing_blog_entry.mdwn;h=aa5fa5b207b620a6ee36176bda47935293eee61e;hp=0000000000000000000000000000000000000000;hb=cbcd9077ad5fbef8c0622ea9c78a66c9baece804;hpb=eaa04125d7080a9c882b629d1e0f6c7992ad462f" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=sandbox%2FTesting_blog_entry&do=goto" rel="nofollow">sandbox/Testing blog entry</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" rel="nofollow">Henning</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 06 Nov 2010 05:17:43 -0400">05:17:43 11/06/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=cbcd9077ad5fbef8c0622ea9c78a66c9baece804&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn +new file mode 100644 +index 0000000..aa5fa5b +--- /dev/null ++++ b/doc/sandbox/Testing_blog_entry.mdwn +@@ -0,0 +1,7 @@ ++# Be cool, this is a test! ++ ++Hello guys, this is *just a test* entry. ++ ++* Did I say ++* that I love ++* bulleted lists? + +</pre> +</div> + +<!-- cbcd9077ad5fbef8c0622ea9c78a66c9baece804 --> diff --git a/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change b/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change new file mode 100644 index 000000000..fc7bcda4e --- /dev/null +++ b/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change @@ -0,0 +1,57 @@ +[[!meta author="""http://cristian.regolo.cc/"""]] + +[[!meta authorurl="""http://cristian.regolo.cc/"""]] + +[[!meta title="""change to setup/byhand on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3"]] + +<div id="change-ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/setup/byhand.mdwn;h=75a5648d5212ba8d090764ea4064229d2a7d1923;hp=86cff5af4e58696eb8ada93e5b35771406ed421e;hb=ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3;hpb=69a22a6f4b4dfc47a7ce39476758742036b70e63" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=setup%2Fbyhand&do=goto" rel="nofollow">setup/byhand</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://cristian.regolo.cc/" rel="nofollow">cristiangreco</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 02 Nov 2010 10:13:12 -0400">10:13:12 11/02/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn +index 86cff5a..75a5648 100644 +--- a/doc/setup/byhand.mdwn ++++ b/doc/setup/byhand.mdwn +@@ -104,7 +104,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done! + There are lots of other configuration options in ikiwiki.setup that you + can uncomment, configure, and enable by re-running + `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the +-[[plugins]].. ++[[plugins]]. + + ## Put your wiki in revision control. + + +</pre> +</div> + +<!-- ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3 --> diff --git a/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change b/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change new file mode 100644 index 000000000..cd8f5cb07 --- /dev/null +++ b/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change @@ -0,0 +1,59 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cfc1b6ac486e11cb11d6c72602bf70b0a440b747"]] + +<div id="change-cfc1b6ac486e11cb11d6c72602bf70b0a440b747" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=3ca85fddcb3578beaecfb04a8850d49cc6e61866;hp=a9c407ba2921008e4fdf1e937008937782579e01;hb=cfc1b6ac486e11cb11d6c72602bf70b0a440b747;hpb=f54a91c3021b304fdde183834542418720e4f792" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" rel="nofollow">Dave</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 20:58:34 -0400">20:58:34 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=cfc1b6ac486e11cb11d6c72602bf70b0a440b747&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +index a9c407b..3ca85fd 100644 +--- a/doc/bugs/logout_in_ikiwiki.mdwn ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -16,7 +16,10 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y + >> of the page... + + >> I have two kinds of pages (wiki and blog), and three classes of users ++ + >> anonymous users - display things like login, help, and recentchanges, ++ + >> non-admin users - on a per subdir basis (blog and !blog) display + >> logout, help, recentchanges, edit, comment ++ + >> admin users - logout, help, recentchanges, edit, comment, etc + +</pre> +</div> + +<!-- cfc1b6ac486e11cb11d6c72602bf70b0a440b747 --> diff --git a/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change b/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change new file mode 100644 index 000000000..d2c139b20 --- /dev/null +++ b/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change @@ -0,0 +1,72 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d16104f55d8b31929d0466ca9abc3ccb4af0a8e8"]] + +<div id="change-d16104f55d8b31929d0466ca9abc3ccb4af0a8e8" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/more_and_RSS_generation.mdwn;h=00ab43fa25cd6360f38c1b36cae6fe4e359e8c41;hp=72d636f186a4425ffdb8dd916d57181733fb0e8a;hb=d16104f55d8b31929d0466ca9abc3ccb4af0a8e8;hpb=47b9f10e6254277918873a980af0cf0631326165" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Fmore_and_RSS_generation&do=goto" rel="nofollow">bugs/more and RSS generation</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 30 Oct 2010 12:41:31 -0400">12:41:31 10/30/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=d16104f55d8b31929d0466ca9abc3ccb4af0a8e8&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn +index 72d636f..00ab43f 100644 +--- a/doc/bugs/more_and_RSS_generation.mdwn ++++ b/doc/bugs/more_and_RSS_generation.mdwn +@@ -2,6 +2,19 @@ I'd like the more plugin and RSS to play better together. In the case of the htm + + Maybe there is a different plugin (I also tried toggle)? + ++> I am not a fan of the more directive (thus the rant about it sucking ++> embedded in its [[example|ikiwiki/directive/more]]). But I don't think ++> that weakening it to not work in rss feeds is a good idea, if someone ++> wants to force users to go somewhere to view their full content, ++> they should be able to do it, even though it does suck. ++> ++> The toggle directive will degrade fairly well in an rss feed to ++> display the full text. (There is an annoying toggle link that does ++> nothing when embedded in an rss feed). --[[Joey]] ++ + I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. + ++> It's just a simple directive, it should work anywhere any directive will, ++> and does as far as I can see. Details? --[[Joey]] ++ + see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] + +</pre> +</div> + +<!-- d16104f55d8b31929d0466ca9abc3ccb4af0a8e8 --> diff --git a/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change b/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change new file mode 100644 index 000000000..5ed5137ba --- /dev/null +++ b/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change @@ -0,0 +1,68 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to plugins/htmlscrubber on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d5056fb61e8332fea658363e931ec28a35681ffe"]] + +<div id="change-d5056fb61e8332fea658363e931ec28a35681ffe" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/htmlscrubber.mdwn;h=080575c463e0e531ba2717989a966b93221e7fb5;hp=c59b46e14e12624463881101fff3190de36061c1;hb=d5056fb61e8332fea658363e931ec28a35681ffe;hpb=289b30a47d548326aad9c1dc5252fc0269494c87" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fhtmlscrubber&do=goto" rel="nofollow">plugins/htmlscrubber</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 00:24:33 -0400">00:24:33 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=d5056fb61e8332fea658363e931ec28a35681ffe&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +add example of skipping blog posts while scrubbing comments<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn +index c59b46e..080575c 100644 +--- a/doc/plugins/htmlscrubber.mdwn ++++ b/doc/plugins/htmlscrubber.mdwn +@@ -32,10 +32,11 @@ other HTML-related functionality, such as whether [[meta]] allows + potentially unsafe HTML tags. + + The `htmlscrubber_skip` configuration setting can be used to skip scrubbing +-of some pages. Set it to a [[ikiwiki/PageSpec]], such as "!*/Discussion", +-and pages matching that can have all the evil CSS, JavsScript, and unsafe +-html elements you like. One safe way to use this is to use [[lockedit]] to +-lock those pages, so only admins can edit them. ++of some pages. Set it to a [[ikiwiki/PageSpec]], such as ++"posts/* and !comment(*) and !*/Discussion", and pages matching that can have ++all the evil CSS, JavsScript, and unsafe html elements you like. One safe ++way to use this is to use [[lockedit]] to lock those pages, so only admins ++can edit them. + + ---- + + +</pre> +</div> + +<!-- d5056fb61e8332fea658363e931ec28a35681ffe --> diff --git a/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change b/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change new file mode 100644 index 000000000..235b8a592 --- /dev/null +++ b/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change @@ -0,0 +1,236 @@ +[[!meta author="""smcv"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d6ff694ff7a6a4700ccbbd5819907eac73cf065a"]] + +<div id="change-d6ff694ff7a6a4700ccbbd5819907eac73cf065a" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=de3cf48d3aae963943dfeb3aaffb2edd6f472ef8;hp=0fc059ad7d169c2e35f3ea869bdc2f69be649857;hb=d6ff694ff7a6a4700ccbbd5819907eac73cf065a;hpb=a4cb86d73327e7850eeb524ef387b17ac5e1614d" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 00:22:56 +0000">00:22:56 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=d6ff694ff7a6a4700ccbbd5819907eac73cf065a&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +branch ready for merge, I think<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index 0fc059a..de3cf48 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -1,3 +1,7 @@ ++[[!template id=gitbranch branch=smcv/ready/glob-cache ++ author="[[KathrynAndersen]], [[smcv]]"]] ++[[!tag patch]] ++ + I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob. This matcher is a good one to improve the speed of, because it gets called so many times. + + Here's my patch - please consider it! -- [[KathrynAndersen]] +@@ -39,7 +43,92 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >>>>>> `/^/i` regexp that can be used without further modifiction in most + >>>>>> cases. --[[Joey]] + ++>>>>>>> Done, see `smcv/ready/glob-cache`. ++>>>>>>> Kathryn's patch is a significant improvement; my first patch on top of ++>>>>>>> that is a trivial cleanup that speeds it up a little, and the other two ++>>>>>>> patches (using precompiled regexes) have surprisingly little effect ++>>>>>>> (they don't slow it down either though, so either omit them or merge ++>>>>>>> them, whichever). Detailed benchmark results --[[smcv]] ++ + -------------------------------------------------------------- ++ ++[[!toggle id="smcv-benchmark" text="current benchmarks"]] ++ ++[[!toggleable id="smcv-benchmark" text=""" ++master at time of branch: ++ ++ time elapsed (wall): 29.6348 ++ time running program: 24.9212 (84.09%) ++ time profiling (est.): 4.7136 (15.91%) ++ number of calls: 1360181 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 13.24 3.2986 3408 0.000968 Text::Balanced::_match_tagged ++ 10.94 2.7253 79514 0.000034 IkiWiki::PageSpec::match_glob ++ 3.19 0.7952 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ ++`Improve the speed of match_glob`: ++ ++ time elapsed (wall): 27.9755 ++ time running program: 23.5293 (84.11%) ++ time profiling (est.): 4.4461 (15.89%) ++ number of calls: 1280875 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 14.56 3.4257 3408 0.001005 Text::Balanced::_match_tagged ++ 7.82 1.8403 79514 0.000023 IkiWiki::PageSpec::match_glob ++ 3.27 0.7698 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ ++`match_glob: streamline glob cache slightly`: ++ ++ time elapsed (wall): 27.5753 ++ time running program: 23.1714 (84.03%) ++ time profiling (est.): 4.4039 (15.97%) ++ number of calls: 1280875 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 14.09 3.2637 3408 0.000958 Text::Balanced::_match_tagged ++ 7.74 1.7926 79514 0.000023 IkiWiki::PageSpec::match_glob ++ 3.30 0.7646 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ ++`glob2re: return a precompiled, anchored case-insensitiv...`: ++ ++ time elapsed (wall): 27.5656 ++ time running program: 23.1464 (83.97%) ++ time profiling (est.): 4.4192 (16.03%) ++ number of calls: 1282189 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 14.21 3.2891 3408 0.000965 Text::Balanced::_match_tagged ++ 7.72 1.7872 79514 0.000022 IkiWiki::PageSpec::match_glob ++ 3.32 0.7678 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ ++`make use of precompiled regex objects`: ++ ++ time elapsed (wall): 27.5357 ++ time running program: 23.1289 (84.00%) ++ time profiling (est.): 4.4068 (16.00%) ++ number of calls: 1281981 ++ number of exceptions: 13 ++ ++ %Time Sec. #calls sec/call F name ++ 14.17 3.2776 3408 0.000962 Text::Balanced::_match_tagged ++ 7.70 1.7814 79514 0.000022 IkiWiki::PageSpec::match_glob ++ 3.35 0.7756 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 ++ ++"""]] ++ ++--[[smcv]] ++ ++-------------------------------------------------------------- ++ ++[[!toggle id="ka-benchmarks" text="Kathryn's benchmarks"]] ++ ++[[!toggleable id="ka-benchmarks" text=""" + Benchmarks done with Devel::Profile on the same testbed IkiWiki setup. I'm just showing the start of the profile output, since that's what's relevant. + + Before: +@@ -73,73 +162,13 @@ number of exceptions: 65 + Note that the seconds per call for match_glob in the "after" case has gone down by about a third. + + K.A. ++"""]] + + -------------------------------------------------------------- + +-A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4 +-like so: +- +- perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose +- +-The docwiki appears to use fewer glob matches than Kathryn's wiki. +- +-With master: +- +- time elapsed (wall): 29.6970 +- time running program: 24.6930 (83.15%) +- time profiling (est.): 5.0041 (16.85%) +- number of calls: 1359180 +- number of exceptions: 13 +- +- %Time Sec. #calls sec/call F name +- 13.62 3.3629 3406 0.000987 Text::Balanced::_match_tagged +- 10.84 2.6773 79442 0.000034 IkiWiki::PageSpec::match_glob +- 3.08 0.7598 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 +- 3.07 0.7593 29830 0.000025 IkiWiki::bestlink +- 2.99 0.7378 10231 0.000072 IkiWiki::PageSpec::match_link +- +-With my `smcv/memoize-glob2re` branch: +- +- time elapsed (wall): 30.4931 +- time running program: 25.1248 (82.39%) +- time profiling (est.): 5.3683 (17.61%) +- number of calls: 1439943 +- number of exceptions: 13 +- +- %Time Sec. #calls sec/call F name +- 13.19 3.3146 3406 0.000973 Text::Balanced::_match_tagged +- 8.41 2.1123 79442 0.000027 IkiWiki::PageSpec::match_glob +- 3.97 0.9979 86905 0.000011 Memoize::_memoizer +- 3.05 0.7654 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 +- 3.02 0.7576 29830 0.000025 IkiWiki::bestlink +- +-and in a repeated run: +- +- 8.40 2.0905 79442 0.000026 IkiWiki::PageSpec::match_glob +- +-With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch: +- +- time elapsed (wall): 27.7567 +- time running program: 22.9941 (82.84%) +- time profiling (est.): 4.7627 (17.16%) +- number of calls: 1279946 +- number of exceptions: 13 +- +- %Time Sec. #calls sec/call F name +- 14.29 3.2867 3406 0.000965 Text::Balanced::_match_tagged +- 7.89 1.8136 79442 0.000023 IkiWiki::PageSpec::match_glob +- 3.30 0.7577 59454 0.000013 <anon>:IkiWiki/Plugin/inline.pm:223 +- 3.24 0.7461 29830 0.000025 IkiWiki::bestlink +- 3.19 0.7332 143 0.005127 ? IkiWiki::pagespec_match_list +- +-and in a repeated run: +- +- 7.84 1.8253 79442 0.000023 IkiWiki::PageSpec::match_glob +- +---[[smcv]] +- +--------------------------------------------------------------- ++[[!toggle id="ka-patch" text="Kathryn's original patch"]] + ++[[!toggleable id="ka-patch" text=""" + + <pre> + diff --git a/IkiWiki.pm b/IkiWiki.pm +@@ -174,4 +203,5 @@ index 08a3d78..c187b98 100644 + return IkiWiki::SuccessReason->new("$glob matches $page"); + } + </pre> ++"""]] + -------------------------------------------------------------- + +</pre> +</div> + +<!-- d6ff694ff7a6a4700ccbbd5819907eac73cf065a --> diff --git a/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change new file mode 100644 index 000000000..6a128e5df --- /dev/null +++ b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change @@ -0,0 +1,120 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e"]] + +<div id="change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=80925b458287767620d8862f782e77b1bd7dda63;hp=4fafc2bbc249ac9e22869129f8702e0a6d54a5ba;hb=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e;hpb=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 19:45:02 +0000">19:45:02 11/22/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +respond to feedback<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index 4fafc2b..80925b4 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -191,14 +191,41 @@ New API added by this branch: + > The new form for local urls will typically be only a little bit longer, + > except in the unusual case where the cgiurl is elsewhere. --[[Joey]] + ++ >> So, have urlto(x, y) use `$local_url`? There are few calls, but IMO ++ >> they're for the most important things - wikilinks, img, map and ++ >> other ordinary hyperlinks. Using `$local_url` would be fine for ++ >> webserver-based use, but it does stop you browsing your wiki's ++ >> HTML over `file:///` (unless you set that as the base URL, but ++ >> then you can't move it around), and stops you moving simple ++ >> outputs (like the docwiki!) around. ++ >> ++ >> I personally think breaking the docwiki is enough to block that. ++ >> ++ >> How about this? ++ >> ++ >> * `urlto($link, $page)` with `$page` defined: relative ++ >> * `urlto($link, undef)`: local, starts with `/` ++ >> * `urlto($link)`: also local, as a side-effect ++ >> * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is ++ >> normally undef): absolute, starts with `http[s]://` ++ >> ++ >> --[[smcv]] ++ + * `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + ++ > I assume you have no objection to this --[[smcv]] ++ + * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + ++ > Possibly changed to making this always be local unless `cgiurl => $x` ++ > is given: see below --[[smcv]] ++ + * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters + except `cgiurl` and/or `local_cgiurl` + ++ > I assume you have no objection to this --[[smcv]] ++ + Bugs: + + * I don't think anything except `openid` calls `cgiurl` without also +@@ -211,10 +238,18 @@ Bugs: + + > I agree that makes sense. --[[Joey]] + ++ >> I'm not completely sure whether you're agreeing with "perhaps do this" ++ >> or "that looks too strange", so please disambiguate: ++ >> would you accept a patch that makes `cgiurl` default to a local ++ >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]] ++ + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + +- > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] ++ > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] ++ ++ >> Not really part of this branch, though, so wontfix (unless you ask me ++ >> to do so). --[[smcv]] + + * Or, to reduce use of the unexported `baseurl` function, it might make + sense to give `urlto` a special case that references the root of the wiki, +@@ -227,3 +262,5 @@ Bugs: + + > AFACIS, `baseurl` is only called in 3 places so I don't think that's + > needed. --[[Joey]] ++ ++ >> OK, wontfix. --[[smcv]] + +</pre> +</div> + +<!-- d916cd2f71f1c22dad947d7b2134edbbb15e7b8e --> diff --git a/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change b/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change new file mode 100644 index 000000000..2a24ad4e2 --- /dev/null +++ b/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change @@ -0,0 +1,96 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-da9e1ea667f82d5fca9168dbed19be08040570ff"]] + +<div id="change-da9e1ea667f82d5fca9168dbed19be08040570ff" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/template.mdwn;h=df391f99e0a23dd7cda85a8c29c1aef80baa707f;hp=9e3ae54dfd6209c92528ace49ad5ae2b3279d486;hb=da9e1ea667f82d5fca9168dbed19be08040570ff;hpb=53e519931f3a6b7cea0af652d749344757d4e2bc" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Ftemplate&do=goto" rel="nofollow">ikiwiki/directive/template</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 10:28:05 -0400">10:28:05 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=da9e1ea667f82d5fca9168dbed19be08040570ff&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +guard templates with the if directive where necessary<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn +index 9e3ae54..df391f9 100644 +--- a/doc/ikiwiki/directive/template.mdwn ++++ b/doc/ikiwiki/directive/template.mdwn +@@ -60,22 +60,30 @@ few things: + `<TMPL_IF variable>text</TMPL_IF>`. + * To use one block of text if a variable is set and a second if it's not, + use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>` ++* Each template file included in the wiki's source will also generate a regular ++ wiki page. In many cases you might want to prevent some of your template ++ being interpreted for the regular page. Use the [[if]] directive with the ++ `included()` test to guard the template code. + + Here's a sample template: + +- <span class="infobox"> +- Name: \[[<TMPL_VAR raw_name>]]<br /> +- Age: <TMPL_VAR age><br /> +- <TMPL_IF color> +- Favorite color: <TMPL_VAR color><br /> +- <TMPL_ELSE> +- No favorite color.<br /> +- </TMPL_IF> +- <TMPL_IF notes> +- <hr /> +- <TMPL_VAR notes> +- </TMPL_IF> +- </span> ++ \[[!if test="included()" then=""" ++ <span class="infobox"> ++ Name: \[[<TMPL_VAR raw_name>]]<br /> ++ Age: <TMPL_VAR age><br /> ++ <TMPL_IF color> ++ Favorite color: <TMPL_VAR color><br /> ++ <TMPL_ELSE> ++ No favorite color.<br /> ++ </TMPL_IF> ++ <TMPL_IF notes> ++ <hr /> ++ <TMPL_VAR notes> ++ </TMPL_IF> ++ </span> ++ """ else=""" ++ This is a template page. ++ """]] + + The filled out template will be formatted the same as the rest of the page + that contains it, so you can include WikiLinks and all other forms of wiki + +</pre> +</div> + +<!-- da9e1ea667f82d5fca9168dbed19be08040570ff --> diff --git a/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change b/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change new file mode 100644 index 000000000..6705227a9 --- /dev/null +++ b/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change @@ -0,0 +1,59 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to forum/PageSpec_results_from_independent_checkout on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-daf89f59e61d9091fe27dd8738b40db5fa85a5e6"]] + +<div id="change-daf89f59e61d9091fe27dd8738b40db5fa85a5e6" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/PageSpec_results_from_independent_checkout.mdwn;h=693287d2bdcfae6b3830065a34f9ce836ea5be84;hp=6b2fd6df072858ff79471006f0bc37fb2a975661;hb=daf89f59e61d9091fe27dd8738b40db5fa85a5e6;hpb=ec6c1269d251c78d2eef68cb789de6cfc6272464" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FPageSpec_results_from_independent_checkout&do=goto" rel="nofollow">forum/PageSpec results from independent checkout</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 19:03:03 +0000">19:03:03 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=daf89f59e61d9091fe27dd8738b40db5fa85a5e6&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn +index 6b2fd6d..693287d 100644 +--- a/doc/forum/PageSpec_results_from_independent_checkout.mdwn ++++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn +@@ -3,3 +3,6 @@ I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, + perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" + + I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk ++ ++> It's not possible to build up enough state without at a minimum ++> performing the scan pass of rendering on every page. --[[Joey]] + +</pre> +</div> + +<!-- daf89f59e61d9091fe27dd8738b40db5fa85a5e6 --> diff --git a/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change b/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change new file mode 100644 index 000000000..56c9170e6 --- /dev/null +++ b/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change @@ -0,0 +1,52 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/autoindex_should_use_add__95__autofile on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-db3fb406733b98535d426acedd58f1633df79ade"]] + +<div id="change-db3fb406733b98535d426acedd58f1633df79ade" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/autoindex_should_use_add__95__autofile.mdwn;h=517567e583fb5a9d3489419f6f50c208fcc6bf32;hp=0000000000000000000000000000000000000000;hb=db3fb406733b98535d426acedd58f1633df79ade;hpb=0e4e3f7cae25082fc90a93dee41b397b0ae9be09" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fautoindex_should_use_add__95__autofile&do=goto" rel="nofollow">todo/autoindex should use add_autofile</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 08 Nov 2010 08:11:32 -0400">08:11:32 11/08/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=db3fb406733b98535d426acedd58f1633df79ade&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn +new file mode 100644 +index 0000000..517567e +--- /dev/null ++++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn +@@ -0,0 +1,2 @@ ++`add_autofile` is a generic version of [[plugins/autoindex]]'s code, ++so the latter should probably use the former. --[[smcv]] + +</pre> +</div> + +<!-- db3fb406733b98535d426acedd58f1633df79ade --> diff --git a/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change b/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change new file mode 100644 index 000000000..24ab79826 --- /dev/null +++ b/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change @@ -0,0 +1,69 @@ +[[!meta author="""http://jmtd.livejournal.com/"""]] + +[[!meta authorurl="""http://jmtd.livejournal.com/"""]] + +[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-dd9796375895752621cdcce103d1ad8d8a31d6cb"]] + +<div id="change-dd9796375895752621cdcce103d1ad8d8a31d6cb" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/aggregate_generates_long_filenames.mdwn;h=33e7b743bab78b6a38cf82d2cd7ced97a67de85f;hp=c38ad6c7b84bba739f7deea2e40519b65b56792a;hb=dd9796375895752621cdcce103d1ad8d8a31d6cb;hpb=b00c6c9640453bf1407c4e880ef0c171388197c7" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Faggregate_generates_long_filenames&do=goto" rel="nofollow">bugs/aggregate generates long filenames</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://jmtd.livejournal.com/" rel="nofollow">jmtd [livejournal.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 17 Nov 2010 07:47:07 +0000">07:47:07 11/17/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=dd9796375895752621cdcce103d1ad8d8a31d6cb&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +ext4, default settings...<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn +index c38ad6c..33e7b74 100644 +--- a/doc/bugs/aggregate_generates_long_filenames.mdwn ++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn +@@ -19,3 +19,16 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi + > that, in additional to having a rather antique long filename limit, your + > system also doesn't properly expose it via pathconf. Not sure what + > ikiwiki can do here. --[[Joey]] ++ ++>> This is an ext4 filesystem with default settings (which appears to mean ++>> 256 bytes for pathnames). Despite the error saying file name, it's ++>> definitely a path issue since moving my test repo to `/tmp`from ++>> `/home/jon/wd/mine/www` hides the problem. I note the following comment ++>> in `aggregate.pm`: ++ ++ # Make sure that the file name isn't too long. ++ # NB: This doesn't check for path length limits. ++ ++>> I don't fully grok the aggregate source yet, but I wouldn't rule out ++>> a bug in the path length checking, personally. I'm happy to try and ++>> find it myself though :) -- [[Jon]] + +</pre> +</div> + +<!-- dd9796375895752621cdcce103d1ad8d8a31d6cb --> diff --git a/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change b/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change new file mode 100644 index 000000000..05c362968 --- /dev/null +++ b/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change @@ -0,0 +1,61 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e68f29eebb3917909b939869e57b985add724598"]] + +<div id="change-e68f29eebb3917909b939869e57b985add724598" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn;h=16c147b68fa6a637ae9a45b6f3a94c393d3efa6d;hp=c131143601f28c7f3e3c4b9d7255dc1183227b14;hb=e68f29eebb3917909b939869e57b985add724598;hpb=fa71b0e6aa08b0e3b274a0b939bf657f2576e482" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fcontrib%2Fdefault_content_for___42__copyright__42___and___42__license__42__&do=goto" rel="nofollow">plugins/contrib/default content for *copyright* and *license*</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 01 Nov 2010 14:24:46 -0400">14:24:46 11/01/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=e68f29eebb3917909b939869e57b985add724598&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +ugh, now with better syntax<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +index c131143..16c147b 100644 +--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn ++++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +@@ -46,7 +46,7 @@ by ikiwiki are likewise fine. --[[tschwinge]] + > that it doesn't support setting defaults for a given "subdirectory" + > only. --[[smcv]] + +-[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] ++[[!template id=gitbranch branch=smcv/contrib/defcopyright author="[[tschwinge]]"]] + + > For `./gitremotes` convenience (taking the Linus approach to backups :-) ) + > I've added this to my git repository as a branch. No review, approval or + +</pre> +</div> + +<!-- e68f29eebb3917909b939869e57b985add724598 --> diff --git a/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change b/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change new file mode 100644 index 000000000..b69fabd45 --- /dev/null +++ b/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change @@ -0,0 +1,63 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e810fe394b49955971299329136d46548d95ec6b"]] + +<div id="change-e810fe394b49955971299329136d46548d95ec6b" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=0a9d8c69c4c35a230f5080d1fd1f4cacb6b806ae;hp=8f70f1dde4bbe7fd7b66807c36e6f4d7fd0b08b0;hb=e810fe394b49955971299329136d46548d95ec6b;hpb=171c429f829aac53cb449e3bb574d2a1669e025e" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 10 Nov 2010 09:26:16 -0400">09:26:16 11/10/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=e810fe394b49955971299329136d46548d95ec6b&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +possible improvement<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index 8f70f1d..0a9d8c6 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -2,6 +2,10 @@ I've been profiling my IkiWiki to try to improve speed (with many pages makes sp + + Here's my patch - please consider it! -- [[KathrynAndersen]] + ++> It seems to me as though changing `glob2re` to return qr/$re/, and calling ++> `memoize(glob2re)` next to the other memoize calls, would be a less ++> verbose way to do this? --[[smcv]] ++ + -------------------------------------------------------------- + <pre> + diff --git a/IkiWiki.pm b/IkiWiki.pm + +</pre> +</div> + +<!-- e810fe394b49955971299329136d46548d95ec6b --> diff --git a/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change b/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change new file mode 100644 index 000000000..a40a8ce27 --- /dev/null +++ b/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change @@ -0,0 +1,58 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]] + +[[!meta title="""change to sandbox on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eaa04125d7080a9c882b629d1e0f6c7992ad462f"]] + +<div id="change-eaa04125d7080a9c882b629d1e0f6c7992ad462f" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/sandbox.mdwn;h=df9d688b8b6854660064cb53017c0ffd485a8db4;hp=c665e67f06e387af7aa2b888b15dc74feff6a213;hb=eaa04125d7080a9c882b629d1e0f6c7992ad462f;hpb=87a42450e1ac8e2e01b7ed2785ed43040fd14ed3" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=sandbox&do=goto" rel="nofollow">sandbox</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" rel="nofollow">Henning</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 06 Nov 2010 05:15:29 -0400">05:15:29 11/06/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=eaa04125d7080a9c882b629d1e0f6c7992ad462f&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added crucial hello-world line<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn +index c665e67..df9d688 100644 +--- a/doc/sandbox.mdwn ++++ b/doc/sandbox.mdwn +@@ -1,3 +1,5 @@ ++Hello, world! ++ + This is the [[SandBox]], a page anyone can edit to try out ikiwiki + (version [[!version ]]). + + +</pre> +</div> + +<!-- eaa04125d7080a9c882b629d1e0f6c7992ad462f --> diff --git a/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change b/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change new file mode 100644 index 000000000..3643d9cac --- /dev/null +++ b/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change @@ -0,0 +1,58 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eb13521f5276cdd21a3f5990b1a1a17234e40174"]] + +<div id="change-eb13521f5276cdd21a3f5990b1a1a17234e40174" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn;h=9725b6541855c79fc8360e74857bd5737fb43834;hp=8650e4f2af14f9362d9d2de22ddbfc1e14411b00;hb=eb13521f5276cdd21a3f5990b1a1a17234e40174;hpb=f6312319a49cc1860eebbafd937a0f75d8e7baeb" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Freplace_HTML%3A%3ATemplate_with_Template_Toolkit&do=goto" rel="nofollow">todo/replace HTML::Template with Template Toolkit</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 19:00:48 -0400">19:00:48 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=eb13521f5276cdd21a3f5990b1a1a17234e40174&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +modular, not replacement<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +index 8650e4f..9725b65 100644 +--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn ++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +@@ -61,3 +61,5 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer + + + I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian ++ ++> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs. However, I also agree that HTML::Template has its own problems too. The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess. One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends. There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]] + +</pre> +</div> + +<!-- eb13521f5276cdd21a3f5990b1a1a17234e40174 --> diff --git a/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change b/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change new file mode 100644 index 000000000..eb22db19f --- /dev/null +++ b/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change @@ -0,0 +1,55 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]] + +[[!meta title="""change to todo/Add_nicer_math_formatting on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa"]] + +<div id="change-ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Add_nicer_math_formatting.mdwn;h=3a5e94a144c3b61f8242b241dc31f3ded54f36e9;hp=6e082c102fc07a60e135e65b91c64d1b9bae4747;hb=ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa;hpb=65ecc73755348f1ed13b77b2f4bdf9db4e465be4" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FAdd_nicer_math_formatting&do=goto" rel="nofollow">todo/Add nicer math formatting</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8" rel="nofollow">micheal</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Fri, 12 Nov 2010 09:35:34 -0400">09:35:34 11/12/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn +index 6e082c1..3a5e94a 100644 +--- a/doc/todo/Add_nicer_math_formatting.mdwn ++++ b/doc/todo/Add_nicer_math_formatting.mdwn +@@ -21,4 +21,6 @@ It would be nice to add nicer math formatting. I currently use the + > I've posted a question about this to its forum: --[[Joey]] + > <https://sourceforge.net/projects/jsmath/forums/forum/592273/topic/3831574> + ++I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow. ++ + [[!tag wishlist]] + +</pre> +</div> + +<!-- ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa --> diff --git a/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change b/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change new file mode 100644 index 000000000..13d0c0641 --- /dev/null +++ b/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change @@ -0,0 +1,106 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to ikiwiki/directive/more todo/selective_more_directive on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ec6c1269d251c78d2eef68cb789de6cfc6272464"]] + +<div id="change-ec6c1269d251c78d2eef68cb789de6cfc6272464" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/more.mdwn;h=bda1427f39b6d3e688dc589b4ffd82aa3b09dc19;hp=50655191001371b9c34d4c305c118676b7e4f80e;hb=ec6c1269d251c78d2eef68cb789de6cfc6272464;hpb=021676e489f9b79a50338635ad654f31eb5575fe" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Fmore&do=goto" rel="nofollow">ikiwiki/directive/more</a> + + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/selective_more_directive.mdwn;h=2a9998205f31460539e9c608dd3c740374bb503e;hp=24e6ab568a7e8aa4f2acc2a113bd554ef62dc2c9;hb=ec6c1269d251c78d2eef68cb789de6cfc6272464;hpb=021676e489f9b79a50338635ad654f31eb5575fe" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fselective_more_directive&do=goto" rel="nofollow">todo/selective more directive</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 19:00:04 +0000">19:00:04 11/16/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ec6c1269d251c78d2eef68cb789de6cfc6272464&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +more: Add pages parameter to limit where the more is displayed. (thanks, dark)<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm +index 80e339a..6880e36 100644 +--- a/IkiWiki/Plugin/more.pm ++++ b/IkiWiki/Plugin/more.pm +@@ -26,7 +26,10 @@ sub preprocess (@) { + + $params{linktext} = $linktext unless defined $params{linktext}; + +- if ($params{page} ne $params{destpage}) { ++ if ($params{page} ne $params{destpage} && ++ (! exists $params{pages} || ++ pagespec_match($params{destpage}, $params{pages}, ++ location => $params{page}))) { + return "\n". + htmllink($params{page}, $params{destpage}, $params{page}, + linktext => $params{linktext}, +diff --git a/debian/changelog b/debian/changelog +index 91ff096..faabf19 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,6 +1,8 @@ + ikiwiki (3.20101113) UNRELEASED; urgency=low + + * websetup: Fix encoding problem when restoring old setup file. ++ * more: Add pages parameter to limit where the more is displayed. ++ (thanks, dark) + + -- Joey Hess <joeyh@debian.org> Tue, 16 Nov 2010 14:23:47 -0400 + +diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn +index 5065519..bda1427 100644 +--- a/doc/ikiwiki/directive/more.mdwn ++++ b/doc/ikiwiki/directive/more.mdwn +@@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this: + + If the `linktext` parameter is omitted it defaults to just "more". + ++An optional `pages` parameter can be used to specify a ++[[ikiwiki/PageSpec]], and then the "more" link will only be displayed ++when the page is inlined into a page matching that PageSpec, and otherwise ++the full content shown. ++ + Note that you can accomplish something similar using a [[toggle]] instead. + + [[!meta robots="noindex, follow"]] +diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn +index 24e6ab5..2a99982 100644 +--- a/doc/todo/selective_more_directive.mdwn ++++ b/doc/todo/selective_more_directive.mdwn +@@ -24,3 +24,5 @@ I can now call it as + I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. + + -- [[dark]] ++ ++> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] + +</pre> +</div> + +<!-- ec6c1269d251c78d2eef68cb789de6cfc6272464 --> diff --git a/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change b/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change new file mode 100644 index 000000000..17cc453bb --- /dev/null +++ b/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change @@ -0,0 +1,66 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-efba19b3379b0b4e4199ece869c71f80be3a82d1"]] + +<div id="change-efba19b3379b0b4e4199ece869c71f80be3a82d1" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment;h=6e29f0c19bf51ce19ca55d82ffbc0575392fe6fa;hp=0000000000000000000000000000000000000000;hb=efba19b3379b0b4e4199ece869c71f80be3a82d1;hpb=78a2e59834d35da7a7ab8145beb7a30b59b95c90" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=forum%2FNeed_something_more_powerful_than_Exclude%2Fcomment_1_b454ead16d90479690ad8ee72cfd1428&do=goto" rel="nofollow">forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 10:43:09 +0000">10:43:09 11/23/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=efba19b3379b0b4e4199ece869c71f80be3a82d1&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +Added a comment: expression anchored too closely?<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment +new file mode 100644 +index 0000000..6e29f0c +--- /dev/null ++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment +@@ -0,0 +1,12 @@ ++[[!comment format=mdwn ++ username="http://smcv.pseudorandom.co.uk/" ++ nickname="smcv" ++ subject="expression anchored too closely?" ++ date="2010-11-23T10:43:08Z" ++ content=""" ++It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.) ++ ++The match operation in `&file_pruned` ends up a bit like this: ++ ++ \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$} ++"""]] + +</pre> +</div> + +<!-- efba19b3379b0b4e4199ece869c71f80be3a82d1 --> diff --git a/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change b/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change new file mode 100644 index 000000000..c0a50712c --- /dev/null +++ b/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change @@ -0,0 +1,100 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f35f79a0b831e8b47f62c430c1bba538d4687521"]] + +<div id="change-f35f79a0b831e8b47f62c430c1bba538d4687521" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=ff9784dd163c255867ba9958827447472fb20350;hp=b63128702d85c80ba625c217f9288660ac94ab7a;hb=f35f79a0b831e8b47f62c430c1bba538d4687521;hpb=08a20a3deaca2cb1f68fba993411b51c19e4c362" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Wed, 10 Nov 2010 17:08:45 -0400">17:08:45 11/10/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=f35f79a0b831e8b47f62c430c1bba538d4687521&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +response with benchmark<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index b631287..ff9784d 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -9,6 +9,47 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >> I think so, yeah. Anyway, do you have any benchmark results handy, + >> Kathryn? --[[Joey]] + ++>>> See below. ++>>> Also, would it make more sense for glob2re to return qr/^$re$/i rather than qr/$re/? Everything that uses glob2re seems to use ++ $foo =~ /^$re$/i ++>>> rather than /$re/ so I think that would make sense. ++>>> -- [[KathrynAndersen]] ++ ++-------------------------------------------------------------- ++Benchmarks done with Devel::Profile on the same testbed IkiWiki setup. I'm just showing the start of the profile output, since that's what's relevant. ++ ++Before: ++<pre> ++time elapsed (wall): 27.4173 ++time running program: 22.5909 (82.40%) ++time profiling (est.): 4.8264 (17.60%) ++number of calls: 1314729 ++number of exceptions: 65 ++ ++%Time Sec. #calls sec/call F name ++11.05 2.4969 62333 0.000040 IkiWiki::PageSpec::match_glob ++ 4.10 0.9261 679 0.001364 Text::Balanced::_match_tagged ++ 2.72 0.6139 59812 0.000010 IkiWiki::SuccessReason::merge_influences ++</pre> ++ ++After: ++<pre> ++time elapsed (wall): 26.1843 ++time running program: 21.5673 (82.37%) ++time profiling (est.): 4.6170 (17.63%) ++number of calls: 1252433 ++number of exceptions: 65 ++ ++%Time Sec. #calls sec/call F name ++ 7.66 1.6521 62333 0.000027 IkiWiki::PageSpec::match_glob ++ 4.33 0.9336 679 0.001375 Text::Balanced::_match_tagged ++ 2.81 0.6057 59812 0.000010 IkiWiki::SuccessReason::merge_influences ++</pre> ++ ++Note that the seconds per call for match_glob in the "after" case has gone down by about a third. ++ ++K.A. ++ + -------------------------------------------------------------- + <pre> + diff --git a/IkiWiki.pm b/IkiWiki.pm + +</pre> +</div> + +<!-- f35f79a0b831e8b47f62c430c1bba538d4687521 --> diff --git a/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change b/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change new file mode 100644 index 000000000..8d7d2471a --- /dev/null +++ b/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change @@ -0,0 +1,71 @@ +[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]] + +[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f54a91c3021b304fdde183834542418720e4f792"]] + +<div id="change-f54a91c3021b304fdde183834542418720e4f792" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/bugs/logout_in_ikiwiki.mdwn;h=a9c407ba2921008e4fdf1e937008937782579e01;hp=5df19c40575a7857d35a6b90957b94f213b6004c;hb=f54a91c3021b304fdde183834542418720e4f792;hpb=47b9f10e6254277918873a980af0cf0631326165" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=bugs%2Flogout_in_ikiwiki&do=goto" rel="nofollow">bugs/logout in ikiwiki</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" rel="nofollow">Dave</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Thu, 28 Oct 2010 20:56:13 -0400">20:56:13 10/28/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=f54a91c3021b304fdde183834542418720e4f792&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +trying to figure out how to make ikiwiki slightly more interactive<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn +index 5df19c4..a9c407b 100644 +--- a/doc/bugs/logout_in_ikiwiki.mdwn ++++ b/doc/bugs/logout_in_ikiwiki.mdwn +@@ -5,3 +5,18 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y + > It would be nice if it were not buried there, but putting it on the + > action bar statically would be confusing. The best approach might be to + > use javascript. --[[Joey]] ++ ++ ++>> I agree that javascript seems to be a solution, but my brain falls ++>> off the end of the world while looking at ways to manipulate the DOM. ++>> (I'd argue also in favor of the openid_provider cookie expiring ++>> in less time than it does now, and being session based) ++ ++>> It would be nice to move navigational elements to the upper right corner ++>> of the page... ++ ++>> I have two kinds of pages (wiki and blog), and three classes of users ++>> anonymous users - display things like login, help, and recentchanges, ++>> non-admin users - on a per subdir basis (blog and !blog) display ++>> logout, help, recentchanges, edit, comment ++>> admin users - logout, help, recentchanges, edit, comment, etc + +</pre> +</div> + +<!-- f54a91c3021b304fdde183834542418720e4f792 --> diff --git a/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change b/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change new file mode 100644 index 000000000..3f06369b5 --- /dev/null +++ b/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change @@ -0,0 +1,59 @@ +[[!meta author="""http://churchkey.org/author/ian/"""]] + +[[!meta authorurl="""http://churchkey.org/author/ian/"""]] + +[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f6312319a49cc1860eebbafd937a0f75d8e7baeb"]] + +<div id="change-f6312319a49cc1860eebbafd937a0f75d8e7baeb" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn;h=8650e4f2af14f9362d9d2de22ddbfc1e14411b00;hp=c4e78ca0bb7147eba8765b5185820f3beb279eda;hb=f6312319a49cc1860eebbafd937a0f75d8e7baeb;hpb=84fff62948ad7c7aef664585e8afed86398e7fd4" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Freplace_HTML%3A%3ATemplate_with_Template_Toolkit&do=goto" rel="nofollow">todo/replace HTML::Template with Template Toolkit</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://churchkey.org/author/ian/" rel="nofollow">ian [churchkey.org/author]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 11:50:37 -0400">11:50:37 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=f6312319a49cc1860eebbafd937a0f75d8e7baeb&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +added my reasons for wanting a replace-able template system<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +index c4e78ca..8650e4f 100644 +--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn ++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +@@ -58,3 +58,6 @@ Yes, Template::Toolkit is very powerful. But I think it's somehow overkill for a + I'd have to agree that Template::Toolkit is overkill and personally I'm not a fan, but it is very popular (there is even a book) and the new version (3) is alleged to be much more nimble than current version. --[[ajt]] + + HTML::Template's HTML-like markup prevents me from editing templates in KompoZer or other WYSIWYG HTML editors. The editor tries to render the template markup rather than display it verbatim, and large parts of the template become invisible. A markup syntax that doesn't confuse editors (such as Template::Toolkit's "[% FOO %]") may promote template customization. The ability to replace the template engine would be within the spirit of ikiwiki's extensibility. --Rocco ++ ++ ++I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian + +</pre> +</div> + +<!-- f6312319a49cc1860eebbafd937a0f75d8e7baeb --> diff --git a/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change b/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change new file mode 100644 index 000000000..3076c3a1b --- /dev/null +++ b/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change @@ -0,0 +1,54 @@ +[[!meta author="""http://pmate.myopenid.com/"""]] + +[[!meta authorurl="""http://pmate.myopenid.com/"""]] + +[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f80469c34d8d81e79d4894f7a1789a949bc766c3"]] + +<div id="change-f80469c34d8d81e79d4894f7a1789a949bc766c3" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/tips/nearlyfreespeech/discussion.mdwn;h=b764325662d6de7ec5854333a583e969018275be;hp=0d1f1f08236f9ffc6b2675284a1e5feee3832eb6;hb=f80469c34d8d81e79d4894f7a1789a949bc766c3;hpb=1739dbe0a8dc943c736d69f3747251ad72a53278" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=tips%2Fnearlyfreespeech%2Fdiscussion&do=goto" rel="nofollow">tips/nearlyfreespeech/discussion</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://pmate.myopenid.com/" rel="nofollow">pmate [myopenid.com]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 21:44:12 +0000">21:44:12 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=f80469c34d8d81e79d4894f7a1789a949bc766c3&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn +index 0d1f1f0..b764325 100644 +--- a/doc/tips/nearlyfreespeech/discussion.mdwn ++++ b/doc/tips/nearlyfreespeech/discussion.mdwn +@@ -18,3 +18,5 @@ Thanks for your incredible work! + + > You can move `~/ikiwiki` out of the way and then re-download and install + > it ikiwiki. --[[Joey]] ++ ++Thanks a lot Joey. :-) + +</pre> +</div> + +<!-- f80469c34d8d81e79d4894f7a1789a949bc766c3 --> diff --git a/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change b/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change new file mode 100644 index 000000000..4f394e68c --- /dev/null +++ b/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change @@ -0,0 +1,73 @@ +[[!meta author="""joey"""]] + +[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] + +[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f8f8770a652520b2f09eb2262510a04a8e353e9d"]] + +<div id="change-f8f8770a652520b2f09eb2262510a04a8e353e9d" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn;h=4e1df338196381a47e03c1a1767bd98ccb6e530d;hp=4fe14540fa3c543fb3240acdb63aa057e259bcfb;hb=f8f8770a652520b2f09eb2262510a04a8e353e9d;hpb=b3bca318ef11ce9d0609d952a72849243b591b9d" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2FImproving_the_efficiency_of_match__95__glob&do=goto" rel="nofollow">todo/Improving the efficiency of match_glob</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto" rel="nofollow">joey</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">git</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Sat, 20 Nov 2010 16:28:22 +0000">16:28:22 11/20/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=f8f8770a652520b2f09eb2262510a04a8e353e9d&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +smcv/ready/glob-cache merged<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/debian/changelog b/debian/changelog +index 0edb780..65c2353 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low + and support all elements that HTML::Tagset knows about. + (Which doesn't include html5 just yet, but then the old version + didn't either.) Bonus: 4 times faster than old regexp method. ++ * Optimise glob() pagespec. (Thanks, Kathryn and smcv) + + -- Joey Hess <joeyh@debian.org> Tue, 16 Nov 2010 14:23:47 -0400 + +diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +index 4fe1454..4e1df33 100644 +--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn ++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +@@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] + >>>>>>> representative. + >>>>>>> --[[smcv]] + ++[[done]] --[[Joey]] ++ + -------------------------------------------------------------- + + [[!toggle id="smcv-benchmark" text="current benchmarks"]] + +</pre> +</div> + +<!-- f8f8770a652520b2f09eb2262510a04a8e353e9d --> diff --git a/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change b/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change new file mode 100644 index 000000000..042b63b08 --- /dev/null +++ b/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change @@ -0,0 +1,63 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-fa71b0e6aa08b0e3b274a0b939bf657f2576e482"]] + +<div id="change-fa71b0e6aa08b0e3b274a0b939bf657f2576e482" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn;h=c131143601f28c7f3e3c4b9d7255dc1183227b14;hp=ce2779db16a224239ad607bb4d20f8872d2bf095;hb=fa71b0e6aa08b0e3b274a0b939bf657f2576e482;hpb=238259dfa199e217e34cc02462f55df6b2b1fcc5" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=plugins%2Fcontrib%2Fdefault_content_for___42__copyright__42___and___42__license__42__&do=goto" rel="nofollow">plugins/contrib/default content for *copyright* and *license*</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 01 Nov 2010 14:23:43 -0400">14:23:43 11/01/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=fa71b0e6aa08b0e3b274a0b939bf657f2576e482&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +added to git<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +index ce2779d..c131143 100644 +--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn ++++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +@@ -45,3 +45,10 @@ by ikiwiki are likewise fine. --[[tschwinge]] + > and can extend beyond just copyright and license, but has the disadvantage + > that it doesn't support setting defaults for a given "subdirectory" + > only. --[[smcv]] ++ ++[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] ++ ++> For `./gitremotes` convenience (taking the Linus approach to backups :-) ) ++> I've added this to my git repository as a branch. No review, approval or ++> ownership is implied, feel free to replace this with a branch in any other ++> repository --[[smcv]] + +</pre> +</div> + +<!-- fa71b0e6aa08b0e3b274a0b939bf657f2576e482 --> diff --git a/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change b/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change new file mode 100644 index 000000000..a9995d8b6 --- /dev/null +++ b/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change @@ -0,0 +1,61 @@ +[[!meta author="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]] + +[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ffeee19216182d633d251852ab62fe79c1367796"]] + +<div id="change-ffeee19216182d633d251852ab62fe79c1367796" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/transient_in-memory_pages.mdwn;h=816e95c382dd64c51783cd549ca343194d3dfaab;hp=5dbbe4f8271b2d6519363618e1f2b50e8923af33;hb=ffeee19216182d633d251852ab62fe79c1367796;hpb=608cef54d63ba60efd24ae14012dda7ff8d014a9" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Ftransient_in-memory_pages&do=goto" rel="nofollow">todo/transient in-memory pages</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://kerravonsen.dreamwidth.org/" rel="nofollow">kerravonsen [dreamwidth.org]</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 15 Nov 2010 01:43:56 -0400">01:43:56 11/15/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=ffeee19216182d633d251852ab62fe79c1367796&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +make it more generic?<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn +index 5dbbe4f..816e95c 100644 +--- a/doc/todo/transient_in-memory_pages.mdwn ++++ b/doc/todo/transient_in-memory_pages.mdwn +@@ -41,3 +41,8 @@ Refinements that could be made if this approach seems reasonable: + + * make these options boolean, and have the path always be `.ikiwiki/transient` + * improve the `remove` plugin so it also deletes from this special underlay ++ ++>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above). ++>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that? ++>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay. ++>> --[[KathrynAndersen]] + +</pre> +</div> + +<!-- ffeee19216182d633d251852ab62fe79c1367796 --> diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn index 64f81c82e..19c5004f8 100644 --- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn +++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn @@ -1,4 +1,4 @@ `add_autofile` is a generic version of [[plugins/autoindex]]'s code, so the latter should probably use the former. --[[smcv]] -> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]] +> See [[todo/transient_pages]] for progress on this. --[[smcv]] |