diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/po:_double_commits_of_po_files.mdwn | 3 | ||||
| -rw-r--r-- | doc/bugs/po:_markdown_link_parse_bug.mdwn | 5 | ||||
| -rw-r--r-- | doc/bugs/po:_po_files_instead_of_html_files.mdwn | 6 | ||||
| -rw-r--r-- | doc/git.mdwn | 2 | ||||
| -rw-r--r-- | doc/rcs.mdwn | 2 | ||||
| -rw-r--r-- | doc/style.css | 3 | ||||
| -rw-r--r-- | doc/todo/avatar.mdwn | 40 | ||||
| -rw-r--r-- | doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 11 |
8 files changed, 34 insertions, 38 deletions
diff --git a/doc/bugs/po:_double_commits_of_po_files.mdwn b/doc/bugs/po:_double_commits_of_po_files.mdwn index a871785be..2f3015e2b 100644 --- a/doc/bugs/po:_double_commits_of_po_files.mdwn +++ b/doc/bugs/po:_double_commits_of_po_files.mdwn @@ -17,3 +17,6 @@ update. --[[Joey]] >> their mailing-list: >> [post archive](http://lists.alioth.debian.org/pipermail/po4a-devel/2010-July/001897.html). >> --[[intrigeri]] + +>>> Seems to me Debian Squeeze's po4a does not expose this bug anymore +>>> => [[done]]. --[[intrigeri]] diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn index 10715001c..98da7fd24 100644 --- a/doc/bugs/po:_markdown_link_parse_bug.mdwn +++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn @@ -12,3 +12,8 @@ file: "\"Ikiwiki hosting\") when I signed up." --[[Joey]] + +> I cannot reproduce this on my Squeeze system with ikiwiki Git code; +> both the page in the master language and translation pages perfectly +> display the link (and tooltip) in my testing environment. Were you +> using an oldest po4a, such as Lenny's one? --[[intrigeri]] diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 8238f50df..33b8982ba 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -20,3 +20,9 @@ When i click on "templates.fr", i get the po.file instead of html. }, # slave languages (PO files) po_slave_languages => [qw{fr|Français}], + +>>> I've never found any `.po` file in the destination directory on +>>> any of my PO-enabled ikiwiki instances. Without more information, +>>> there's nothing I can do: the config snippet pasted above is more +>>> or less the example one and does not allow me to reproduce the +>>> bug. --[[intrigeri]] diff --git a/doc/git.mdwn b/doc/git.mdwn index 2a2d10526..85323e645 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -68,6 +68,8 @@ think about merging them. This is recommended. :-) * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` * [[wtk]] `git://github.com/wking/ikiwiki.git` * [[sunny256]] `git://github.com/sunny256/ikiwiki.git` +* [[fmarier]] `git://gitorious.org/~fmarier/ikiwiki/fmarier-sandbox.git` +* [[levitte]] `git://github.com/levitte/ikiwiki.git` ## branches diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 06af9807c..4d75d6325 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -22,7 +22,7 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_remove` |yes |yes |yes |yes |no |yes |no |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes `rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow -`rcs_getmtime` |fast |slow |slow |no |no |no |no |no +`rcs_getmtime` |fast |slow |slow |slow |no |no |no |no `rcs_preprevert` |yes |no |no |no |no |no |no |no `rcs_revert` |yes |no |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no diff --git a/doc/style.css b/doc/style.css index fa413cf24..fcf39be6a 100644 --- a/doc/style.css +++ b/doc/style.css @@ -247,6 +247,9 @@ span.color { .comment-subject { font-weight: bold; } +.comment-avatar { + float: right; +} .comment { border: 1px solid #aaa; padding: 3px; diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn index 91f924fa1..7fa3762da 100644 --- a/doc/todo/avatar.mdwn +++ b/doc/todo/avatar.mdwn @@ -3,6 +3,9 @@ It would be nice if ikiwiki, particularly [[plugins/comments]] (but also, ideally, recentchanges) supported user avatar icons. +> Update: Done for comments, but not for anything else, and the directive +> below would be a nice addition. --[[Joey]] + Idea is to add a directive that displays a small avatar image for a user. Pass it a user's the email address, openid, username, or the md5 hash of their email address: @@ -26,40 +29,3 @@ not have a gravatar, uses a cute auto-generated "wavatar" avatar. The `gravitar_options` setting in the setup file can be used to specify additional options to pass. So for example if you want to use wavatars everywhere, set it to "default=wavatar". - -The avatars are provided by various sites. For email addresses, it uses a -[gravatar](http://gravatar.com/). For a wiki username, the -user's email address is looked up and the gravatar for that user is -displayed. (Of course, the user has to have filled in their email address -on their Preferences page for that to work. Also, when the user changes -their email address in Preferences, the gravatar won't change until the -wiki is rebuilt.) - -For openid, openavatar sucked and is now dead. So we need to use an email -address instead, I guess. Problem is that the email address of a given -openid is only known when that user is logged in and making a change. -And we don't want to leak an openid user's email into a page either. -Hmm. Suppose the gravatar hash could be calculated from the email address -and embedded instead of the openid? That would work for comments, -but not if the directive were used elsewhere. - -Or, for openid, could use <http://paulisageek.com/openidavatar>. Which -works fine, but users are not likely to figure out what they need to do to -get an avatar associated with their openid. - ---- - -Alternative, not overdesigned approach: - -Modify comments plugin to have an option to display avatars. - -When posting a comment, fill in the avatarhash field in the template. -The hash is calculated from the user's email address. If the user's email -is not known, skip it. - -End. :P - ---- - -[libravatar](https://launchpad.net/libravatar) is a federated avatar -system. Young but might be the right way to get avatars eventually. diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index c164cf54a..baad063ef 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -77,9 +77,20 @@ and decided this time it was really needed to implement this feature. >>>>> rewrite warning) mirrorlist branch. Please review, please pull. >>>>> --[[intrigeri]] +>>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and +>>>>>> checked it still works properly. --[[intrigeri]] + >>>>> concerning goto/cgiurl, what about having that as the default in >>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and >>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases? >>>>> that would keep typical installation with a clutter-less configuration, >>>>> and support more individual setups too. >>>>> --[[chrysn]] + +>>>>>> I would not mind. On the other hand Joey was concerned about +>>>>>> cluttering the code to support edge cases, which I fully +>>>>>> understand. The case you (chrysn) are describing being even +>>>>>> more specific than the one I was initially talking of, I think +>>>>>> this should not block the merge of the branch I have been +>>>>>> proposing. Support for the usecase you are suggesting can +>>>>>> always be added later if needed. --[[intrigeri]] |