From ed16e5fd9fdf5a7e3716d951731868414e13563c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Feb 2008 15:18:26 -0500 Subject: [PATCH 01/18] web commit by tschwinge: Typo and some more. --- doc/git.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/git.mdwn b/doc/git.mdwn index 90f030ab4..dc0376213 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -21,7 +21,8 @@ own [[patches|patch]]. Some of the branches included in the main repository include: * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged - die to license issues. + due to license issues. Also some bits need to be tweaked to make it + work with the current *master* branch again. * `html` is an unfinished attempt at making ikiwiki output HTML 4.01 instead of xhtml. * `prefix-directives` changes the preprocessor directive syntax. It From 830152d2a970b3c301f42c4fb81b04e96e3b018f Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 6 Feb 2008 21:40:23 -0800 Subject: [PATCH 02/18] Update status of prefix-directives branch. --- doc/git.mdwn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/git.mdwn b/doc/git.mdwn index dc0376213..6cbc1e489 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -25,8 +25,10 @@ Some of the branches included in the main repository include: work with the current *master* branch again. * `html` is an unfinished attempt at making ikiwiki output HTML 4.01 instead of xhtml. -* `prefix-directives` changes the preprocessor directive syntax. It - is approximately one failing test case away from merging. + +* `prefix-directives` changes the preprocessor directive syntax. + Passes all test cases; pending merge. + * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `pristine-tar` contains deltas that From 5296ab065d2503ff023320bee4927f70f6aa219c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 07:05:51 -0500 Subject: [PATCH 03/18] web commit by http://edward.myopenid.com/: add [[todo/shortcut_with_different_link_text]] to watchlist --- doc/users/Edward_Betts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn index 8653c33c2..9b5435628 100644 --- a/doc/users/Edward_Betts.mdwn +++ b/doc/users/Edward_Betts.mdwn @@ -1,4 +1,4 @@ My watchlist: -[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" sort="mtime" atom="yes"]] +[[inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]] From d599a5d3390e91a1d7a8e8d1867902ea9047893e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 17:01:36 -0500 Subject: [PATCH 04/18] web commit by greg --- doc/todo/wikiwyg/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn index 78da75c38..3d17e15b2 100644 --- a/doc/todo/wikiwyg/discussion.mdwn +++ b/doc/todo/wikiwyg/discussion.mdwn @@ -155,3 +155,7 @@ merge it into ikiwiki. --[[Joey] [Revision 3840]: http://ikiwiki.info/cgi-bin/viewvc.cgi?view=rev&root=ikiwiki&revision=3840 + + +None of the links for the WYSIWYG editor work anymore. Does anyone have an up to date link? +Thanks, [[greg]] From 4084c9a655b638571d4ff1f8119b4ead2c182bc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 17:04:24 -0500 Subject: [PATCH 05/18] web commit by greg --- doc/todo/wikiwyg/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn index 3d17e15b2..d15299642 100644 --- a/doc/todo/wikiwyg/discussion.mdwn +++ b/doc/todo/wikiwyg/discussion.mdwn @@ -158,4 +158,4 @@ merge it into ikiwiki. --[[Joey] None of the links for the WYSIWYG editor work anymore. Does anyone have an up to date link? -Thanks, [[greg]] +Thanks, [[Greg]] From d78e213371d800c5fe6a0aca83adda132cefd047 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 18:49:39 -0500 Subject: [PATCH 06/18] web commit by http://marcell.mars.myopenid.com/ --- doc/posts/second_post_why_not__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/posts/second_post_why_not__63__.mdwn diff --git a/doc/posts/second_post_why_not__63__.mdwn b/doc/posts/second_post_why_not__63__.mdwn new file mode 100644 index 000000000..f6a3766dd --- /dev/null +++ b/doc/posts/second_post_why_not__63__.mdwn @@ -0,0 +1 @@ +nothing special. just second one coz it was no second one before this one. From 63e316f3621618f3b190da527fbb62ca5dad45d9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 22:11:54 -0500 Subject: [PATCH 07/18] * Don't die if running with --getctime and rcs_getctime throws an error. There are several cases (recentchanges files, aggregated files) where some source files are not in revision control. --- IkiWiki/Render.pm | 10 ++++++++-- debian/changelog | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 17b60ee94..26f7de331 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -327,9 +327,15 @@ sub refresh () { #{{{ } $pagecase{lc $page}=$page; if ($config{getctime} && -e "$config{srcdir}/$file") { - $pagectime{$page}=rcs_getctime("$config{srcdir}/$file"); + eval { + my $time=rcs_getctime("$config{srcdir}/$file"); + $pagectime{$page}=$time; + }; + if ($@) { + print STDERR $@; + } } - elsif (! exists $pagectime{$page}) { + if (! exists $pagectime{$page}) { $pagectime{$page}=mtime(srcfile($file)); } } diff --git a/debian/changelog b/debian/changelog index b32c7ad51..c608043f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.31) UNRELEASED; urgency=low +ikiwiki (2.31) unstable; urgency=low * Revert preservation of input file modification times in output files, since this leads to too many problems with web caching, especially with @@ -36,8 +36,11 @@ ikiwiki (2.31) UNRELEASED; urgency=low * inline: Add new `allowrss` and `allowatom` config options. These can be used if you want a wiki that doesn't default to generating rss or atom feeds, but that does allow them to be turned on for specific blogs. + * Don't die if running with --getctime and rcs_getctime throws an error. + There are several cases (recentchanges files, aggregated files) + where some source files are not in revision control. - -- Joey Hess Sat, 02 Feb 2008 23:36:31 -0500 + -- Joey Hess Wed, 06 Feb 2008 15:10:20 -0500 ikiwiki (2.30) unstable; urgency=low From 35547272c66880db73ac2791ac6ce8d58752ebad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2008 09:03:51 -0500 Subject: [PATCH 08/18] web commit by lnussel --- doc/bugs/img_plugin_causes_taint_failure.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/img_plugin_causes_taint_failure.mdwn diff --git a/doc/bugs/img_plugin_causes_taint_failure.mdwn b/doc/bugs/img_plugin_causes_taint_failure.mdwn new file mode 100644 index 000000000..094c07f37 --- /dev/null +++ b/doc/bugs/img_plugin_causes_taint_failure.mdwn @@ -0,0 +1,10 @@ +The img plugin causes a taint failure if one tries to link a scaled image, e.g. + + \[[img foo.png size=64x64]] + + .ikiwiki.setup: Insecure dependency in mkdir while running with -T switch at /usr/lib/perl5/vendor_perl/5.8.8/IkiWiki.pm line 360. + BEGIN failed--compilation aborted at (eval 5) line 109. + +If one omits the size argument it works. And if it worked once the taint failure will not happen again unless one rm -r's the destdir. + +Seen with ikiwiki 2.30 From 825847af95f42176f2e3803cf1ba64876b9d6279 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2008 13:52:31 -0500 Subject: [PATCH 09/18] reply --- doc/bugs/img_plugin_causes_taint_failure.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/bugs/img_plugin_causes_taint_failure.mdwn b/doc/bugs/img_plugin_causes_taint_failure.mdwn index 094c07f37..f8def19a0 100644 --- a/doc/bugs/img_plugin_causes_taint_failure.mdwn +++ b/doc/bugs/img_plugin_causes_taint_failure.mdwn @@ -8,3 +8,8 @@ The img plugin causes a taint failure if one tries to link a scaled image, e.g. If one omits the size argument it works. And if it worked once the taint failure will not happen again unless one rm -r's the destdir. Seen with ikiwiki 2.30 + +> And what version of perl? See [[Insecure_dependency_in_mkdir]] et al. +> Also, the debian build of ikiwiki has taint checking disabled to avoid +> this perl bug. Did you build your own? Set NOTAINT=1 when building.. +> --[[Joey]] From e183aa198f3aa35490b053700b28716b43bed199 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 8 Feb 2008 17:58:43 -0800 Subject: [PATCH 10/18] Use plural "wikis" for consistency --- debian/README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index 930131812..8032e8cb4 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,4 +1,4 @@ -It's a good idea, and in some cases a requirement, to rebuild your wiki +It's a good idea, and in some cases a requirement, to rebuild your wikis when upgrading to a new version of ikiwiki. If you have a lot of different wikis on a system, this can be a pain to do by hand, and it's a good idea to automate it anyway. From 6b35ec682b8d3c571ab17cbbd9d6156ba5ba9047 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 8 Feb 2008 18:01:03 -0800 Subject: [PATCH 11/18] Mention user wikilists in README.Debian --- debian/README.Debian | 5 +++++ debian/changelog | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian index 8032e8cb4..cf8bca94e 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -9,5 +9,10 @@ will run ikiwiki-mass-rebuild if necessary when upgraded. The file as the user who owns the wiki. Edit this file and add any wikis you set up. +You can also allow users to maintain their own list of wikis to rebuild, +by listing their usernames in /etc/ikiwiki/wikilist without corresponding +setup files. ikiwiki will then read their lists of wikis from +.ikiwiki/wikilist in their home directories. + The examples directory contains the source to some example wiki setups. diff --git a/debian/changelog b/debian/changelog index c608043f4..45a26e43a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ikiwiki (2.31) unstable; urgency=low + [ Joey Hess ] * Revert preservation of input file modification times in output files, since this leads to too many problems with web caching, especially with inlined pages. Properly solving this would involve tracking every page @@ -40,6 +41,9 @@ ikiwiki (2.31) unstable; urgency=low There are several cases (recentchanges files, aggregated files) where some source files are not in revision control. + [ Josh Triplett ] + * README.Debian: Mention user wikilists. + -- Joey Hess Wed, 06 Feb 2008 15:10:20 -0500 ikiwiki (2.30) unstable; urgency=low From 6cd7cb9d87441e42b266eda8bd87d4f19c15ad3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:54:54 -0500 Subject: [PATCH 12/18] remove random page --- doc/posts/second_post_why_not__63__.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/posts/second_post_why_not__63__.mdwn diff --git a/doc/posts/second_post_why_not__63__.mdwn b/doc/posts/second_post_why_not__63__.mdwn deleted file mode 100644 index f6a3766dd..000000000 --- a/doc/posts/second_post_why_not__63__.mdwn +++ /dev/null @@ -1 +0,0 @@ -nothing special. just second one coz it was no second one before this one. From f16b3f17c0919b9a40352680a88781a44fee680f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:56:29 -0500 Subject: [PATCH 13/18] note that's there's a git branch for this --- doc/todo/wikiwyg/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn index d15299642..ef6f6cd59 100644 --- a/doc/todo/wikiwyg/discussion.mdwn +++ b/doc/todo/wikiwyg/discussion.mdwn @@ -159,3 +159,8 @@ merge it into ikiwiki. --[[Joey] None of the links for the WYSIWYG editor work anymore. Does anyone have an up to date link? Thanks, [[Greg]] + +> There's a branch in [[git]] for the wikiwyg stuff, which includes +> the latest version I sucked in from TaylorKillian's svn repository before +> it went offline. Disapponted that nothing seems to be moving here. +> --[[Joey]] From 18d16309ce34f20ee475465cf1501976a084fcf7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:59:01 -0500 Subject: [PATCH 14/18] reword to put the more important info (page names) nearer the front --- templates/change.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/change.tmpl b/templates/change.tmpl index 16ef08a85..0a04ff136 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -2,7 +2,7 @@ [[meta authorurl=""""""]] -[[meta title="""update of 's """]] +[[meta title="""update of on """]]

Changed pages: From a72a620134c92396fac89a1868e5727160001ab7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:59:50 -0500 Subject: [PATCH 15/18] change wording --- templates/change.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/change.tmpl b/templates/change.tmpl index 0a04ff136..803e8130a 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -2,7 +2,7 @@ [[meta authorurl=""""""]] -[[meta title="""update of on """]] +[[meta title="""change to on """]]

Changed pages: From f1fcb5be9ca9e473a7a0c723871cad2c8e1493ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 23:05:48 -0500 Subject: [PATCH 16/18] * Page templates can now use CTIME to show when the page was created. --- IkiWiki/Render.pm | 1 + debian/changelog | 3 ++- doc/todo/ctime_on_blog_post_pages_.mdwn | 4 ++++ templates/page.tmpl | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 26f7de331..2682e13ae 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -126,6 +126,7 @@ sub genpage ($$) { #{{{ backlinks => $backlinks, more_backlinks => $more_backlinks, mtime => displaytime($pagemtime{$page}), + ctime => displaytime($pagectime{$page}), baseurl => baseurl($page), ); diff --git a/debian/changelog b/debian/changelog index 45a26e43a..8c610fe19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.31) unstable; urgency=low +ikiwiki (2.31) UNRELEASED; urgency=low [ Joey Hess ] * Revert preservation of input file modification times in output files, @@ -40,6 +40,7 @@ ikiwiki (2.31) unstable; urgency=low * Don't die if running with --getctime and rcs_getctime throws an error. There are several cases (recentchanges files, aggregated files) where some source files are not in revision control. + * Page templates can now use CTIME to show when the page was created. [ Josh Triplett ] * README.Debian: Mention user wikilists. diff --git a/doc/todo/ctime_on_blog_post_pages_.mdwn b/doc/todo/ctime_on_blog_post_pages_.mdwn index 4fd099d9d..d75dcd932 100644 --- a/doc/todo/ctime_on_blog_post_pages_.mdwn +++ b/doc/todo/ctime_on_blog_post_pages_.mdwn @@ -3,3 +3,7 @@ The user has to look at the history link to find when a blog item was posted. It would be nice if blog entry post pages could include the ctime. -- [[Edward_Betts]] + +> I've committed a change that adds a CTIME variable to page.tmpl. I left +> it commented out in the default template, since it seems like a bit of +> clutter to me. Good enough? --[[Joey]] diff --git a/templates/page.tmpl b/templates/page.tmpl index 3a1ac9ef8..249ee2efb 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -104,6 +104,7 @@ License:
Last edited +
From 1eeb683f1a2bfd602168a4db6dc47d53a207a085 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 Feb 2008 01:11:48 -0500 Subject: [PATCH 17/18] releasing version 2.31 --- debian/changelog | 4 +-- po/ikiwiki.pot | 80 ++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c610fe19..b21cdb441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.31) UNRELEASED; urgency=low +ikiwiki (2.31) unstable; urgency=low [ Joey Hess ] * Revert preservation of input file modification times in output files, @@ -45,7 +45,7 @@ ikiwiki (2.31) UNRELEASED; urgency=low [ Josh Triplett ] * README.Debian: Mention user wikilists. - -- Joey Hess Wed, 06 Feb 2008 15:10:20 -0500 + -- Joey Hess Sat, 09 Feb 2008 23:09:45 -0500 ikiwiki (2.30) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 62810a687..5fc00d93a 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: 2008-02-03 16:05-0500\n" +"POT-Creation-Date: 2008-02-09 23:08-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,89 +45,89 @@ msgstr "" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:384 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:242 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 -#: ../IkiWiki/Render.pm:175 +#: ../IkiWiki/Render.pm:176 msgid "discussion" msgstr "" -#: ../IkiWiki/CGI.pm:429 +#: ../IkiWiki/CGI.pm:431 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 +#: ../IkiWiki/CGI.pm:449 ../IkiWiki/CGI.pm:467 ../IkiWiki/CGI.pm:477 +#: ../IkiWiki/CGI.pm:511 ../IkiWiki/CGI.pm:555 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/CGI.pm:643 +#: ../IkiWiki/CGI.pm:644 msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:100 +#: ../IkiWiki/Plugin/aggregate.pm:101 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:127 +#: ../IkiWiki/Plugin/aggregate.pm:128 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:141 +#: ../IkiWiki/Plugin/aggregate.pm:142 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:143 +#: ../IkiWiki/Plugin/aggregate.pm:144 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:307 +#: ../IkiWiki/Plugin/aggregate.pm:309 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:314 +#: ../IkiWiki/Plugin/aggregate.pm:316 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:343 +#: ../IkiWiki/Plugin/aggregate.pm:345 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:347 +#: ../IkiWiki/Plugin/aggregate.pm:349 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:352 +#: ../IkiWiki/Plugin/aggregate.pm:354 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:367 +#: ../IkiWiki/Plugin/aggregate.pm:369 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:378 +#: ../IkiWiki/Plugin/aggregate.pm:380 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:384 +#: ../IkiWiki/Plugin/aggregate.pm:386 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:390 +#: ../IkiWiki/Plugin/aggregate.pm:392 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:464 +#: ../IkiWiki/Plugin/aggregate.pm:466 #, perl-format msgid "creating new page %s" msgstr "" @@ -200,29 +200,29 @@ msgstr "" msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:42 +#: ../IkiWiki/Plugin/inline.pm:44 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:135 +#: ../IkiWiki/Plugin/inline.pm:136 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:200 +#: ../IkiWiki/Plugin/inline.pm:201 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:216 +#: ../IkiWiki/Plugin/inline.pm:217 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 +#: ../IkiWiki/Plugin/inline.pm:250 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:463 +#: ../IkiWiki/Plugin/inline.pm:468 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -512,47 +512,47 @@ msgstr "" msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:274 ../IkiWiki/Render.pm:295 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:343 +#: ../IkiWiki/Render.pm:350 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:384 +#: ../IkiWiki/Render.pm:391 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:396 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:417 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:438 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:470 +#: ../IkiWiki/Render.pm:477 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:489 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:515 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -620,11 +620,11 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:127 +#: ../IkiWiki.pm:129 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 +#: ../IkiWiki.pm:198 ../IkiWiki.pm:199 msgid "Error" msgstr "" @@ -632,7 +632,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:750 +#: ../IkiWiki.pm:752 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" From 8b577726ab3768d50ca7d3fdef240e37fe046fc2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 Feb 2008 01:12:10 -0500 Subject: [PATCH 18/18] add news item for ikiwiki 2.31 --- doc/news/version_2.31.mdwn | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 doc/news/version_2.31.mdwn diff --git a/doc/news/version_2.31.mdwn b/doc/news/version_2.31.mdwn new file mode 100644 index 000000000..d81e443a2 --- /dev/null +++ b/doc/news/version_2.31.mdwn @@ -0,0 +1,45 @@ +ikiwiki 2.31 released with [[toggle text="these changes"]] +[[toggleable text=""" + * [ Joey Hess ] + * Revert preservation of input file modification times in output files, + since this leads to too many problems with web caching, especially with + inlined pages. Properly solving this would involve tracking every page + that contributes to a page's content and using the youngest of them all, + as well as special cases for things like the version plugin, and it's just + too complex to do. + * aggregate: Forking a child broke the one state that mattered: Forcing + the aggregating page to be rebuilt. Fix this. + * cgi hooks are now run before ikiwiki state is loaded. + * This allows locking the wiki before loading state, which avoids some + tricky locking code when saving a web edit. + * poll: This plugin turns out to have edited pages w/o doing any locking. + Oops. Convert it from a cgi to a sessioncgi hook, which will work + much better. + * recentchanges: Improve handling of links on the very static changes pages + by thunking to the CGI, which can redirect to the page, or allow it to be + created if it doesn't exist. + * recentchanges: Exipre all *.\_change pages, even if the directory + they're in has changed. + * aggregate: Lots of changes; aggregation can now run without locking the + wiki, and there is a separate aggregatelock to prevent multiple concurrent + aggregation runs. + * monotone changes by Brian May: + - On commits, replace "mtn sync" bidirectional with "mtn push" single + direction. No need to pull changes when doing a commit. mtn sync + is still called in rcs\_update. + - Support for viewing differences via patches using viewmtn. + * inline: When previewing, still call will\_render on rss/atom files, + just avoid actually writing the files. This is necessary because ikiwiki + saves state after a preview (in case it actually *did* write files), + and if will\_render isn't called its security checks will get upset + when the page is saved. Thanks to Edward Betts for his help tracking this + tricky bug down. + * inline: Add new `allowrss` and `allowatom` config options. These can be + used if you want a wiki that doesn't default to generating rss or atom + feeds, but that does allow them to be turned on for specific blogs. + * Don't die if running with --getctime and rcs\_getctime throws an error. + There are several cases (recentchanges files, aggregated files) + where some source files are not in revision control. + * Page templates can now use CTIME to show when the page was created. + * [ Josh Triplett ] + * README.Debian: Mention user wikilists."""]] \ No newline at end of file