From 63e316f3621618f3b190da527fbb62ca5dad45d9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 22:11:54 -0500 Subject: * 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. --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') 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 -- cgit v1.2.3 From e183aa198f3aa35490b053700b28716b43bed199 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 8 Feb 2008 17:58:43 -0800 Subject: Use plural "wikis" for consistency --- debian/README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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. -- cgit v1.2.3 From 6b35ec682b8d3c571ab17cbbd9d6156ba5ba9047 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 8 Feb 2008 18:01:03 -0800 Subject: Mention user wikilists in README.Debian --- debian/README.Debian | 5 +++++ debian/changelog | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'debian') 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 -- cgit v1.2.3 From f1fcb5be9ca9e473a7a0c723871cad2c8e1493ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 23:05:48 -0500 Subject: * 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(-) (limited to 'debian') 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 +
-- cgit v1.2.3 From 1eeb683f1a2bfd602168a4db6dc47d53a207a085 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 Feb 2008 01:11:48 -0500 Subject: releasing version 2.31 --- debian/changelog | 4 +-- po/ikiwiki.pot | 80 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'debian') 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 "" -- cgit v1.2.3