Merge branch 'master' into cvs
Amitai Schlair
commit
12fd902fb1
10
IkiWiki.pm
10
IkiWiki.pm
|
|
@ -2647,8 +2647,14 @@ sub match_link ($$;@) {
|
|||
}
|
||||
|
||||
sub match_backlink ($$;@) {
|
||||
my $ret=match_link($_[1], $_[0], @_);
|
||||
$ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
|
||||
my $page=shift;
|
||||
my $testpage=shift;
|
||||
my %params=@_;
|
||||
if ($testpage eq '.') {
|
||||
$testpage = $params{'location'}
|
||||
}
|
||||
my $ret=match_link($testpage, $page, @_);
|
||||
$ret->influences($testpage => $IkiWiki::DEPEND_LINKS);
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -272,6 +272,7 @@ sub attachments_save {
|
|||
my @attachments;
|
||||
my $dir=attachment_holding_location($form->field('page'));
|
||||
foreach my $filename (glob("$dir/*")) {
|
||||
$filename=Encode::decode_utf8($filename);
|
||||
next unless -f $filename;
|
||||
my $destdir=$config{srcdir}."/".
|
||||
linkpage(IkiWiki::possibly_foolish_untaint(
|
||||
|
|
@ -345,6 +346,7 @@ sub attachment_list ($) {
|
|||
my $dir=attachment_holding_location($page);
|
||||
my $heldmsg=gettext("this attachment is not yet saved");
|
||||
foreach my $file (glob("$dir/*")) {
|
||||
$file=Encode::decode_utf8($file);
|
||||
next unless -f $file;
|
||||
my $base=IkiWiki::basename($file);
|
||||
my $f=$loc.$base;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,13 @@ sub getsetup () {
|
|||
safe => 1,
|
||||
rebuild => 1,
|
||||
},
|
||||
nodiscount => {
|
||||
type => "boolean",
|
||||
example => 0,
|
||||
description => "disable use of markdown discount?",
|
||||
safe => 1,
|
||||
rebuild => 1,
|
||||
},
|
||||
}
|
||||
|
||||
my $markdown_sub;
|
||||
|
|
@ -50,14 +57,22 @@ sub htmlize (@) {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (! defined $markdown_sub) {
|
||||
if (! defined $markdown_sub &&
|
||||
exists $config{nodiscount} && ! $config{nodiscount}) {
|
||||
eval q{use Text::Markdown::Discount};
|
||||
if (! $@) {
|
||||
$markdown_sub=sub {
|
||||
my $t=shift;
|
||||
# Workaround for discount binding bug
|
||||
# https://rt.cpan.org/Ticket/Display.html?id=73657
|
||||
return "" if $_[0]=~/^\s*$/;
|
||||
Text::Markdown::Discount::markdown(@_);
|
||||
return "" if $t=~/^\s*$/;
|
||||
# Workaround for discount's eliding
|
||||
# of <style> blocks.
|
||||
# https://rt.cpan.org/Ticket/Display.html?id=74016
|
||||
$t=~s/<style/<elyts/ig;
|
||||
my $r=Text::Markdown::Discount::markdown($t);
|
||||
$r=~s/<elyts/<style/ig;
|
||||
return $r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,29 @@
|
|||
ikiwiki (3.20111230) UNRELEASED; urgency=low
|
||||
ikiwiki (3.20120116) UNRELEASED; urgency=low
|
||||
|
||||
* mdwn: Added nodiscount setting, which can be used to avoid using the
|
||||
markdown discount engine, when maximum compatability is needed.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 16 Jan 2012 13:41:14 -0400
|
||||
|
||||
ikiwiki (3.20120115) unstable; urgency=low
|
||||
|
||||
* Make backlink(.) work. Thanks, Giuseppe Bilotta.
|
||||
* mdwn: Workaround discount's eliding of <style> blocks.
|
||||
* attachment: Fix utf-8 display bug.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Sun, 15 Jan 2012 16:19:25 -0400
|
||||
|
||||
ikiwiki (3.20120109) unstable; urgency=low
|
||||
|
||||
* mdwn: Can use the discount markdown library, via the
|
||||
Text::Markdown::Discount perl module. This is preferred if available
|
||||
since it's the fastest currently supported markdown library, speeding up
|
||||
ikiwiki's rendering by a factor of 40.
|
||||
ikiwiki's markdown rendering by a factor of 40.
|
||||
(However, when multimarkdown is enabled, Text::Markdown::Multimarkdown
|
||||
is still used.)
|
||||
* On Debian, depend on libtext-markdown-discount.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Sun, 01 Jan 2012 16:22:24 -0400
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 09 Jan 2012 11:49:14 -0400
|
||||
|
||||
ikiwiki (3.20111229) unstable; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
I have ikiwiki_3.20111229 installed on Debian Squeeze (Perl 5.10.1, UTF-8
|
||||
locale). The attachment plugin mangles UTF8-encoded attachment filenames if
|
||||
the name contains multibyte characters, e.g. "lää.png" becomes "lää.png".
|
||||
Apparently glob returns byte strings which are subject to implicit
|
||||
upgrading when concatenated with Perl strings. The following patch fixes
|
||||
the problem for me:
|
||||
|
||||
----
|
||||
|
||||
diff -r -U 1 a/attachment.pm b/attachment.pm
|
||||
--- a/attachment.pm 2012-01-13 23:07:29.000000000 +0200
|
||||
+++ b/attachment.pm 2012-01-13 23:33:07.000000000 +0200
|
||||
@@ -274,2 +274,3 @@
|
||||
foreach my $filename (glob("$dir/*")) {
|
||||
+ $filename=Encode::decode_utf8($filename);
|
||||
next unless -f $filename;
|
||||
@@ -347,2 +348,3 @@
|
||||
foreach my $file (glob("$dir/*")) {
|
||||
+ $file = Encode::decode_utf8($file);
|
||||
next unless -f $file;
|
||||
|
||||
> Seems it only mangled display of the just-uploaded attachment's filename,
|
||||
> the attachment was otherwise saved to disk with a valid UTF-8 name, and
|
||||
> doing other stuff with it also was ok. In any case, I applied your patch,
|
||||
> thanks. [[done]] --[[Joey]]
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
It seems `backlink(.)` doesn't work, that is, it doesn't match pages linked
|
||||
to from the current page.
|
||||
|
||||
If I have two test pages, `foo`, which links to `bar`, then (on the `foo`
|
||||
page):
|
||||
|
||||
* backlink(foo) lists 'bar'
|
||||
* backlink(.) lists nothing
|
||||
|
||||
tested with 3.20120109.
|
||||
|
||||
— [[Jon]]
|
||||
|
||||
> The attached patch should fix it:
|
||||
|
||||
>> [[applied|done]] thanks --[[Joey]]
|
||||
|
||||
From 30512ac5f6a724bafb1095ab246e0648999f7b6c Mon Sep 17 00:00:00 2001
|
||||
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
|
||||
Date: Fri, 13 Jan 2012 11:02:11 +0100
|
||||
Subject: [PATCH] backlink(.) should behave like backlink(<current page>)
|
||||
|
||||
Since commit c4d4cad3befbbd444d094cbeb0b6ebba3910a025, the single dot in
|
||||
a pagespec can be used to mean the current page. While this worked
|
||||
correctly in link() it didn't work in backlink(). Fix this by explicitly
|
||||
checking the testpage in backlink against . and replacing it with the
|
||||
current location if necessary.
|
||||
---
|
||||
IkiWiki.pm | 10 ++++++++--
|
||||
1 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/IkiWiki.pm b/IkiWiki.pm
|
||||
index 08e242a..bc56501 100644
|
||||
--- a/IkiWiki.pm
|
||||
+++ b/IkiWiki.pm
|
||||
@@ -2647,8 +2647,14 @@ sub match_link ($$;@) {
|
||||
}
|
||||
|
||||
sub match_backlink ($$;@) {
|
||||
- my $ret=match_link($_[1], $_[0], @_);
|
||||
- $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
|
||||
+ my $page=shift;
|
||||
+ my $testpage=shift;
|
||||
+ my %params=@_;
|
||||
+ if ($testpage eq '.') {
|
||||
+ $testpage = $params{'location'}
|
||||
+ }
|
||||
+ my $ret=match_link($testpage, $page, @_);
|
||||
+ $ret->influences($testpage => $IkiWiki::DEPEND_LINKS);
|
||||
return $ret;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.8.rc2.253.gdbf3
|
||||
|
||||
|
||||
> (you need to re-make IkiWiki for it to work)
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
phil hands is kindly hosting rhombus-tech.net on an h-branchable ikiwiki. openid has been enabled, for convenience. unfortunately... :/etc/ikiwiki-hosting/ikiwiki-hosting.conf has an openid realm of "http://*.hands.com" which is kinda important (i assume) for security reasons. however this conflicts with what openid requires. openid logins are now specifying the realm of http://*.hands.com which of course doesn't match with http://rhombus-tech.net - it all goes pear-shaped from there.
|
||||
|
||||
any ideas? thanks folks.
|
||||
|
|
@ -78,3 +78,9 @@ Brian May
|
|||
>>>>> explicitly removed", so if ikiwiki can preferentially find that
|
||||
>>>>> installed, even with the above commit, `openid` won't be able to
|
||||
>>>>> traverse a proxy. --[[schmonz]]
|
||||
|
||||
[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
|
||||
|
||||
>>>>> I bollixed up my git, recloned, and reapplied the diffs, so
|
||||
>>>>> that commit won't exist anymore. My proxy-related changes are
|
||||
>>>>> now on a branch. --[[schmonz]]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
When an `ikiwiki` instance is holding a lock, a web user clicking on "add comment" (for example) will have to wait for the lock to be released. However, all they are then presented with is a web form. Perhaps CGI requests that are read-only (such as generating a comment form, or perhaps certain types of edits) should ignore locks? Of course, I'd understand that the submission would need to wait for a lock. — [[Jon]]
|
||||
|
||||
> Ikiwiki has what I think of as the Big Wiki Lock (remembering the "Big
|
||||
> Kernel Lock"). It takes the exclusive lock before loading any state,
|
||||
> to ensure that any changes to that state are made safely.
|
||||
>
|
||||
> A few CGI actions that don't need that info loaded do avoid taking the
|
||||
> lock.
|
||||
>
|
||||
> In the case of showing the comment form, the comments
|
||||
> plugin needs CGI session information to be loaded, so it can check if
|
||||
> the user is logged in, and so it can add XSRF prevention tokens based on
|
||||
> the session ID. (Actually, it might be possible to rely on
|
||||
> `CGI::Session`'s own locking of the sessions file, and have a hook that
|
||||
> runs with a session but before the indexdb is loaded.)
|
||||
>
|
||||
> But, the comment form also needs to load the indexdb, in order to call
|
||||
> `check_canedit`, which matches a pagespec, which can need to look things
|
||||
> up in the indexdb. (Though the pagespecs that can do that are unlikely
|
||||
> to be relevant when posting a comment.)
|
||||
>
|
||||
> I've thought about trying to get rid of the Big Wiki Lock from time to
|
||||
> time. It's difficult though; if two ikiwikis are both making changes
|
||||
> to the stored state, it's hard to see a way to reconcile them. (There
|
||||
> could be a daemon that all changes are fed thru using a protocol, but
|
||||
> that's really complicated, and it'd almost be better to have a single
|
||||
> daemon that just runs ikiwiki; a major architectural change.)
|
||||
>
|
||||
> One way that *almost* seems it could work is to have a entry path
|
||||
> that loads everything read-only, without a lock. And then in read-only
|
||||
> mode, `saveindex` would be an error to run. However, both the commenting
|
||||
> code and the page edit code currently have the same entry path for
|
||||
> drawing the form as is used for handling the posted form, so they would
|
||||
> need to be adapted to separate that into two code paths. --[[Joey]]
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
Unfortunately debian stable / squeeze repos are still on version 3.20100815.7
|
||||
|
||||
Do you think squeeze will update to a newer version soon? I am lacking support of the gallery plugin and 1 more that I forgot right now ;)
|
||||
|
||||
Is everyone else upgrading by directly installing via dpkg (no updates, but yeah)?
|
||||
|
||||
Regards
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joey.kitenet.net/"
|
||||
nickname="joey"
|
||||
subject="comment 1"
|
||||
date="2012-01-16T14:52:22Z"
|
||||
content="""
|
||||
Nothing wrong with 3.20100815.7 unless you need newer features.
|
||||
|
||||
At Branchable we run Debian stable and backport the current ikiwiki to run on it. This is quite easy to do, it just builds and works. (Edit debian/control and s/markdown-discount/markdown/)
|
||||
|
||||
It's probably time someone released a backport. I have historically not done that myself though.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawndsaC4GaIBw49WNdbk2Faqfm_mrtQgul8"
|
||||
nickname="Christian"
|
||||
subject="thats cool"
|
||||
date="2012-01-16T15:31:22Z"
|
||||
content="""
|
||||
thanks
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawndsaC4GaIBw49WNdbk2Faqfm_mrtQgul8"
|
||||
nickname="Christian"
|
||||
subject="Great! It worked!"
|
||||
date="2012-01-17T01:18:06Z"
|
||||
content="""
|
||||
Thanks Joey, also for the replacement hint, had to install one or two dependencies and it worked like a charm. Version from the day before yesterday now. (Awesome!)
|
||||
|
||||
I have not upgraded the mypage.setup file, yet. I included \"headinganchors\" which does not seem to work right now. The page compiles without errors but contains no anchors when viewed in browser. Hm..
|
||||
|
||||
Great job thanks again!
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawndsaC4GaIBw49WNdbk2Faqfm_mrtQgul8"
|
||||
nickname="Christian"
|
||||
subject="updating setup file"
|
||||
date="2012-01-17T01:30:32Z"
|
||||
content="""
|
||||
just for the record - I created a new wiki and the setup file is then automatically in YAML format. I think I am going to just transfer the settings from the \"old\" setup file to the new one.
|
||||
|
||||
If anyone has an idea why the headinganchors don't work, pls let me know.
|
||||
|
||||
As for the rest - insanely cool piece of software - great
|
||||
"""]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
How to allow .markdown and .md (at the same time) as valid extensions for source files? The default is .mdwn.
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Well, I simply don't see it.
|
||||
I would like to change the "account registration" page, where it says user, password, repeat password, Account Creation Password, E-Mail.
|
||||
|
||||
I simply want it to ask a question like "Who's your daddy" or "What are we all working on" instead of "Account creation password".
|
||||
|
||||
I already grepped through the files of the source which I compiled ikiwiki from - I just can't find it. I'm a noob in cgi, it seems to be somewhat in there, but that could also be totally wrong.
|
||||
|
||||
Can you tell me where to look?
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
I followed instructions at
|
||||
|
||||
http://ikiwiki.info/plugins/po/
|
||||
|
||||
and added to `configfile`
|
||||
|
||||
po_master_language => 'en|English',
|
||||
po_slave_languages => [ 'zh|Chinese' ],
|
||||
po_translatable_pages => '(* and !*/Discussion and !blog/*/comment_*)',
|
||||
po_link_to => 'current'
|
||||
|
||||
and did
|
||||
|
||||
ikiwiki --setup configfile
|
||||
|
||||
But I don't seem to see any change in the newly built site.
|
||||
|
||||
How do I actually use po to create translation pages?
|
||||
|
||||
1) I have existing pages that's in English. How do I add translated versions of some of those pages in the slave language?
|
||||
|
||||
2) How do I add new pages with the primary language version and alternative versions in slave languages?
|
||||
|
||||
The documentation of po is not explicit with what are the concrete steps.
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
Since ikiwiki doesn't have much of a chance of working in windows, how about we compromise by making an offline ikiwiki editor for Windows? In fact, it might be advantageous to use it in Linux, too...
|
||||
|
||||
It should be very simple: It would enter the source wiki and show the Markdown code by default, but would have an option to preview your page in another tab.
|
||||
|
||||
Basic features:
|
||||
|
||||
* wikilinks, maps, images, inlinepages, and other basic functions should all work in the preview
|
||||
* perhaps use local.css to format preview
|
||||
* See the DVCS history with diffs and all
|
||||
* have a discussion tab to easily see what other people have said about the page
|
||||
|
||||
If we want to add some more bells and whistles, maybe we could throw in some buttons to insert markdown formatting (like in forums, mediawiki, or RES).
|
||||
|
||||
Any thoughts on this?
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://kerravonsen.dreamwidth.org/"
|
||||
ip="202.173.183.92"
|
||||
subject="comment 1"
|
||||
date="2012-01-13T22:32:47Z"
|
||||
content="""
|
||||
It would probably be quite complex to write, and difficult to maintain. I don't think much of your chances of getting someone to write it. If you want to write it yourself, have fun doing so!
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ"
|
||||
nickname="Lawrence"
|
||||
subject="comment 2"
|
||||
date="2012-01-14T03:14:38Z"
|
||||
content="""
|
||||
Eh, ok, lol. I know that implementing most of the wiki features over again could be difficult, and so would a Git diff reader, but it shouldn't be that hard to get Wikilinking or a markdown previewer working.
|
||||
|
||||
Could you point out some specific problems of this approach, so that it would help me out to do so?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ"
|
||||
nickname="Lawrence"
|
||||
subject="comment 3"
|
||||
date="2012-01-14T17:41:52Z"
|
||||
content="""
|
||||
Like, there's already a whole host of Markdown previewer apps that are pretty good. [Here's a](http://www.macworld.com/article/164744/2012/01/marked_excels_at_previewing_markdown_and_html_documents.html) popular one on Mac, and there are many more...
|
||||
|
||||
There's also a plugin for Emacs that does so, and even resolves wikilinks (in some way..).
|
||||
|
||||
But I'd have to say that I probably made a misleading title, WYSIWYG would probably be low on the list of needed features. And I'm just dumping an idea I have here in case anyone has any suggestions or comments, I'll probably do it myself in my free time.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawndsaC4GaIBw49WNdbk2Faqfm_mrtQgul8"
|
||||
nickname="Christian"
|
||||
subject="just my 2 cents"
|
||||
date="2012-01-17T11:10:09Z"
|
||||
content="""
|
||||
why?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
Hi,
|
||||
|
||||
unfortunately, openID is not working at my wiki. I get the error
|
||||
|
||||
no_identity_server: The provided URL doesn't declare its OpenID identity server.
|
||||
|
||||
I think this is related to the ID of my wiki not being defined right. Where and how do I have to define it? I have used the !meta openid as described on ikiwiki.info (are there two quotes at the end where only one should be (joeyh example) on index.html.
|
||||
|
||||
Somehow I think its not transferred right to the openID provider of the user upon login.
|
||||
|
||||
thanks in advance
|
||||
chris
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawndsaC4GaIBw49WNdbk2Faqfm_mrtQgul8"
|
||||
nickname="Christian"
|
||||
subject="apache module?"
|
||||
date="2012-01-18T15:40:57Z"
|
||||
content="""
|
||||
Do I have to install the openid apache module, load it, and configure apache to use my openid? Except that in my case I can get it from the package system, there is a description <a href=\"http://findingscience.com/mod_auth_openid/\">here</a> what I mean. I got a feeling that's it.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
How can I add a button to each wiki page which launches an external application or script with the markdown code of the current page as input?
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Why doesn't the [[plugins/search]] plugin index attachments? are there any
|
||||
technical reasons for not including this feature/option? (besides increased
|
||||
processing time, and depending from external programs.)
|
||||
|
||||
One could check for all non-mdwn files, convert them to text, if such thing is
|
||||
possible, and add them as documents; I guess `needsbuild` would be a good site
|
||||
for that.
|
||||
|
||||
--[[jerojasro]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joey.kitenet.net/"
|
||||
nickname="joey"
|
||||
subject="comment 1"
|
||||
date="2012-01-13T17:46:49Z"
|
||||
content="""
|
||||
I don't think there are really any reasons, other than noone having done it.
|
||||
|
||||
Although it is worth noting that using additional libraries/programs to eg, pull exif data and comments out of image files and make it searchable, does potentially increase ikiwiki's attack surface.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
[[!comment format=mdwn
|
||||
username="jerojasro"
|
||||
nickname="jerojasro"
|
||||
subject="RE: comment 1"
|
||||
date="2012-01-15T23:49:49Z"
|
||||
content="""
|
||||
I've modified the plugin adding the possibility of indexing attachments. Only
|
||||
PDF attachments for now, but support for other filetypes should be real easy to add.
|
||||
|
||||
The changes to `IkiWiki/Plugin/search.pm` are available at
|
||||
<http://git.devnull.li/ikiwiki.git>, in the `srchatt` branch.
|
||||
|
||||
I have a small question about filenames and security: I'm using `qx` to execute
|
||||
the program that extracts the text from the PDF files, but `qx` executes a
|
||||
whole string, and passes it not to the program I want to run, but to a shell,
|
||||
so it is possible (I think) to craft a filename that, in a shell, expands to
|
||||
something nasty.
|
||||
|
||||
How do the Perl/IkiWiki experts suggest to handle these potentially unsafe
|
||||
filenames? I've thought of the following options:
|
||||
|
||||
* Running the text extractor program using `Proc::Safe`. I could not find a
|
||||
Debian package for it, and I'd rather avoid adding another dependency to
|
||||
IkiWiki.
|
||||
* Running the text extractor program as suggested in the `perlipc` document,
|
||||
using `fork` + `exec`.
|
||||
|
||||
I haven't done any of those because I'd like to check if there are any helpers
|
||||
in IkiWiki to do this. Perhaps the `IkiWiki::possibly_foolish_untaint` function
|
||||
does it? (I didn't really understand what it does...)
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawljSQThLsc4vHz0jw1aSR74Dj9K5J_NKqk"
|
||||
nickname="Michal"
|
||||
subject="comment 3"
|
||||
date="2012-01-17T16:45:37Z"
|
||||
content="""
|
||||
Maybe it could be sufficient to run a command similar to
|
||||
|
||||
omindex --db /path/to/.ikiwiki/xapian/default --url http://webserver/ikiwiki /path/to/public_html
|
||||
"""]]
|
||||
|
|
@ -78,6 +78,7 @@ Projects & Organizations
|
|||
* [The Progress Linux OS wiki](http://wiki.progress-linux.org/)
|
||||
* [Oxford Computer Society](http://www.ox.compsoc.net/)
|
||||
* [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/)
|
||||
* [Arcada Project](http://arcadaproject.org/)
|
||||
|
||||
Personal sites and blogs
|
||||
========================
|
||||
|
|
|
|||
|
|
@ -349,3 +349,10 @@ I've attempted to mergeably patch these in my git, commit
|
|||
5c177c96ac98b24aaa0613ca241fb113f1b32c55.
|
||||
|
||||
--[[schmonz]]
|
||||
|
||||
-----
|
||||
|
||||
[[!template id=gitbranch branch=schmonz/portability author="[[schmonz]]"]]
|
||||
|
||||
My git was in a screwy state so I started over. These changes are
|
||||
now on a branch. --[[schmonz]]
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
ikiwiki 3.20110715 released with [[!toggle text="these changes"]]
|
||||
[[!toggleable text="""
|
||||
* rename: Fix logic error that broke renaming pages when the attachment
|
||||
plugin was disabled.
|
||||
* rename: Fix logic error that bypassed the usual pagespec checks."""]]
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
ikiwiki 3.20110905 released with [[!toggle text="these changes"]]
|
||||
[[!toggleable text="""
|
||||
* mercurial: Openid nicknames are now used when committing. (Daniel Andersson)
|
||||
* mercurial: Implement rcs\_commit\_staged so comments, attachments, etc
|
||||
can be used. (Daniel Andersson)
|
||||
* mercurial: Implement rcs\_rename, rcs\_remove. (Daniel Andersson)
|
||||
* mercurial: Fix viewing of a diff containing non-utf8 changes.
|
||||
(Daniel Andersson)
|
||||
* mercurial: Make both rcs\_getctime and rcs\_getmtime fast. (Daniel Andersson)
|
||||
* mercurial: Implement rcs\_diff. (Daniel Andersson)
|
||||
* po: Add `LANG\_CODE` and `LANG\_NAME` template variables. (intrigeri)
|
||||
* Fix typo in Danish translation of shortcuts page that caused exponential
|
||||
regexp blowup.
|
||||
* Fix escaping of html entities in permalinks.
|
||||
* Fix escaping of html entities in tag names.
|
||||
* Avoid using named capture groups in heredoc code for oldperl compatibility.
|
||||
* Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
|
||||
before Image::Magick.
|
||||
* Add unminified jquery js and css files to source.
|
||||
* Update to jquery 1.6.2, and jquery-ui 1.8.14.
|
||||
* Use lockf rather than flock when taking the cgilock, for better
|
||||
portability.
|
||||
* search: Fix encoding bug in calculation of maximum term size.
|
||||
* inline: When indexing internal pages for searching, use the url of
|
||||
the inlining page.
|
||||
* Fix comments testsuite to not rely on Date::Parse's ability to
|
||||
parse the date Columbus discovered America. Closes: #[640350](http://bugs.debian.org/640350)
|
||||
* Avoid warning message when generating setup file if highlight
|
||||
is not installed. Closes: #[637606](http://bugs.debian.org/637606)
|
||||
* Promote RPC::XML to a Recommends, since it's used by auto-blog.setup.
|
||||
Closes: #[637603](http://bugs.debian.org/637603)
|
||||
* Fix web revert of a file deletion."""]]
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
ikiwiki 3.20120109 released with [[!toggle text="these changes"]]
|
||||
[[!toggleable text="""
|
||||
* mdwn: Can use the discount markdown library, via the
|
||||
Text::Markdown::Discount perl module. This is preferred if available
|
||||
since it's the fastest currently supported markdown library, speeding up
|
||||
ikiwiki's markdown rendering by a factor of 40.
|
||||
(However, when multimarkdown is enabled, Text::Markdown::Multimarkdown
|
||||
is still used.)
|
||||
* On Debian, depend on libtext-markdown-discount."""]]
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ikiwiki 3.20120115 released with [[!toggle text="these changes"]]
|
||||
[[!toggleable text="""
|
||||
* Make backlink(.) work. Thanks, Giuseppe Bilotta.
|
||||
* mdwn: Workaround discount's eliding of <style> blocks.
|
||||
* attachment: Fix utf-8 display bug."""]]
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
[[!template id=plugin name=mandoc author="[[schmonz]]"]]
|
||||
[[!template id=gitbranch branch=schmonz/master author="[[schmonz]]"]]
|
||||
[[!template id=gitbranch branch=schmonz/mandoc author="[[schmonz]]"]]
|
||||
[[!tag type/format]]
|
||||
|
||||
This plugin lets ikiwiki convert Unix man pages to HTML. It uses
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
[[!template id=plugin name=newpage author="[[rubykat]]"]]
|
||||
[[!tag type/web]]
|
||||
[[!toc]]
|
||||
## NAME
|
||||
|
||||
IkiWiki::Plugin::newpage - add a "create new page" form to actions
|
||||
|
||||
## SYNOPSIS
|
||||
|
||||
# activate the plugin
|
||||
add_plugins => [qw{goodstuff newpage ....}],
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
This plugin adds a new action to the "ACTIONS" section of a page;
|
||||
a button labelled "create" and an input field next to it.
|
||||
|
||||
The common way of creating a new page is to edit a different page
|
||||
and add a link to the new page. However, there are some situations
|
||||
where that is a nuisance; for example, where pages are listed using
|
||||
a [[plugins/map]] directive. The newpage plugin enables
|
||||
one to simply type the name of the new page, click the "create" button,
|
||||
and one is then taken to the standard IkiWiki create-page form.
|
||||
|
||||
## DOWNLOAD
|
||||
|
||||
* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/newpage.pm>
|
||||
* git repo at git://github.com/rubykat/ikiplugins.git
|
||||
|
||||
|
|
@ -25,4 +25,9 @@ support of the C implementation of Markdown called
|
|||
>>> (Upskirt, discount... Who comes up with these names? Discount also
|
||||
>>> features a "NOPANTS" option.) --[[Joey]]
|
||||
|
||||
>>>> Thanks for doing this; it's given a well-needed speedup to my huge site.
|
||||
>>>>
|
||||
>>>> (At least "Discount" is related to "Mark Down" but I don't fathom "Upskirt" either.)
|
||||
>>>> --[[KathrynAndersen]]
|
||||
|
||||
[[wishlist]]
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ Other people had experience with this? Or other suggestions on how to publish re
|
|||
|
||||
> Ikiwiki does not support git submodules.
|
||||
>
|
||||
> You can use the [[ikiwiki/plugin/underlay]] plugin to merge the
|
||||
> You can use the [[plugins/underlay]] plugin to merge the
|
||||
> contents of other directories into your wiki's source. --[[Joey]]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Amitai Schlair](http://www.netbsd.org/~schmonz/) finds himself
|
||||
using ikiwiki for all sorts of things. His attempts at contributing:
|
||||
[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki
|
||||
for all sorts of things. His attempts at contributing:
|
||||
|
||||
[[!map
|
||||
pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Name: ikiwiki
|
||||
Version: 3.20111229
|
||||
Version: 3.20120115
|
||||
Release: 1%{?dist}
|
||||
Summary: A wiki compiler
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2011-12-29 12:03-0400\n"
|
||||
"POT-Creation-Date: 2012-01-15 16:40-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -171,15 +171,15 @@ msgstr ""
|
|||
msgid "bad attachment filename"
|
||||
msgstr ""
|
||||
|
||||
#: ../IkiWiki/Plugin/attachment.pm:295
|
||||
#: ../IkiWiki/Plugin/attachment.pm:296
|
||||
msgid "attachment upload"
|
||||
msgstr ""
|
||||
|
||||
#: ../IkiWiki/Plugin/attachment.pm:346
|
||||
#: ../IkiWiki/Plugin/attachment.pm:347
|
||||
msgid "this attachment is not yet saved"
|
||||
msgstr ""
|
||||
|
||||
#: ../IkiWiki/Plugin/attachment.pm:363
|
||||
#: ../IkiWiki/Plugin/attachment.pm:365
|
||||
msgid "just uploaded"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ msgstr ""
|
|||
msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
|
||||
msgstr ""
|
||||
|
||||
#: ../IkiWiki/Plugin/mdwn.pm:70
|
||||
#: ../IkiWiki/Plugin/mdwn.pm:88
|
||||
#, perl-format
|
||||
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue