5cb0ecc000
Fix web revert of a file deletion.
...
When reverting, an add is a remove, and a remove is an add.
2011-09-05 14:51:49 -04:00
35b69392c8
Avoid warning message when generating setup file if highlight is not installed. Closes : #637606
...
There's a nice message if the plugin is loaded and used and highlight is
not available, and a nice fallback. So no need for this other warning,
which can happen any time all plugins are loaded to generate a setup file.
2011-09-05 13:21:56 -04:00
7d2b68cd16
inline: When indexing internal pages for searching, use the url of the inlining page.
2011-09-01 11:38:10 -04:00
4af7b2c14d
search: Fix encoding bug in calculation of maximum term size.
2011-08-30 11:37:38 -04:00
c8f7dcbc31
Use lockf rather than flock when taking the cgilock, for better portability.
...
This kind of change is scary, but this particular lock is very simply
used and so it seems ok to make it even just for better portability to
SunOS. (People still use that?)
2011-08-24 17:35:53 -04:00
1873095484
Put in a workaround for #622591 , by ensuring Search::Xapian gets loaded before Image::Magick.
2011-08-07 11:01:41 -04:00
5dd414fbe5
mercurial: fix date parsing so test suite passes
2011-07-30 10:52:49 +02:00
577f5d3837
fix mercurial commit with session but without nickname
2011-07-30 10:46:26 +02:00
ed360d045a
Fix escaping of html entities in tag names.
...
Example case was a tag with & in its name, which resulted in a malformed
rss feed.
2011-07-29 12:54:30 +02:00
65a7bc4e06
Fix escaping of html entities in permalinks.
2011-07-29 12:37:43 +02:00
2555257ade
oops
2011-07-26 17:29:59 +02:00
f2529edcab
Fix typo in Danish translation of shortcuts page that caused expoentional regexp blowup.
...
Complex regular subexpression recursion limit (32766) exceeded at
/home/joey/src/ikiwiki/IkiWiki.pm line 1532.
This doesn't fix the blowup potential itself, it just fixes the typo. :)
A sample page that causes the blowup is attached below for future
reference. The first directive is not terminated. Contributing are the
additional quotes around the following directives, which mean that they can
each be processed as a parameter to the first directive, or as an
individual directive. In resolving this ambiguity, the regexp blows up.
Happily, perl contains the explosion , so I don't think there is an exploit
here.
"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/ "
"[[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s \"]]"
"[[!shortcut name=debwiki url=\"http://wiki.debian.org/%s \"]]"
"[[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s \" desc=\"freedesktop.org bug #%s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s \" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s \" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s \" desc=\"bug %s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s \" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s \" desc=\"GNOME bug #%s\"]]"
"[[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s \" desc=\"Linux bug #%s\"]]"
"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s \" desc=\"gmane.%s\"]]"
"[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s \"]]"
"[[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s \"]]"
"[[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s \"]]"
"[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s \"]]"
"[[!shortcut name=iki url=\"http://ikiwiki.info/%S/ \"]]"
"[[!shortcut name=ljuser url=\"http://%s.livejournal.com/ \"]]"
"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt \" desc=\"RFC %s\"]]"
"[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s \"]]"
"[[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s \"]]"
"[[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s \"]]"
"[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s \"]]"
"[[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s \"]]"
"[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s \"]]"
"[[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s \"]]"
"[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s \"]]"
"[[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain \"]]"
"[[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s \"]]"
"[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s \"]]"
"[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s \"]]"
"[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s \"]]"
"[[!shortcut name=man url=\"http://linux.die.net/man/%s \"]]"
"[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s \"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s \" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s \" desc=\"bug %s\"]]"
2011-07-26 17:29:36 +02:00
8512ae3ed5
Merge remote-tracking branch 'intrigeri/po'
2011-07-19 14:11:36 -04:00
e04cb1ffd3
mercurial: Implement rcs_diff. (Daniel Andersson)
2011-07-19 11:44:26 -04:00
b4db945b34
mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
2011-07-19 11:39:32 -04:00
86e1dc492f
apply the big mercurial patch
...
* 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: fix viewing of a diff containing non-utf8 changes.
(Daniel Andersson)
2011-07-19 11:26:14 -04:00
739554622f
Merge commit '3.20110715' into prv/po
2011-07-18 18:41:37 +02:00
f5c8fca887
po: add lang_code and lang_name template variables.
2011-07-18 16:39:18 +02:00
4cd2efef8c
fix two recently introduced bugs in rename
...
* rename: Fix logic error that broke renaming pages when the attachment
plugin was disabled.
* rename: Fix logic error that bypassed the usual pagespec checks.
2011-07-15 18:46:16 -04:00
87db6fbb79
only check for held attachments when operating on an attachment
2011-07-15 18:42:00 -04:00
aef85a247a
remove debug
2011-07-15 18:41:04 -04:00
d23786cb6c
attachment: Bugfix to create directory when moving attachment out of holding area.
2011-07-11 21:35:46 -04:00
258b75c4f7
attachment: Bugfix to move upload attachments out of holding area when saving.
2011-07-11 18:34:17 -04:00
9f7d9ab356
Bugfix for trying to attach files to a subpage of the index page.
2011-07-07 20:32:14 -04:00
506d16a8a0
emails in wikilinks are always email addresses
...
If a page that looks like an email address exists, it can't be linked to.
But that's unlikely. Better to be consistent; before this change, a
wikilink with an email address in it could link to the email address or a
page, depending on when the page was created and when the page with the
link was updated.
2011-06-29 19:09:23 -04:00
a965e02430
Bugfix for wikilink containing an email address not showing up in brokenlinks list.
2011-06-29 18:35:29 -04:00
a18a62aa30
inline: Handle obfuscated urls, such as the mailto urls generated by markdown when forcing urls absolute.
...
That took me 5 minutes. If anyone thinks obfuscated email urls stops, or
even slows down spammers, think again.
2011-06-29 18:12:58 -04:00
6d01db205f
Merge remote-tracking branch 'smcv/comments-metadata'
2011-06-29 17:55:53 -04:00
25b01f9404
Preserve mixed case in page creation links, and when creating a page whose title is mixed case, allow selecting between the mixed case and all lower-case names.
2011-06-29 16:38:32 -04:00
ae1857b43c
img: Generate png format thumbnails for svg images.
...
Imagemagick does not generate svg images very well, but it can convert
them to png quite well.
For browsers that don't yet support displaying svg, this also provides a
workaround; just scale the svg down to get a png. But the workaround is
partial, since scaling the image larger, or leaving it the same size will
cause the original svg to be displayed. Since browsers are actively
improving svg support, this is good enough for me.
2011-06-29 14:40:30 -04:00
ee8ff9d1c7
apply Changaco's patch to make headinganchors more like mediawiki's
2011-06-21 15:22:36 -04:00
b5a669f34b
add websetup hook
2011-06-21 15:22:36 -04:00
886890b82d
move headinganchors out of contrib
2011-06-21 15:22:35 -04:00
ace3665f81
improve detection of ajax request
...
Firefox sent an accept header for application/xml, not application/json,
and also weakened the priority to 0.8. So that stuff is not to be trusted;
instead I found a better way: When an ajax upload is *not* being made,
the Upload Attachment button will be used, so enable ajax if an upload
is being made without that button having been used.
Also, testing with firefox revealed it refused to process a response that
was type application/json, and checking the demo page for the jquery file
upload plugin, it actually returns the json with type text/html. Ugh.
Followed suite.
Now tested with: chromium, chromium (w/o js), firefox, firefox (w/o js),
and w3m.
2011-06-17 15:17:20 -04:00
6ebb4e262e
show ikiwiki error when attachment is rejected
2011-06-16 13:01:23 -04:00
d4a0732752
let thru HTTP_ACCEPT
...
Needed for attachment to return json when requested.
I think some browsers send Accept: * , so I made sure to check that json
was explicitly listed as to be accepted, as well as having a high
priority.
2011-06-15 20:02:14 -04:00
54672a3130
bugfixes
...
Make sure staged attachments sort as earlier, even if they're not really.
2011-06-15 19:48:49 -04:00
b85485aaa2
typo
2011-06-15 19:31:11 -04:00
8363107a9e
use jquery underlay
2011-06-15 19:16:08 -04:00
a695b5b2f8
updated jquery and made it its own underlay
2011-06-15 19:15:06 -04:00
e2b43578a6
load attachment javascript into template the clean way
2011-06-15 19:08:40 -04:00
f77452b7ca
WIP
2011-06-15 18:37:12 -04:00
00c0677588
fix removal of staged attachments
2011-06-15 17:46:08 -04:00
b66261d08b
WIP
2011-06-15 15:21:59 -04:00
176c7f3ff3
implement renaming of held attachments
...
This is somewhat suboptimal, it does not update links to the renamed file,
or show a result message.
2011-06-14 16:02:09 -04:00
2e086b3263
remove trailing slash from attachment_holding_dir
...
If it's passed a filename, it should return the filename inside the holding
dir. If passed a page, the directory sans slash. All code adds the slash.
2011-06-14 15:49:33 -04:00
d4254c7f97
more generic interface
2011-06-14 15:31:58 -04:00
49e7bc2535
bugfixes
2011-06-14 15:19:23 -04:00
a61849e954
bugfix for attachments of non-index pages
2011-06-14 15:07:34 -04:00
04b2a4d676
fix removal of helf attachments
...
Left out confirmation of removal for held attachments because
a) they're not in the wiki yet, so confirmation is a bit unnecessary
b) it would be hard
c) eases later integration of jquery file upload interface
Also changed where attachments of index are held (to match where they're
stored in the srcdir).
Note that the attachment formbuilder hook was made to run last, so that
the list of attachments is not generated before removal, in the fast path
w/o confirm.
2011-06-14 14:44:20 -04:00
Joey Hess
intrigeri