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
ad296f90c3
add
2010-04-22 13:45:25 -04:00
Joey Hess
1f5d1dff61
update
2010-04-22 00:42:53 -04:00
Joey Hess
170725dc3e
update
2010-04-22 00:40:05 -04:00
Joey Hess
3ee571390e
Merge branch 'autotag'
2010-04-22 00:34:03 -04:00
Joey Hess
2b175d7c1f
improved fix for depends_simple_mixup
...
Avoid adding the page matched against as an influence for
currently failing pagespec matches, while still adding
any other influences.
This avoids bloating depends_simple with lots of bogus influences when
matching eg, "!link(done)". It's only necessary for the page being tested
to be an influence of that if the page matches.
2010-04-22 00:18:20 -04:00
Joey Hess
c98414e192
added a test case for this bug
...
Further analysis suggests fixing this might not be as dreadful as I first
thought!
2010-04-21 23:08:54 -04:00
Joey Hess
13325317a3
backlink influence data seems ok
2010-04-21 22:04:03 -04:00
Joey Hess
17a89d3d19
update
2010-04-21 21:57:12 -04:00
Joey Hess
09ff797682
more wrongness
2010-04-21 21:55:12 -04:00
Joey Hess
8cf6b7abf8
link fix
2010-04-21 21:42:18 -04:00
Joey Hess
6c5f315970
argh. head exploding.
2010-04-21 21:38:58 -04:00
Joey Hess
557912c723
my autotag branch seems ready
2010-04-21 20:47:18 -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
20052f8882
Merge branch 'master' into autotag
...
Conflicts:
IkiWiki/Plugin/tag.pm
2010-04-21 20:19:06 -04:00
Joey Hess
129cd00bdb
remove broken ./tag support
...
The commit that added the (working) support for using /tag to override
tagbase also tried to make ./tag work. Problem is, tags are links,
and ./foo is not a valid link (though I think there's a wishlist about it).
So, using ./tag really resulted in tag creation links that led to a
"bad page name" error. And even if the tag were created in the right place,
the link didn't go to it.
2010-04-21 20:15:11 -04:00
Joey Hess
789e68a8b1
Merge branch 'master' into autotag
...
Conflicts:
IkiWiki/Plugin/tag.pm
2010-04-21 19:47:38 -04:00
Joey Hess
1336a3270b
response
2010-04-21 16:36:58 -04:00
Joey Hess
f03d3d8567
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-21 16:34:50 -04:00
Joey Hess
463ba55dce
note re includes
2010-04-21 16:33:03 -04:00
http://smcv.pseudorandom.co.uk/
ffe9fd8eb1
suppressing auto-creation can be quite counter-intuitive
2010-04-21 20:30:14 +00:00
http://smcv.pseudorandom.co.uk/
b21db41978
elide an older patch that's no longer under discussion
2010-04-21 20:23:19 +00:00
Joey Hess
760b840e8f
update
2010-04-21 16:19:16 -04:00
Joey Hess
e9551afc5f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-21 16:14:23 -04:00
Joey Hess
6a30b45e75
update
2010-04-21 16:07:23 -04:00
Joey Hess
9951060f62
Merge branch 'master' into autotag
2010-04-21 15:53:59 -04:00
Joey Hess
e3ea28f8c7
update, tag deletion bug
2010-04-21 15:53:44 -04:00
http://hendry.iki.fi/
86e73e42e8
2010-04-21 19:48:31 +00:00
Joey Hess
204c0a63f3
document tag_autocreate
2010-04-21 15:22:52 -04:00
http://hendry.iki.fi/
9ed523d762
2010-04-21 19:21:38 +00:00
Joey Hess
9fa5f71034
update; my branch is (partially) debugged now
2010-04-21 15:18:11 -04:00
http://hendry.iki.fi/
e72973afdb
debugging
2010-04-21 19:07:32 +00:00
Joey Hess
9c8761ba49
add_autofile filename should be relative to srcdir
2010-04-21 14:37:03 -04:00
Joey Hess
0fcbcc4815
Merge branch 'master' into autotag
2010-04-21 14:21:40 -04:00
Joey Hess
5c855b2bca
applied
2010-04-21 12:50:43 -04:00
http://oblomov.myopenid.com/
5d2df9651f
Missing links with no CGI
2010-04-21 08:17:03 +00:00
Joey Hess
34e8c78c1c
Merge branch 'master' into autotag
2010-04-20 18:19:00 -04:00
http://oblomov.myopenid.com/
4b4fdc85ab
Clarifications
2010-04-20 20:18:29 +00:00
http://smcv.pseudorandom.co.uk/
3b8f4f59d6
internal pages: the revenge?
2010-04-20 15:01:39 +00:00
Jon Dowland
52ccc03d10
clarify whether the raw files would be put in destdir
2010-04-20 15:40:10 +01:00
Joey Hess
1171851934
similarity to internal pages
2010-04-20 01:32:19 -04:00
Joey Hess
563428ebd2
response
2010-04-19 23:52:16 -04:00
http://kerravonsen.dreamwidth.org/
529929e732
non comprend
2010-04-20 02:45:14 +00:00
http://kerravonsen.dreamwidth.org/
fda191cbbb
formatting
2010-04-20 02:43:44 +00:00
http://kerravonsen.dreamwidth.org/
16afa9e844
further clarification
2010-04-20 02:41:13 +00:00
Joey Hess
9f00692a79
response
2010-04-19 22:37:55 -04:00