From ed16e5fd9fdf5a7e3716d951731868414e13563c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Feb 2008 15:18:26 -0500 Subject: web commit by tschwinge: Typo and some more. --- doc/git.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.2.3 From 830152d2a970b3c301f42c4fb81b04e96e3b018f Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 6 Feb 2008 21:40:23 -0800 Subject: Update status of prefix-directives branch. --- doc/git.mdwn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') 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 -- cgit v1.2.3 From 5296ab065d2503ff023320bee4927f70f6aa219c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 07:05:51 -0500 Subject: 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(-) (limited to 'doc') 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"]] -- cgit v1.2.3 From d599a5d3390e91a1d7a8e8d1867902ea9047893e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 17:01:36 -0500 Subject: web commit by greg --- doc/todo/wikiwyg/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') 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]] -- cgit v1.2.3 From 4084c9a655b638571d4ff1f8119b4ead2c182bc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 17:04:24 -0500 Subject: web commit by greg --- doc/todo/wikiwyg/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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]] -- cgit v1.2.3 From d78e213371d800c5fe6a0aca83adda132cefd047 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 18:49:39 -0500 Subject: 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 (limited to 'doc') 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. -- cgit v1.2.3 From 35547272c66880db73ac2791ac6ce8d58752ebad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2008 09:03:51 -0500 Subject: 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 (limited to 'doc') 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 -- cgit v1.2.3 From 825847af95f42176f2e3803cf1ba64876b9d6279 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2008 13:52:31 -0500 Subject: reply --- doc/bugs/img_plugin_causes_taint_failure.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') 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]] -- cgit v1.2.3 From 6cd7cb9d87441e42b266eda8bd87d4f19c15ad3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:54:54 -0500 Subject: 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 (limited to 'doc') 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. -- cgit v1.2.3 From f16b3f17c0919b9a40352680a88781a44fee680f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Feb 2008 22:56:29 -0500 Subject: note that's there's a git branch for this --- doc/todo/wikiwyg/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') 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]] -- 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 'doc') 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 8b577726ab3768d50ca7d3fdef240e37fe046fc2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 Feb 2008 01:12:10 -0500 Subject: 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 (limited to 'doc') 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 -- cgit v1.2.3