diff options
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/CVS_backend.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/Raw_view_link.mdwn | 5 | ||||
| -rw-r--r-- | doc/todo/backlinks_result_is_lossy.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/generated_po_stuff_not_ignored_by_git.mdwn | 7 | ||||
| -rw-r--r-- | doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 7 | ||||
| -rw-r--r-- | doc/todo/pagestats_among_a_subset_of_pages.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/should_optimise_pagespecs.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/source_link.mdwn | 25 |
8 files changed, 51 insertions, 7 deletions
diff --git a/doc/todo/CVS_backend.mdwn b/doc/todo/CVS_backend.mdwn index f99d09b22..3c6527290 100644 --- a/doc/todo/CVS_backend.mdwn +++ b/doc/todo/CVS_backend.mdwn @@ -8,5 +8,7 @@ Original discussion: > >> No, although the existing svn backend could fairly esily be modified into >> a CVS backend, by someone who doesn't mind working with CVS. --[[Joey]] +>> +>>> Wouldn't say I don't mind, but I needed it. See [[plugins/contrib/cvs]]. --[[Schmonz]] [[!tag wishlist]] diff --git a/doc/todo/Raw_view_link.mdwn b/doc/todo/Raw_view_link.mdwn index 8f412fd09..fd64074c2 100644 --- a/doc/todo/Raw_view_link.mdwn +++ b/doc/todo/Raw_view_link.mdwn @@ -10,7 +10,8 @@ The configuration setting for Mercurial could be something like this: > Not that I'm opposed to the idea of a plugin that adds a Raw link > --[[Joey]] ->> [[todo/source_link]] does this via the CGI instead of delegating ->> to gitweb/etc. --[[smcv]] +>> In [[todo/source_link]], Will does this via the CGI instead of delegating +>> to gitweb/etc. I think Will's patch is a good approach, and have improved +>> on it a bit in a git branch. [[!tag wishlist]] diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn index 7306b1546..11b5fbcae 100644 --- a/doc/todo/backlinks_result_is_lossy.mdwn +++ b/doc/todo/backlinks_result_is_lossy.mdwn @@ -1,5 +1,5 @@ [[!tag patch patch/core]] -[[!template id=gitbranch branch=smcv/among author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]] IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a lossy transformation (to get it in the form that page templates want), making @@ -9,3 +9,5 @@ A commit on my `among` branch splits it into IkiWiki::backlink_pages (which returns the keys of $backlinks{$page}, and might be suitable for exporting) and IkiWiki::backlinks (which calls backlink_pages, then performs the same lossy transformation as before on the result). + +[[done]] --[[Joey]] diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn new file mode 100644 index 000000000..1d24fd385 --- /dev/null +++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn @@ -0,0 +1,7 @@ +[[!template id=gitbranch branch=smcv/gitignore author="[[smcv]]"]] +[[!tag patch]] + +The recent merge of the po branch didn't come with a .gitignore. +It eventually annoyed me enough to fix it :-) --[[smcv]] + +[[done]] diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn index db93a343c..bbde04f83 100644 --- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn @@ -1,4 +1,4 @@ -[[!template id=gitbranch branch=smcv/inline-pagenames author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/inline-pagenames author="[[smcv]]"]] A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds the following parameter to the [[ikiwiki/directive/inline]] directive: @@ -14,3 +14,8 @@ uses it internally (as it has already collected the pages in order). It could al be useful for other things, like [[todo/wikitrails]]. --[[smcv]] [[!tag plugins/inline]] + +> It's sort of a pity that a pagespec like "a or b or c" doesn't somehow +> match to (a, b, c) in that order, but I don't see how that would be +> generally possible. While this feels a bit like bloat and inline already +> has far too many parameters, I have [[merged|done]] it. --[[Joey]] diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn index 099d26665..fd15d6a42 100644 --- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn +++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn @@ -1,5 +1,5 @@ [[!tag patch plugins/pagestats]] -[[!template id=gitbranch branch=smcv/among author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]] My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that to provide pagestats for links from a subset of pages. From the docs included @@ -25,3 +25,5 @@ I use this on my tag pages on one site, with the following template: archive="yes" quick="yes" reverse="yes" timeformat="%x"]] --[[smcv]] + +> [[merged|done]] thanks --[[Joey]] diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index db7a017c4..3ccef62fe 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -79,7 +79,7 @@ I can think about reducung the size of my wiki source and making it available on > > --[[Joey]] -[[!template id=gitbranch branch=smcv/optimize-depends author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/optimize-depends author="[[smcv]]"]] >> I've been looking at optimizing ikiwiki for a site using >> [[plugins/contrib/album]] (which produces a lot of pages) and it seems @@ -98,7 +98,7 @@ I can think about reducung the size of my wiki source and making it available on >>>> I haven't actually deleted it), because the "or" operation is now done in >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]] -[[!template id=gitbranch branch=smcv/remove-pagespec-merge author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/remove-pagespec-merge author="[[smcv]]"]] >>>>> I've now added a patch to the end of that branch that deletes >>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn index a7203d06c..0c639a314 100644 --- a/doc/todo/source_link.mdwn +++ b/doc/todo/source_link.mdwn @@ -4,11 +4,36 @@ How about a direct link from the page header to the source of the latest version I just implemented this. There is one [[patch]] to the default page template, and a new plugin. -- [[Will]] +All of this code is licensed under the GPLv2+. -- [[Will]] + > The use of sessioncgi here seems undesirable: on wikis where anonymity is > not allowed, you'll be asked to log in. Couldn't you achieve the same thing > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does? > --[[smcv]] +[[!template id=gitbranch branch=smcv/ready/getsource + author="[[Will]]/[[smcv]]"]] + +>> I've applied the patch below in a git branch, fixed my earlier criticism, +>> and also fixed a couple of other issues I noticed: +>> +>> * missing pages could be presented better as a real 404 page +>> * the default Content-type should probably be UTF-8 since the rest of +>> IkiWiki tends to assume that +>> * emitting attachments (images, etc.) as text/plain isn't going to work :-) +>> +>> Any opinions on my branch? I think it's ready for merge, if Joey approves. +>> +>> --[[smcv]] + +>>> I need a copyright&license statement, so debian/copyright can be updated for +>>> the plugin, before I can merge this. Otherwise ready. --[[Joey]] + +>>> That looks like a nice set of fixes. One more that might be worthwhile: instead of reading the page source into a var, and then writing it out later, it might be nice to just +>>> `print readfile(srcfile(pagesources{$page}));` at the appropriate point. -- [[Will]] + +>>>> OK, I've committed that. --[[smcv]] + ---- diff --git a/templates/page.tmpl b/templates/page.tmpl |