1873095484
Put in a workaround for #622591 , by ensuring Search::Xapian gets loaded before Image::Magick.
2011-08-07 11:01:41 -04:00
e07adcad7a
typo
2011-08-05 17:14:41 -04:00
d2cf716876
Avoid using named capture groups in heredoc code for oldperl compatability.
...
Also reordered heredoc part of regexp for consistency.
2011-07-30 20:12:33 +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
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
ca435801d9
po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
2011-07-19 14:12:45 -04:00
e04cb1ffd3
mercurial: Implement rcs_diff. (Daniel Andersson)
2011-07-19 11:44:26 -04:00
339b95e719
rcs_rename and rcs_remove also were in the big mercurial patch
2011-07-19 11:41:11 -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
98d2356ad0
releasing version 3.20110715
2011-07-15 18:57:24 -04: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
70ce708b02
releasing version 3.20110712
2011-07-12 12:40:30 -04:00
20577d8ecb
Display attachment manipulation links always, since attachments can be uploaded via javascript.
...
Could arrange for them to be in a span that is hidden when there are no
attachments and make the javascript upload unhide it; this is a quick fix.
2011-07-11 21:38:48 -04:00
d23786cb6c
attachment: Bugfix to create directory when moving attachment out of holding area.
2011-07-11 21:35:46 -04:00
4ce2490e01
releasing version 3.20110711
2011-07-11 18:41:30 -04:00
258b75c4f7
attachment: Bugfix to move upload attachments out of holding area when saving.
2011-07-11 18:34:17 -04:00
45a058a2c7
Add build dep on python-support. Closes : #633536
2011-07-11 13:07:28 -04:00
a40b58c514
releasing version 3.20110707
2011-07-07 20:48:48 -04:00
9f7d9ab356
Bugfix for trying to attach files to a subpage of the index page.
2011-07-07 20:32:14 -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
add72de71a
merged smcv/comments-metadata
2011-06-29 17:57:53 -04:00
9d7c1d5f7d
Fix ikiwiki-update-wikilist -r to actually work.
2011-06-29 17:38:26 -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
c90bc78d44
Support svg as a inlinable image type
...
svg images can be included on a page by simply linking to them, or by using
the img directive. Note that sanitizing svg files is still not addressed.
2011-06-29 14:17:47 -04:00
46064d6d63
html5 is not experimental anymore. But not the default either, quite yet.
2011-06-23 09:41:21 -04:00
886890b82d
move headinganchors out of contrib
2011-06-21 15:22:35 -04:00
d96edbbe68
Add libtext-multimarkdown-perl to Suggests. Closes : #630705
2011-06-16 13:13:08 -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
a695b5b2f8
updated jquery and made it its own underlay
2011-06-15 19:15:06 -04:00
8e15f664c4
aggregate: Improve checking for too long aggregated filenames.
...
Two problems fixed:
1. Files are written with a .ikiwiki-new suffix, which has to be taken into
account.
2. Need to count length of bytes, not of unicode characters.
2011-06-10 18:47:57 -04:00
cf707d1654
userlist: New plugin, lets admins see a list of users and their info.
2011-06-09 10:10:27 -04:00
4fdeda0e34
ikiwiki-mass-rebuild: Fix tty hijacking vulnerability by using su. (Once su's related bug #628843 is fixed.) Thanks, Ludwig Nussel. (CVE-2011-1408)
2011-06-08 17:42:07 -04:00
d7c4001748
search: Update search page when page.tmpl or searchquery.tmpl are locally modified.
2011-06-03 20:31:20 -04:00
0423cac6de
let's assume some web server will think OFF is a good idea..
2011-06-03 14:41:13 -04:00
254080bc85
Support the Hiawatha web server which sets HTTPS=off rather than not setting it. (There does not seem to be a standard here.)
2011-06-03 14:36:31 -04:00
3b8fc54717
merged po4a robustness workaround
2011-06-03 12:39:09 -04:00
50bc05e7fb
changelog
2011-06-03 12:32:42 -04:00
30c3ceeaa2
Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
...
Apparently the rst library is changing to a GPL-2 incompatable license.
"madduck: joeyh: so yes, do as you think is right."
2011-05-19 14:37:16 -04:00
b4dd83642a
merged quoting changes
2011-05-13 11:24:16 -04:00
97a8d30dc1
Support YAML::XS by not passing decoded unicode to Load. Closes : #625713
2011-05-12 17:50:25 -04:00
b2754fa272
openid: also use Net::INET6Glue if available
2011-05-09 18:15:35 -04:00
825f81340a
aggregate, pinger: Use Net::INET6Glue if available to support making ipv6 connections.
...
Making outgoing ipv6 connections for openid auth is still broken; the glue
module does not seem to solve that, so I did not make openid use it.
2011-05-09 14:00:48 -04:00
fc79f2252e
Add conflict with libyaml-libyaml-perl, since that library does not support utf8. Closes : #625713 (see https://rt.cpan.org/Public/Bug/Display.html?id=54683 )
2011-05-06 14:38:27 -04:00
adabab4cc6
changelog
2011-05-06 14:32:55 -04:00
4a27adfa72
Danish translation update. Closes : #625721
2011-05-05 13:02:31 -04:00
e02b903054
releasing version 3.20110430
2011-04-30 17:27:18 -04:00
be0833b856
close bug already fixed a month ago in git
2011-04-30 16:40:52 -04:00
bad5072c02
tag: Avoid autocreating multiple tag pages that vary only in capitalization. The first capitalization seen of a tag will be used for the tag page.
...
Arguably, the real bug is in the interface to add_autofile, but since
that does take a filename, not a page name, it cannot really do case
handling on its own. The only other users of add_autofile in ikiwiki proper
is autoindex, and it always uses one case. Other third party plugins might
also need to add similar workarounds though.
2011-04-30 16:30:07 -04:00
e258575c12
Promote Crypt::SSLeay to Recommends; needed for https openid auth.
2011-04-30 12:06:32 -04:00
270fd45c5d
meta: Add FOAF support. Closes : #623156 (Jonas Smedegaard)
2011-04-21 19:52:39 -04:00
795da42b29
changelog
2011-04-21 14:18:56 -04:00
df81a2d208
bug closure
2011-04-17 17:57:23 -04:00
d22489299a
meta: Fix bug in loading of HTML::Entities that can break inline archive=yes (mostly masked by other plugins that load the module).
2011-04-12 12:30:24 -04:00
5bdc7f4645
document fix I'm about to merge
2011-03-30 14:11:38 -04:00
21f3eb5bc0
fix
2011-03-30 11:32:47 -04:00
5013e6b0bd
update for libravatar support
...
* comments: Add avatar picture of comment author, using Libravatar::URL
when available. The avatar is looked up based on (Thanks, Francois Marier)
* Recommend libgravatar-url-perl, which contains Libravatar::URL.
2011-03-30 10:55:36 -04:00
0204dabccf
CVE assigned
2011-03-28 19:10:08 -04:00
e548b0c245
changelog
2011-03-28 13:09:03 -04:00
232c8a6dfc
releasing version 3.20110328
2011-03-28 12:30:57 -04:00
be02a80b7a
meta: Security fix; don't allow alternative stylesheets to be added on pages where the htmlscrubber is enabled.
2011-03-28 12:21:12 -04:00
a0e31f38d5
comment: Better fix to avoid showing comments of subpages, while not breaking manual inlining of comments.
2011-03-28 11:53:55 -04:00
9df8971e57
Yaml formatted setup files are now produced by default
...
This has been a while coming. It turns out that non-excutable setup files
have a number of benefits. Also, I find YAML setup files easier to edit
myself, and I suspect many users will prefer not needing to deal with
perl syntax.
2011-03-24 21:30:18 -04:00
78c750f2d2
Add timezone setting in setup file. This alows time zone to be configured via the web.
2011-03-24 13:36:16 -04:00
5c2ba98bcc
releasing version 3.20110321
2011-03-21 15:01:19 -04:00
26eb86d903
Avoid escaping / characters in filenames when building the cgiurl, as this confuses eg, cvsweb.
2011-03-21 14:21:55 -04:00
b02d3746e1
aggregate: Read cookies from ~/.ikiwiki/cookies by default. Also, the cookiejar configuration setting can be used by other plugins to provide a custom `cookie_jar` object for LWP::UserAgent. (Thanks, schmonz)
2011-03-21 14:19:21 -04:00
7e4a0c2930
darcs: Fix multiple issues preventing rcs_diff from working.
2011-03-02 12:39:58 -04:00
b34d31142b
comment: Don't show comments of subpages on parent pages. (Fixes bug introduced in version 3.20100505.)
2011-02-27 18:16:07 -04:00
c58e0a97bf
releasing version 3.20110225
2011-02-25 19:59:06 -04:00
b2a8f0f5b4
bookeeping
2011-02-22 17:34:19 -04:00
9836bceaa5
bookeeping
2011-02-22 17:25:53 -04:00
04498cdeb4
Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced in 3.20101231.
2011-02-21 14:57:15 -04:00
44695122bf
map: Avoid unnecessary ul's in maps with nested directories. (Giuseppe Bilotta)
2011-02-09 14:46:38 -04:00
1879fe63be
transient merged; bookkeeping
2011-02-09 14:18:48 -04:00
8e604c0f0a
htmltidy: Avoid breaking the sidebar when websetup is running.
...
Problem was this: websetup loads all plugins, but does not checkconfig
them. So, htmltidy's recently added configurable command setting was unset;
this resulted in its sanitize hook failing; the sanitize hook is called
when a sidebar was enabled, and this caused the sidebar to not display.
I put in a fix, but the underlying problem is that websetup loads all
plugins but leaves them in an unconfigured and possibly broken state while
trying to display its forms.
Probably the long-term fix is to have it cache the original hook states from
before loading the plugins, and restore it after getting their configuration.
Or, even to get the configuration using a subprocess, as plugins may do things
outside the hook system.
2011-02-03 12:49:13 -04:00
b752e7fec4
editpage: Avoid inheriting internal page types.
2011-02-01 21:01:26 -04:00
2c8cb980bb
releasing version 3.20110124
2011-01-24 17:11:53 -04:00
80452eba92
inline: Fix regression in feed titles. Closes : #610878 (Thanks, Paul Wise)
2011-01-24 17:01:01 -04:00
1640d12102
blogspam: Don't check modifications from admins for spam, and also allow the blogspam_pagespec to do other matches against who the user is.
2011-01-24 16:59:15 -04:00
2be49b623a
bleagh
2011-01-24 16:56:28 -04:00
4d79b58381
releasing version 3.20110123
2011-01-23 10:26:12 -04:00
0e224058e7
Adapt autoindex test suite to work with old Test::More.
2011-01-22 11:00:57 -04:00
24792dabe4
releasing version 3.20110122
2011-01-22 10:44:33 -04:00
b5d7469830
rename: Fix crash when renaming a page that is linked to by a page in an underlay.
...
Skip fixing links in such pages. The user will get a list of pages that
still link to the old page.
2011-01-22 10:20:38 -04:00
dcfeaaad5b
comments: Fix XSS security hole due to missing validation of page name.
...
Values have to be checked against wiki_file_regexp, not just file_pruned.
Audited the rest of the code base for similar problems, found none.
2011-01-22 10:15:33 -04:00
9b6e333170
picked
2011-01-14 14:37:43 -04:00
e112372a38
update
2011-01-06 14:42:13 -04:00
2cd8988648
releasing version 3.20110105
2011-01-05 18:19:26 -04:00
d991ccf134
use cgitemplate, remove misctemplate
2011-01-05 17:15:38 -04:00
4dbb8120f7
Export three cgi env vars needed for CGI->url to work.
2011-01-05 16:08:21 -04:00
3eabf323f0
Fix permalinks to recentchanges items and comments, broken by last release.
...
permalinks always need to be full urls
2011-01-05 15:22:55 -04:00
6b5b0a3282
Temporarily revert one part of the multiple url support in the last release. Non-edit pages are now back to having `<base>` set to the site's main url.
2011-01-05 15:01:31 -04:00
270cbd7cf5
Fix redirect to use a full url.
...
Was broken (in theory) by baseurl changes in last release.
2011-01-05 14:57:04 -04:00
8c9c3915ec
Fix base url when previewing. Was broken by urlto changes in last release.
...
Added a showform_preview that is like showform, but sets forcebaseurl
to point to the page being previewed.
2011-01-05 13:50:42 -04:00
3841d709d7
bugfix
2011-01-04 16:02:31 -04:00
84224c78a0
releasing version 3.20101231
2010-12-31 21:34:52 -04:00
7d0ef85d80
git: Fix bug involving attempting to web revert a commit that included changes to attachments.
2010-12-29 20:19:58 -04:00
4fb26f4e60
Add a second parameter to the rcs_diff hook, and avoid bloating memory reading in enormous commits.
2010-12-29 19:58:49 -04:00
1c430def77
highlight: Support highlight 3.2+svn19 (note that released version 3.2 is not supported). Closes : #605779 (David Bremner)
2010-12-29 13:08:09 -04:00
83b685abb5
changelog
2010-12-28 13:52:01 -04:00
961a119986
changelog
2010-12-26 14:46:55 -04:00
beae7ef9db
editpage, comment: Clean up title when editing or creating a page or comment.
...
Now that page.tmpl is used for cgi, the parentlinks are able to be
displayed even when creating or editing a page. So it's redundant to
include the path to the page in the title, remove it.
2010-12-25 13:38:26 -04:00
9741a3f979
inline: Force an absolute page location when the inline postform is used.
...
There seems no need to allow selecting a location when creating a page this
way; the user should always want it to appear in the inline whose form they
submitted.
2010-12-25 13:32:57 -04:00
77907fb380
merge po
2010-12-25 12:38:31 -04:00
338a04190f
goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
2010-12-11 16:04:06 -04:00
efe702479a
changelog
2010-12-05 16:38:38 -04:00
ca7e3a5923
update changelog to reflect bugfix-only release
2010-12-01 20:36:42 -04:00
017f335aff
Merge branch 'bugfix'
2010-12-01 20:36:07 -04:00
9c0f98de02
releasing version 3.20101201
2010-12-01 20:34:30 -04:00
aa65300c2f
meta: Fix calling of htmlscrubber to pass the page parameter. The change of the htmlscrubber to look at page rather than destpage caused htmlscrubber_skip to not work for meta directives.
2010-12-01 20:25:05 -04:00
2884e3c6c7
smcv's https fix is actually also applicable to using multiple other urls
2010-12-01 11:51:51 -04:00
5f4f0b5bdd
merged sslcookie-auto
2010-11-29 16:32:23 -04:00
141dc37d36
merged localurl branch; changelog
2010-11-29 15:00:22 -04:00
853fcc2b56
releasing version 3.20101129
2010-11-29 14:12:41 -04:00
170cb02479
git: Avoid adding files when committing, so as not to implicitly add files like recentchanges files that are not normally checked in, when fixing links after rename.
2010-11-29 13:42:03 -04:00
a5120846cb
rename: Fix to pass named parameters to rcs_commit
2010-11-29 13:28:28 -04:00
78a22e2eb2
git: Fix temp file location.
2010-11-29 12:01:50 -04:00
31f0e459b8
edittemplate: Fix crash if using a .tmpl file or other non-page file as a template for a new page.
2010-11-20 14:54:43 -04:00
af5f162ca7
highlight: Support new format of filetypes.conf used by version 3.2 of the highlight package.
2010-11-20 12:55:26 -04:00
f8f8770a65
smcv/ready/glob-cache merged
2010-11-20 12:28:22 -04:00
b00c6c9640
inline: Improve RSS url munging to use a proper html parser
...
and support all elements that HTML::Tagset knows about.
(Which doesn't include html5 just yet, but then the old version didn't either.)
Bonus: 4 times faster than old regexp method.
2010-11-16 16:57:50 -04:00
cedf2c0af5
Fix escaping of filenames in historyurl. (Thanks, aj)
2010-11-16 15:12:52 -04:00
ec6c1269d2
more: Add pages parameter to limit where the more is displayed. (thanks, dark)
2010-11-16 15:00:04 -04:00
b85ca8603a
websetup: Fix encoding problem when restoring old setup file.
2010-11-16 14:24:15 -04:00
5f750e16b8
CVE id
2010-11-12 10:25:21 -04:00
5dbf25127f
releasing version 3.20101112
2010-11-12 00:45:00 -04:00
d8de98911e
comments: Make comment() pagespec also match comments that are being posted.
2010-11-12 00:36:03 -04:00
78de33d2ea
comments: Make postcomment() pagespec work when previewing a comment.
2010-11-12 00:28:27 -04:00
289b30a47d
Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined into. Should allow setting to "* and !comment(*)" to scrub comments, but leave your blog posts unscrubbed, etc.
2010-11-12 00:00:54 -04:00
0c18b347aa
changelog
2010-10-31 16:07:54 -04:00
0a0366b8c6
changelog
2010-10-31 10:12:28 -04:00
49865d5512
changelog
2010-10-30 22:03:02 -04:00
5c6eb167b8
highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties.
2010-10-25 23:00:32 -04:00
2076ed597c
txt: Fix display when used inside a format directive.
...
txt's use of a format hook can't work in that case, so it needs to use a
htmlizeformat hook in this case to handle wrapping the text in pre tags.
2010-10-25 22:37:34 -04:00
5db2d6f6b2
nice message if someone tries to revert a merge commit
2010-10-23 17:19:48 -04:00
9ca9959eda
fix web reversion when the srcdir is in a subdir of the git repo.
2010-10-23 16:19:16 -04:00
1c5a3f2c67
Fix typo that broke anonymous git push.
2010-10-23 15:25:29 -04:00
490e0813c5
releasing version 3.20101019
2010-10-19 02:44:10 -04:00
1d119e5314
auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments.
2010-10-17 17:26:35 -04:00
8555d10f63
img: If a class is specified, don't also put the img in the img class.
2010-10-13 12:57:16 -04:00
7ba0f7d297
monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd.
2010-10-11 20:30:14 -04:00
cfbd272c8b
websetup: Fix defaults of checkboxes in advanced mode.
...
So formbuilder has an annoying glitch, that setting the value of a
checkbox, even without force, will override the value currently on the
form. Thus the guards against changing checkbox values when a form has been
submitted.
But those guards also prevented the checkboxes for advanced items getting
the right value when going into advanced mode.
Note that if the user makes changes to advanced mode stuff and leaves
advanced mode, those changes are lost. That seems reasonable so I didn't
change it -- and it made this fix simple.
2010-10-11 11:41:34 -04:00
274219ecc8
websetup: Fix saving of advanced mode changes.
...
The showadvanced field was not known to formbuilder when hitting the save
changes button.
2010-10-11 11:12:41 -04:00
2852c6b0d5
actiontabs: More consistent styling of Hn tags.
...
In particular the use of italics for h3 was weird.
2010-10-08 19:55:56 -04:00
1820f07f04
revert interface done
2010-10-08 19:24:06 -04:00
5c514706e4
Updated French program translation. Closes : #598918
2010-10-03 12:34:58 -04:00
bd48ff734a
fixups tidy change
...
Need checkconfig hook; examples don't become default values.
2010-10-02 12:02:34 -04:00
2df92a956a
Fix test suite failure on other side of date line.
2010-09-29 11:58:45 -04:00
3dfc7ea4dc
releasing version 3.20100926
2010-09-27 00:56:03 -04:00
43c99f9076
htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv)
2010-09-26 22:37:18 -04:00
1883e31de2
Propigate PATH into wrapper.
...
In the last version, the ikiwiki script stopped setting PATH.
But that leads to gcc failing when run from websetup. See
http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/
2010-09-26 22:27:46 -04:00
90bc68589e
attachment: Fix attachment file size display.
2010-09-21 15:33:42 -04:00
8063b960ad
meta: Ensure that the url specified by xrds-location is absolute.
...
With a relative xrds-location, the openid perl client module will fail.
I haven't checked the specs to see if it needs to be absolute, but all
examples I've seen are absolute, so it seems a very good idea.
2010-09-19 20:15:34 -04:00
3d4313f21d
releasing version 3.20100915
2010-09-15 16:40:26 -04:00
884835ce1c
cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut.
2010-09-15 16:24:50 -04:00
cd794613b6
git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches.
2010-09-14 15:45:38 -04:00
0ff945ddf1
external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin.
2010-09-14 15:37:45 -04:00
e0898ae1a8
blogspam: Fix crash when content contained utf-8.
...
I also tried setting RPC::XML::ENCODING but that did not prevent the crash,
and it seems that blogspam.net doesn't like getting xml encoded in unicode,
since it mis-flagged comments as spammy that way that are normally allowed
through.
2010-09-14 15:23:28 -04:00
894d09ba94
Set isPermaLink="no" for guids in rss feeds.
...
The rss spec says that unless the attribute is set, guid elements *are*
permalinks. The problem with that is that if [[meta permalink=]] is used,
as is done with aggregated posts, that goes into the link element, and
apparently some rss readers prefer the not-really-permalink in the guid
element when linking to the post.
Without meta permalink, the link and guid elements have the same content,
so it should be ok, in that case too for the guid to not be a permalink.
(Checked and this does not flood aggregators.)
2010-09-14 12:40:40 -04:00
b5be85a611
blueview: Fix display of links to translated pages in the page header.
2010-09-11 14:40:56 -04:00
41a10eb0b0
actiontabs: Improve tab padding.
2010-09-11 14:31:34 -04:00
c4ebdd6f46
Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook.
2010-09-10 17:17:08 -04:00
23f8869009
po: Auto-upgrade old format settings to new formats when writing setup file.
2010-09-10 14:04:43 -04:00
fbfda5ccfc
po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web.
2010-09-10 13:13:00 -04:00
400aabe82d
po: Allow enabling via web setup.
...
The only unsafe thing should be that enabling it with some languages will
generate po files.
2010-09-10 11:45:59 -04:00
074c9869f3
changelog
2010-09-09 18:23:31 -04:00
5c6c0813ca
Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled.
2010-09-07 13:47:50 -04:00
8a6f4a7e50
needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.)
2010-09-07 12:08:59 -04:00
2ff705367b
releasing version 3.20100831
2010-08-31 14:30:34 -04:00
f55c7d1396
httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session.
2010-08-30 18:33:00 -04:00
a330b1ee74
Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function.
...
Just use check_canedit in nonfatal mode.
2010-08-30 16:05:15 -04:00
2ec5efcd6c
t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing.
2010-08-30 15:23:22 -04:00
d325f09a96
document merging of intrigeri/po
2010-08-30 14:56:13 -04:00
00a54d1bb7
finish link(.) support
2010-08-30 13:37:16 -04:00
7ab84dcfe5
highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations.
2010-08-30 13:15:49 -04:00
decf432fd5
Danish translation update. Closes : #594673
2010-08-28 10:02:27 -04:00
9b9ecda62f
htmlscrubber: Do not scrub url anchors that contain colons.
2010-08-19 13:59:31 -04:00
20ecef4d02
style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
2010-08-17 16:37:48 -04:00
9744c11f80
openid: Syntax tweak to the javascript code to make it work with MSIE 7 (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug and providing access to debug it.
2010-08-17 16:05:17 -04:00
91f5697025
Merge branch 'debian-testing'
...
Conflicts:
debian/changelog
2010-08-15 12:01:16 -04:00
67d0645e07
insert version that will be released from debian-testing branch
2010-08-15 11:46:01 -04:00
b8fd31a2a3
Fix po test suite to not assume ikiwiki's underlay is already installed. Closes : #593047
...
(cherry picked from commit 5664401fbc
2010-08-15 11:44:28 -04:00
5664401fbc
Fix po test suite to not assume ikiwiki's underlay is already installed. Closes : #593047
2010-08-15 11:38:39 -04:00
d03e691c50
changelog
2010-08-13 17:59:36 -04:00
80102c042d
flattr: New plugin.
...
Thanks to jaywalk for the initial implementation at a flattr plugin!
This one is less configurable, but simpler.
2010-08-12 16:53:55 -04:00
51d5e54697
filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file.
2010-08-09 13:18:59 -04:00
522f3d1d65
releasing version 3.20100804
2010-08-04 09:26:43 -04:00
5d88146861
Fixes a bug that prevented matching deleted pages when using the page() PageSpec.
2010-08-04 08:25:10 -04:00
fee00fdb7a
Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify dependencies. Closes : #591040
2010-07-31 15:54:25 -04:00
c401b6958a
Add new disable hook, allowing plugins to perform cleanup after they have been disabled.
2010-07-26 16:33:42 -04:00
dd9d117894
meta: Allow syntax closer to html meta to be used.
...
The idea here is that <meta name="foo" description="bar">
can be written like [[!meta name="foo" description="bar">.
Of course, [[!meta foo=bar]] is still supported; this new feature
provides some DWIM when trying to directly convert a meta tag into
a meta directive.
2010-07-25 20:18:02 -04:00
a7454c0e32
git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks jrayhawk)
2010-07-24 06:18:19 -04:00
d2f56f7dea
merged; notes
2010-07-23 14:29:17 -04:00
1b0bef6d49
template: Fix dependency tracking. Broken in version 3.20100427.
...
template_depends was adding a dependency on the source filename,
instead of on the page name when a template is a page. Such a
dependency doesn't work.
2010-07-23 14:14:25 -04:00
c30f22fc83
releasing version 3.20100722
2010-07-22 16:59:11 -04:00
21fe996544
Avoid showing 'Add a comment' link at the bottom of the comment post form.
...
Since misctemplate is called with a page context, the comments plugin
thinks it should add that, as well as the comment link in the actionbar.
I kept the comment link because a quick link back to the comments to a page
is sorta useful.
2010-07-22 15:02:04 -04:00
def97ec7fe
merge fix for selflink po problem
2010-07-18 19:43:25 -04:00
e041555e4f
Updated French program translation from Philippe Batailler. Closes : #589423
2010-07-18 17:59:33 -04:00
e674bb1445
fix other 2 cases of conflicting destdir files
...
Cleanly fixed case where destdir file failed to be written because there
was a directory with the same name. This can be detected with no extra
system calls, and dealt with by finding all pages that wrote files
inside the directory, and removing them and the directory.
The other, inverse case would be expensive to detect in will_render,
since it would need to check each parent directory of the file to see
if the directory is really a conflicting file. But prep_writefile
already does a similar scan for symlinks in the path, so I added code
there to remove the conflicting file. This fix assumes that the file
is written using writefile, and not some other means (but using other means
would be a security hole too, so hopefully nothing does).
2010-07-18 17:38:35 -04:00
2d24281a3a
Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have the caching problem that was added to work around). Closes : #588623
2010-07-14 14:27:25 -04:00
c6ef898851
changelog
2010-07-12 15:42:30 -04:00
0eee3fe2a2
merged filter-full
2010-07-12 15:39:32 -04:00
dbb63cb7fd
openid: Fix handling of utf-8 nicknames.
2010-07-11 13:38:37 -04:00
7dbad39bbe
Add --changesetup mode that allows easily changing options in a setup file.
2010-07-08 14:05:39 -04:00
2dd0c177a6
aggregate: Write timestamp next aggregation can happen to .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
2010-07-06 13:57:17 -04:00
7e3fb8b8a2
comments: Added commentmoderation directive for easy linking to the comment moderation queue.
2010-07-05 20:19:31 -04:00
f6db10df21
img: Add a margin around images displayed by this directive.
...
Particularly important for floating images, which could before be placed
uncomfortably close to text.
2010-07-05 14:04:49 -04:00
40c697e12d
releasing version 3.20100704
2010-07-04 17:11:16 -04:00
e72ef3b070
comment: Fix problem moderating comments of certian pages with utf-8 in their name.
2010-07-04 16:19:22 -04:00
35fd6f81f1
changelog
2010-07-04 15:27:37 -04:00
8a8914151c
review of needstranslation() pagespec
...
Minor wording fix; changelog; etc.
2010-07-04 14:22:19 -04:00
0eabe6f794
git: Added git_wrapper_background_command option. Can be used to eg, make the git wrapper push to github in the background after ikiwiki runs.
2010-07-01 16:57:20 -04:00
28cdf2c341
comment.tmpl: Fix up display when inline uses it to display a non-comment page. (Such as a discussion page.)
2010-06-30 21:07:31 -04:00
29fd100e9f
Use comment template on comments page of example blog.
2010-06-30 20:53:58 -04:00
bb5193fde1
hnb: Fixed broken use of mkstemp that had caused dangling temp files, and prevented actually rendering hnb files.
2010-06-27 13:49:51 -04:00
f008caf440
update
2010-06-23 20:16:55 -04:00
9a32451986
finializing openid nickname support
...
Renamed usershort => nickname.
Note that this means existing user login sessions will not have the nickname
recorded, and so it won't be used for those.
2010-06-23 20:16:01 -04:00
a4f381ace8
git: Record the username from openid in the git author email. (This avoids display of ugly google openids.)
2010-06-23 19:44:41 -04:00
d8e4b51a41
rcs_getctime and rcs_getmtime take relative filenames
...
There was some confusion about whether the filename was
relative to srcdir or not. Some test cases, and the bzr
plugin assumed it was relative to the srcdir. Most everything else
assumed it was absolute.
Changed it to relative, for consistency with the rest
of the rcs_ functions.
2010-06-23 19:32:53 -04:00
ecdfd1b864
rcs_commit and rcs_commit_staged api changes
...
Using named parameters for these is overdue. Passing the session in a
parameter instead of passing username and IP separately will later allow
storing other session info, like username or part of the email.
Note that these functions are not part of the exported API,
and the prototype change will catch (most) skew, so I am not changing
API versions. Any third-party plugins that call them will need updated
though.
2010-06-23 19:04:36 -04:00
b4a43406f6
API: rcs_commit and rcs_commit_staged are passed a new parameter
...
that may contain the username component of the email address of
the user making the commit.
2010-06-23 16:05:49 -04:00
c46bcb425a
Add new optional field usershort to rcs_recentchanges.
...
Now the git plugin supports commits with author fields that look like:
Author: http://my.openid/ <me@web>
Then in recentchanges, the short username will be displayed, linking
to the openid.
Particularly useful for the horrible google openids, of course.
2010-06-23 15:54:52 -04:00
d5c680e693
releasing version 3.20100623
2010-06-23 14:23:09 -04:00
383ad93f77
add changelog for externalink
...
remove debian.org linkspam ;)
2010-06-23 13:33:14 -04:00
2490296dba
typo
2010-06-18 15:06:15 -04:00
41680ebd5b
mention added themes
2010-06-18 14:59:45 -04:00
9e4da76b5b
bugnum
2010-06-18 12:52:26 -04:00
2797a659db
mercurial: Fix buggy getctime code.
...
The file passed to rcs_getctime is already absolute, and it was
trying to stick the srcdir on the front.
Also, eliminated potentially unsafe shelling.
2010-06-18 12:48:05 -04:00
062ed44f47
add theme plugin
2010-06-16 15:43:42 -04:00
69c22fa1ea
attachment: Support Windows paths when taking basename of client-supplied file name.
2010-06-16 13:23:32 -04:00
da2be6e85c
git: Gix --gettime to properly support utf8 filenames.
...
In passing, fixed a bug where the srcdir was in a subdir of a repository
named "0".
2010-06-15 23:21:55 -04:00
5f33532468
Make --gettime be honored after initial setup.
...
Bugfix in passing: New files not treated as such when no rcs is used.
2010-06-15 22:56:06 -04:00
f7d4904fee
bugnum
2010-06-15 19:35:17 -04:00
69383fb6b0
Fix issues with combining unicode srcdirs and source files.
...
A short story:
Once there was a unicode string, let's call him Srcdir.
Along came a crufy old File::Find, who went through a tree and pasted each
of the leaves in turn onto Srcdir. But this 90's relic didn't decode the
leaves -- despite some of them using unicode! Poor Srcdir, with these
leaves stuck on him, tainted them with his nice unicode-ness. They didn't
look like leaves at all, but instead garbage.
In other words, perl's unicode support sucks mightily, and drives
us all to drink and bad storytelling. But we knew that..
So, srcdir is not normally flagged as unicode, because typically it's pure
ascii. And in that case, things work ok; File::Find finds filenames, which
are not yet decoded to unicode, and appends them to the srcdir, and then
decode_utf8 happily converts the whole thing.
But, if the srcdir does contain utf8 characters, that breaks. Or, if a Yaml
setup file is used, Yaml::Syck's implicitunicode sets the unicode flag of
*all* strings, even those containing only ascii. In either case, srcdir
has the unicode flag set; a non-decoded filename is appended, and
decode_utf8 sees the flag and does *nothing*. The result is that the
filename is not decoded, so looks valid and gets skipped.
File::Find only sticks the directory and filenames together in no_chdir
mode .. but we need that mode for security. In order to retain the
security, and avoid the problem, I made it not pass srcdir to File::Find.
Instead, chdir to the srcdir, and pass ".". Since "." is ascii, the problem
is avoided.
Note that it takes care to chdir back to the starting location. Because
the user may have specified relative paths and so staying in the srcdir
might break. A relative path could even be specifed for an underlay dir, so
it chdirs back after each.
2010-06-15 16:40:37 -04:00
d541cc854a
calendar: Tune archive_pagespec to only match pages, not other files.
2010-06-15 13:38:19 -04:00
c0bc2d0839
editpage, comments: Fix broken links in sidebar (due to forcebaseurl). (Thanks, privat)
2010-06-14 14:34:52 -04:00
17592a951b
websetup: Allow enabling plugins listed in disable_plugins.
...
The bug here was that disabling a plugin included thru goodstuff, like
htmlscrubber, caused it to be added to disable_plugins, and those plugins
were never loaded, so could not be re-enabled. Fix by allowing them to be
force loaded when appropriate. (Also that allows disabled plugins to still
record their setup options when dumping a setup file.)
2010-06-13 10:21:19 -04:00
c65658eeb5
attachment: When inserting links, insert img directives for images, if that plugin is enabled.
2010-06-12 23:00:30 -04:00
dccd764871
edittemplate: Look for template pages under templates/ like everything else (still looks in old location for backwards compatability).
2010-06-12 22:43:34 -04:00
c225cdad25
edittemplate: Make silent mode not disable display when the template page does not exist, so it can be easily created.
2010-06-12 22:20:22 -04:00
31fa7714e7
editpage: Rename "comments" field to avoid CSS conflict with the comments div.
2010-06-12 18:10:33 -04:00
d7cfcef54a
img: Support hspace and vspace attributes.
2010-06-12 16:43:24 -04:00
9923f5db65
attachment: Show files from underlay in attachments list.
...
While those files cannot be removed or renamed, this allows easy
downloading of them, and a new version can after all be uploaded.
2010-06-12 14:29:56 -04:00
475b4199e1
openid: Add openid_realm and openid_cgiurl configuration options, useful in a few edge case setups.
2010-06-11 13:53:56 -04:00
1609da8f00
I'm told that the pagebody div should be after the sidebar.
2010-06-10 15:16:22 -04:00
Joey Hess