Commit Graph

1601 Commits (911184432d1ccbeb1bcee224efba99f558ba74d5)

Author SHA1 Message Date
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
http://kerravonsen.dreamwidth.org/ 121405e8aa response to Joey and smcv 2010-04-06 23:09:59 +00:00
Joey Hess 6fd59908ba comment 2010-04-06 14:06:29 -04:00
Joey Hess 089a7faff8 first question 2010-04-06 13:25:26 -04:00
http://smcv.pseudorandom.co.uk/ 2efec70c7e oops, branch returned now 2010-04-06 10:47:28 +00:00
http://kerravonsen.dreamwidth.org/ 06f58b1b88 response 2010-04-06 04:00:47 +00:00
http://kerravonsen.dreamwidth.org/ 5f8df58288 2010-04-06 03:59:09 +00:00
Simon McVittie cb8b2f80b2 Use $a and $b for SortSpec cmp callbacks 2010-04-05 22:50:51 +01:00
Joey Hess a01028ae81 txt: Add a special case for robots.txt. 2010-04-05 17:02:10 -04:00
http://smcv.pseudorandom.co.uk/ f6dde92957 advertise some bugfixes 2010-04-04 14:05:42 +00:00
http://smcv.pseudorandom.co.uk/ 834936a408 bug report + patch: unnecessary YAML::Any dependency 2010-04-04 14:03:51 +00:00
http://smcv.pseudorandom.co.uk/ 20040772ce update fieldsort plugin to be compatible with the latest version of my branch 2010-04-04 00:27:20 +00:00
Simon McVittie ef63441440 Remove tagged_is_strict option, and just behave as though it was enabled
Jon was worried about the backwards-compatibility break involved in making
tagged() not match non-tag links, but Joey seems less concerned about it.
2010-04-04 00:43:58 +01:00