Commit Graph

1713 Commits (e65ab83d292c62f01740b68f4acdb5bf2d6d1f93)

Author SHA1 Message Date
intrigeri 4a1cb092ba Revert po vs. template kludges.
This reverts commits dcd57dd5c9,
d4136aea8a and
d877b9644b.
2010-07-11 11:03:41 +02:00
intrigeri c99d26030e Merge remote branch 'upstream/master' into prv/po
Conflicts:
	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn
2010-07-11 10:46:18 +02:00
http://weakish.myopenid.com/ 293e12bc0e link to repolist plugin 2010-07-10 09:20:36 +00:00
http://weakish.myopenid.com/ 99f4056b98 minor markup syntax 2010-07-09 11:44:59 +00:00
http://jeremiahfoster.com/ 4e9d62a2d7 2010-07-08 16:09:32 +00:00
Joey Hess 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
Joey Hess 472d3fba7d comment 2010-07-04 16:08:54 -04:00
intrigeri cd03bd0b80 po: added support for html pagetype
... after having audited the po4a Xml and Xhtml modules for security issues.

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit a128c256a5)
2010-07-04 15:27:02 -04:00
intrigeri 8fe277c2ab typo fix.
(cherry picked from commit 924f559e50)
2010-07-04 15:25:27 -04:00
Joey Hess 192ce7a238 remove unnecessary and troublesome filter calls
This better defines what the filter hook is passed, to only be the raw,
complete text of a page. Not some snippet, or data read in from an
unrelated template.

Several plugins that filtered text that originates from an (already
filtered) page were modified not to do that. Note that this was not
done very consistently before; other plugins that receive text from a
page called preprocess on it w/o first calling filter.

The template plugin gets text from elsewhere, and was also changed not to
filter it. That leads to one known regression -- the embed plugin cannot
be used to embed stuff in templates now. But that plugin is deprecated
anyway.

Later we may want to increase the coverage of what is filtered. Perhaps
a good goal would be to allow writing a filter plugin that filters
out unwanted words, from any input. We're not there yet; not only
does the template plugin load unfiltered text from its templates now,
but so can the table plugin, and other plugins that use templates (like
inline!). I think we can cross that bridge when we come to it. If I wanted
such a censoring plugin, I'd probably make it use a sanitize hook instead,
for the better coverage.

For now I am concentrating on the needs of the two non-deprecated users
of filter. This should fix bugs/po_vs_templates, and it probably fixes
an obscure bug around txt's use of filter for robots.txt.
2010-07-04 15:06:48 -04:00
Joey Hess 1b14a849ff example 2010-07-04 14:27:57 -04:00
Joey Hess 824ad84e2b add note about genwrapper code running before wrapper sanitizes environment
(That is needed for the receive test code.)
2010-07-01 15:52:03 -04:00
http://kerravonsen.dreamwidth.org/ 91fde37f13 response to Microdata question 2010-07-01 00:30:58 +00:00
intrigeri 1786b106a9 Merge remote branch 'upstream/master' into prv/po
Conflicts:
	doc/plugins/po.mdwn
2010-06-29 15:53:51 +02:00
intrigeri dcd57dd5c9 Add a fullpage arg to filter.
Set it to true every time IkiWiki::filter is called on a full page's content.

This is a much nicer solution, for the po plugin, than previous whitelisting
using caller().
2010-06-29 15:17:56 +02:00
https://www.google.com/accounts/o8/id?id=AItOawnbe6oB_ecFtNYII1JN3zSggwUPUdOb8jI a39c6b6eac Add Microdata suggestion 2010-06-26 22:12:24 +00:00
intrigeri 7e3672945f another po4a patch has been sent. 2010-06-26 16:28:06 +02:00
intrigeri 9b171de6db yet another bug on good way to be fixed 2010-06-26 16:28:06 +02:00
intrigeri e84287ec98 need more info to reproduce 2010-06-26 16:28:06 +02:00
intrigeri 9b66a0cf0a done in my branch, please review. 2010-06-26 16:28:05 +02:00
intrigeri 924f559e50 typo fix. 2010-06-26 00:59:20 +02:00
intrigeri 4cf185e781 po_slave_languages can now be a hash, if order matters. 2010-06-26 00:56:06 +02:00
intrigeri a128c256a5 po: added support for html pagetype
... after having audited the po4a Xml and Xhtml modules for security issues.

Signed-off-by: intrigeri <intrigeri@boum.org>
2010-06-25 23:18:57 +02:00
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess 383ad93f77 add changelog for externalink
remove debian.org linkspam ;)
2010-06-23 13:33:14 -04:00
Joey Hess 851712cb0e Merge remote branch 'remotes/bzed/extendedlink' 2010-06-23 13:30:14 -04:00
Joey Hess 44e286de2e response 2010-06-23 12:51:50 -04:00
PaulePanter 397f1cbc76 What license for themes for distribution in ikiwiki? 2010-06-19 10:47:30 +00:00
Bernd Zeimetz dd3274ce73 Enhance the link plugin to handle external links.
The following ways to create a link are supported now:
[[url]]
[[text|url]]
url can be one of the following:
- an internal wikilink: will be handled as before
- any other kind of URL, including mailto: proper links will be created:
  <a href="url">url</a>
  <a href="url">text</a>
- an email address:
  <a href="mailto:url">url</a>
  <a href="mailto:url">text</a>
2010-06-19 03:14:16 +02:00
Joey Hess 17675c18a8 avoid showing subpages of contrib plugins 2010-06-18 12:59:03 -04:00
Joey Hess fca54dc52a fix filename 2010-06-18 12:57:20 -04:00
PaulePanter c52d8d263e `themes.pm` instead of `themes.mdwn` 2010-06-18 09:08:28 +00:00
Joey Hess 062ed44f47 add theme plugin 2010-06-16 15:43:42 -04:00
Joey Hess 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
Joey Hess d5181a1977 realm is an url pattern 2010-06-11 14:14:20 -04:00
Joey Hess 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
Joey Hess 3fbcd2c8d2 move contrib plugin directives out of ikiwiki/directive
Problem is that ikiwiki/directive is turned into an underlay and added to
all wikis. And the test suite checks it for broken links and turns some up.
So it's not appropriate for contrib plugin's directives to be documented
in there.
2010-06-09 14:58:39 -04:00
http://kerravonsen.dreamwidth.org/ c1f68a8cff reply 2010-05-19 11:30:35 +00:00
http://kerravonsen.dreamwidth.org/ 2f7a909bbc new version to go with new version of field 2010-05-19 11:29:45 +00:00
http://kerravonsen.dreamwidth.org/ cc84a2dacd new version; splitting docs between plugin and directive pages 2010-05-19 11:25:43 +00:00
http://kerravonsen.dreamwidth.org/ 9b45264c1c new version 2010-05-19 11:20:44 +00:00
http://kerravonsen.dreamwidth.org/ f463cde12e new version 2010-05-19 11:18:35 +00:00
Joey Hess 92fa3f63d4 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-05-17 13:13:43 -04:00
http://jmtd.livejournal.com/ 4518fbe1c1 link CC0 (I'd never heard of it) 2010-05-17 17:13:17 +00:00
Joey Hess 4de7cdf2aa fix location 2010-05-17 13:13:11 -04:00
http://jmtd.livejournal.com/ b7777931e2 fix link 2010-05-17 17:12:22 +00:00
jwalck ddb4f24104 2010-05-17 04:56:44 +00:00
jwalck 744919eba0 2010-05-17 04:52:27 +00:00
Joey Hess 7cae295124 on javascript, plugins, and htmlscrubber 2010-05-17 00:42:52 -04:00
jwalck f2304367f6 2010-05-17 04:04:50 +00:00
jwalck 2451d39278 2010-05-17 04:03:03 +00:00
BerndZeimetz 1805bfbb5d ... choose the right name.... 2010-05-12 09:21:40 +00:00
BerndZeimetz 72d7b8dc54 Add short page about contrib / tracking plugin 2010-05-12 09:20:31 +00:00
http://smcv.pseudorandom.co.uk/ 3f7ef01ca2 respond with better design 2010-05-09 18:27:58 +00:00
http://smcv.pseudorandom.co.uk/ 0594ea04a8 clarify 2010-05-09 18:13:05 +00:00
http://smcv.pseudorandom.co.uk/ 27cb77cd19 updated branch, using add_autopage to spawn viewer pages 2010-05-09 18:11:51 +00:00
Joey Hess 0f778849c6 calendar: Allow negative month to be specified. -1 is last month, etc. (And also negaitve years.) 2010-05-08 12:45:21 -04:00
Joey Hess 937b24e0cf Merge branch 'master' into commentreorg 2010-05-07 22:30:42 -04:00
Joey Hess 8f6cfbfade Removed the openidsignup option. 2010-05-07 21:33:27 -04:00
Joey Hess 3adb47ec4f Merge branch 'master' into commentreorg
Conflicts:
	debian/changelog
2010-05-07 12:42:38 -04:00
Joey Hess ea4967f184 inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching. 2010-05-06 23:20:48 -04:00
Joey Hess 121e2ffc2f Renamed postscan hook to indexhtml, to reflect its changed position.
Probably only the search plugin uses it, so this seemed safe.
2010-05-06 23:14:36 -04:00
Joey Hess d9d910f676 moved comments pending moderation
* comments: Comments pending moderation are now stored in the srcdir
  alongside accepted comments, but with a `._comment_pending` extension.
* This allows easier byhand moderation, as the "_pending" need
  only be stripped off and the comment be committed to version control.
* The `comment_pending()` pagespec can be used to match such unmoderated
  comments, which makes it easy to add a feed of them, or a counter
  indicating how many there are.
* Belatedly added a `comment()` pagespec.
2010-05-06 20:05:53 -04:00
Joey Hess 7f64ff2ae0 url to myopenid affiliate program has changed 2010-05-06 17:32:19 -04:00
Joey Hess 9699f16b51 websetup: Only display Setup button on admins' preferences page.
Renamed it from "Wiki Setup" to just "Setup" for good measure.
2010-05-03 13:59:43 -04:00
Joey Hess 2f22ee85e5 Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary links to the action bar without modifying the template further.
(COMMENTSLINK and DISCUSSIONLINK could be folded into this, but are kept
separate for now to avoid breaking modified templates.)
2010-05-03 12:46:52 -04:00
Joey Hess 970373548f Add parameter to displaytime to specify that it is a pubdate, and in html5 mode, use time tag. 2010-05-02 13:44:13 -04:00
Joey Hess c2656f08f3 template() - return params in list context
I forgot CGI::Formbuilder's horrible interface that needs template
parameters instead of a constructed object.
2010-04-24 16:15:47 -04:00
Joey Hess 7e79da7633 template docu reorg
Remove wikitemplates page; fold its contents into templates page.
Update all backlinks. Document new ability to put templates inside srcdir.
2010-04-23 16:14:33 -04:00
Joey Hess 78fd3b35a2 allow template pages to not be under templates/ 2010-04-23 15:02:07 -04:00
Joey Hess 54898d16d4 allow a bare page name to be specified as a template 2010-04-23 14:44:37 -04:00
Joey Hess abd2339312 look for templates in srcdir and underlays, first
This entailed changing template_params; it no longer takes the template
filename as its first parameter.

Add template_depends to api and replace calls to template() with
template_depends() in appropriate places, where a dependency should be
added on the template.

Other plugins don't use template(), so will need further work.

Also, includes are disabled for security. Enabling includes only when using
templates from the templatedir would be nice, but would add a lot of
complexity to the implementation.
2010-04-22 15:55:58 -04:00
Joey Hess 23d62f42bd remove add_templates option
Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.
2010-04-22 14:35:00 -04:00
Joey Hess 584391aedd clarify 2010-04-22 14:07:45 -04:00
Joey Hess 17a89d3d19 update 2010-04-21 21:57:12 -04:00
Joey Hess d048e9c64a turn on tag_autocreate by default if tagbase is set 2010-04-21 20:39:20 -04:00
Joey Hess 204c0a63f3 document tag_autocreate 2010-04-21 15:22:52 -04:00
Joey Hess 9c8761ba49 add_autofile filename should be relative to srcdir 2010-04-21 14:37:03 -04:00
Joey Hess 59ceeb5621 improve docs 2010-04-17 17:15:07 -04:00
Joey Hess ca02c57ee4 document add_autofile 2010-04-17 14:07:12 -04:00
Joey Hess dee2940c0b automatically run --gettime, and optimise it for git
* Automatically run --gettime the first time ikiwiki is run on
  a given srcdir.
* Optimise --gettime for git, so it's appropriatly screamingly
  fast. (This could be done for other backends too.)
* However, --gettime for git no longer follows renames.
* Use above to fix up timestamps on docwiki, as well as ensure that
  timestamps on basewiki files shipped in the deb are sane.
2010-04-16 18:30:56 -04:00
Joey Hess b14f84c4ac --gettime revamp
* Rename --getctime to --gettime. (The old name still works for
  backwards compatability.)
* --gettime now also looks up last modification time.
* Add rcs_getmtime to plugin API; currently only implemented
  for git.
2010-04-16 17:02:29 -04:00
Joey Hess 142e025ae4 calendar: Improved display of arrows. 2010-04-15 20:12:03 -04:00
Joey Hess 1f7175e891 sidebar: Add global_sidebars setting. 2010-04-15 17:31:50 -04:00
Joey Hess 358fa953e1 sidebar: Now a sidebar directive can be used to override the sidebar shown on a page. 2010-04-15 16:51:27 -04:00
http://kerravonsen.dreamwidth.org/ ce9cf967d0 formatting 2010-04-07 23:33:04 +00:00
http://kerravonsen.dreamwidth.org/ 15a65ffae6 further response to smcv on pagetemplates 2010-04-07 23:29:25 +00:00
http://smcv.pseudorandom.co.uk/ e46a3b7534 "safe" and "unsafe" too simplistic, I suspect 2010-04-07 17:39:04 +00:00
http://kerravonsen.dreamwidth.org/ 2e9fae5c11 response about XSS, meta and pagetemplates 2010-04-07 15:12:39 +00:00
Joey Hess d58444a3e9 note about sort and dependency types
There's a gotcha where pagespec_match_list is used with a dependency type
that is not a full content dependency, and so ikiwiki does not know that
a content change to a page that sorted too low to match needs to trigger
a rebuild, since its sort order may have changed.

Inline is mostly ok re this, as it does use content dependencies. Except
for in the case of raw mode. But then, page metadata is documented to not
be loaded, so it doesn't make sense to use sortspecs that depend on
metadata. I hope. :)
2010-04-07 00:09:22 -04:00
Joey Hess be2af2e5c1 add cpan link 2010-04-06 23:19:00 -04:00
Joey Hess bab8fec524 Merge remote branch 'smcv/ready/sort-package'
Conflicts:
	debian/NEWS
2010-04-06 23:15:33 -04:00
http://smcv.pseudorandom.co.uk/ e12cd5f293 update fieldsort plugin again; remove obsolete bug + fix note (thanks!) 2010-04-07 03:03:40 +00:00
Joey Hess f2a87addc6 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-04-06 22:59:57 -04:00
Joey Hess 3b1dd03c7e improve wording to not encourage explicitly passing undef 2010-04-06 22:57:02 -04:00
http://smcv.pseudorandom.co.uk/ 1158fe8f44 further discussion, point out potential XSS 2010-04-07 02:55:50 +00:00
Joey Hess f6fd7639da Merge remote branch 'smcv/ready/link-types' 2010-04-06 22:50:19 -04:00