7bba522545
Merge branch 'master' into templatemove
...
Conflicts:
doc/templates.mdwn
2010-04-23 16:43:44 -04:00
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
d822e37d0e
move template documentation to the template directive
...
allow new templates to be created via the inline that lists them
(cherry picked from commit 83703d2f4a
2010-04-23 15:33:32 -04:00
83703d2f4a
move template documentation to the template directive
...
allow new templates to be created via the inline that lists them
2010-04-23 15:32:39 -04:00
78fd3b35a2
allow template pages to not be under templates/
2010-04-23 15:02:07 -04:00
54898d16d4
allow a bare page name to be specified as a template
2010-04-23 14:44:37 -04:00
796ece2a8a
response
2010-04-23 13:30:52 -04:00
53c8bf9ed9
multiple_sidebars in a gitbranch
2010-04-23 17:28:38 +00:00
92c927cb92
half-formed thought about accessible profiling
2010-04-23 18:28:20 +01:00
4afe2d1170
add my repository in the list
2010-04-23 17:20:51 +00:00
f5466ad717
how important is perl 5.10?
2010-04-23 16:29:05 +01:00
5bc7efab7c
switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden during build
2010-04-22 23:00:33 -04:00
a2feb7d477
rename bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn to bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
2010-04-23 02:40:36 +00:00
898fc10955
2010-04-23 02:36:27 +00:00
4c99904af3
reference my branch for this
2010-04-22 16:29:49 -04:00
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
418670c7e8
map can't currently change sort ordering
2010-04-22 19:28:31 +00:00
8eac7c2ad4
2010-04-22 19:15:42 +00:00
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
584391aedd
clarify
2010-04-22 14:07:45 -04:00
ad296f90c3
add
2010-04-22 13:45:25 -04:00
1f5d1dff61
update
2010-04-22 00:42:53 -04:00
170725dc3e
update
2010-04-22 00:40:05 -04:00
3ee571390e
Merge branch 'autotag'
2010-04-22 00:34:03 -04:00
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
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
13325317a3
backlink influence data seems ok
2010-04-21 22:04:03 -04:00
17a89d3d19
update
2010-04-21 21:57:12 -04:00
09ff797682
more wrongness
2010-04-21 21:55:12 -04:00
8cf6b7abf8
link fix
2010-04-21 21:42:18 -04:00
6c5f315970
argh. head exploding.
2010-04-21 21:38:58 -04:00
557912c723
my autotag branch seems ready
2010-04-21 20:47:18 -04:00
d048e9c64a
turn on tag_autocreate by default if tagbase is set
2010-04-21 20:39:20 -04:00
20052f8882
Merge branch 'master' into autotag
...
Conflicts:
IkiWiki/Plugin/tag.pm
2010-04-21 20:19:06 -04:00
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
789e68a8b1
Merge branch 'master' into autotag
...
Conflicts:
IkiWiki/Plugin/tag.pm
2010-04-21 19:47:38 -04:00
1336a3270b
response
2010-04-21 16:36:58 -04:00
f03d3d8567
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-21 16:34:50 -04:00
463ba55dce
note re includes
2010-04-21 16:33:03 -04:00
ffe9fd8eb1
suppressing auto-creation can be quite counter-intuitive
2010-04-21 20:30:14 +00:00
b21db41978
elide an older patch that's no longer under discussion
2010-04-21 20:23:19 +00:00
760b840e8f
update
2010-04-21 16:19:16 -04:00
e9551afc5f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-21 16:14:23 -04:00
6a30b45e75
update
2010-04-21 16:07:23 -04:00
9951060f62
Merge branch 'master' into autotag
2010-04-21 15:53:59 -04:00
e3ea28f8c7
update, tag deletion bug
2010-04-21 15:53:44 -04:00
86e73e42e8
2010-04-21 19:48:31 +00:00
204c0a63f3
document tag_autocreate
2010-04-21 15:22:52 -04:00
9ed523d762
2010-04-21 19:21:38 +00:00
9fa5f71034
update; my branch is (partially) debugged now
2010-04-21 15:18:11 -04:00
e72973afdb
debugging
2010-04-21 19:07:32 +00:00
9c8761ba49
add_autofile filename should be relative to srcdir
2010-04-21 14:37:03 -04:00
0fcbcc4815
Merge branch 'master' into autotag
2010-04-21 14:21:40 -04:00
5c855b2bca
applied
2010-04-21 12:50:43 -04:00
5d2df9651f
Missing links with no CGI
2010-04-21 08:17:03 +00:00
34e8c78c1c
Merge branch 'master' into autotag
2010-04-20 18:19:00 -04:00
4b4fdc85ab
Clarifications
2010-04-20 20:18:29 +00:00
3b8f4f59d6
internal pages: the revenge?
2010-04-20 15:01:39 +00:00
52ccc03d10
clarify whether the raw files would be put in destdir
2010-04-20 15:40:10 +01:00
1171851934
similarity to internal pages
2010-04-20 01:32:19 -04:00
563428ebd2
response
2010-04-19 23:52:16 -04:00
529929e732
non comprend
2010-04-20 02:45:14 +00:00
fda191cbbb
formatting
2010-04-20 02:43:44 +00:00
16afa9e844
further clarification
2010-04-20 02:41:13 +00:00
9f00692a79
response
2010-04-19 22:37:55 -04:00
09c647c177
response
2010-04-20 02:31:00 +00:00
65510a3c05
Merge branch 'master' of git://git.ikiwiki.info
2010-04-19 16:13:10 -07:00
e1ebdda72b
Remove www prefix from Svend's website URLs
2010-04-19 16:12:09 -07:00
7c0a2830f2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-19 16:04:49 -04:00
1b7c455f4a
thinking about changing how templatedir works and allowing wikitemplate files into the srcdir
2010-04-19 16:03:53 -04:00
99cdd38dd5
Respond
2010-04-19 08:36:38 +00:00
63e6c00890
response to the further thoughts
2010-04-19 02:23:12 +00:00
472694b8b4
2010-04-18 12:34:20 +00:00
56bf9c04a2
2010-04-18 12:33:51 +00:00
59ceeb5621
improve docs
2010-04-17 17:15:07 -04:00
ca02c57ee4
document add_autofile
2010-04-17 14:07:12 -04:00
e289e0b4ba
recommend git
2010-04-17 14:00:25 -04:00
cd8ec309d2
bzr getmtime done
2010-04-17 13:58:31 -04:00
6f485b8f45
note that tla plugin is not being maintained
2010-04-17 13:57:59 -04:00
a1aa71efc9
document the gitbranch template
2010-04-17 13:49:20 -04:00
9fbef7e1d2
reformat
2010-04-17 13:42:50 -04:00
c721a9ef87
my autotag branch
2010-04-17 13:41:06 -04:00
7fcc0faf83
few more suggestions
2010-04-17 12:45:20 -04:00
c769a33392
autoindex: Switch to using %wikistate instead of abusing $pagestate{index}.
2010-04-17 12:20:50 -04:00
c6c03768da
add list of compatability breaking changes
2010-04-16 19:42:18 -04:00
e31b1b27f8
remove note about needing --gettime; automatically run on first build now
2010-04-16 19:25:25 -04:00
b13bb0c83c
implement rcs_getmtime for svn
...
This is a slow implementation; it runs svn log once per file
still, rather than running svn log once on the whole srcdir.
I did it this way because in my experience, svn log, run on a directory,
does not always list every change to files inside that directory.
I don't know why, and I use svn as little as possible these days.
2010-04-16 18:46:20 -04:00
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
d3ebc80cd0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-16 17:53:31 -04:00
e3e245956f
typo
2010-04-16 21:48:35 +00:00
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
ff5b73163f
Proposal for tags/meta/field coalescing
2010-04-16 18:20:29 +00:00
7205228598
... and indeed there is a better way to store it
2010-04-16 17:51:51 +00:00
a70c2518af
answer to clarification.
2010-04-16 18:16:47 +02:00
49be30eae8
clarify re %pagestate persistence
2010-04-16 12:08:12 -04:00
18b39ff975
try to clarify
2010-04-16 15:31:31 +00:00
e26ac520bf
typo
2010-04-16 17:21:54 +02:00
5c263623c2
answer about the `%pagestate` of autopages.
2010-04-16 17:19:44 +02:00
208a77a977
response
2010-04-16 03:41:25 +00:00
4efc897fdf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-15 20:12:25 -04:00
142e025ae4
calendar: Improved display of arrows.
2010-04-15 20:12:03 -04:00
b5e7f7a67f
slight clarification
2010-04-15 23:39:02 +00:00
f0ed76441d
some comments about this and autoindex
2010-04-15 23:36:42 +00:00
425f6a8de2
reduce border
2010-04-15 19:21:01 -04:00
a0a472d577
fix tagspec
2010-04-15 17:57:35 -04:00
f41ebb8862
reorg
2010-04-15 17:56:36 -04:00
4c6f5a48bc
fix sidebar directive parameter handling
2010-04-15 17:50:43 -04:00
4bbbd77a48
typo
2010-04-15 17:49:32 -04:00
bbb3a8aac7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-15 17:40:18 -04:00
d63e043f0a
allow sidebar directive to enable use of sidebar page
...
This way, the example blog always has a sidebar on the index page,
but not the overhead of sidebars on all the other pages. And if a
user wants to, they can enable global_sidebars to switch to sidebars on
every page.
2010-04-15 17:38:13 -04:00
1f7175e891
sidebar: Add global_sidebars setting.
2010-04-15 17:31:50 -04:00
37a0c2d40b
add note if ikiwiki-calendar needs to be run
2010-04-15 16:55:20 -04:00
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
843ce484fc
update
2010-04-15 16:21:06 -04:00
5143d790b0
sidebar styling improvements
...
Added a visible border; tuned down the whitespace/borders.
Note the use of the -1 pixel margin-top -- this makes the sidebar appear
to hang down from the line under the actions at the top of the page.
2010-04-15 16:08:33 -04:00
3fbc9e411e
increase sidebar width from 20 to 30 ex
...
This makes it big enough to fit a month calendar.
2010-04-15 15:38:23 -04:00
baaa848f6c
CSS and templates for sidebar changed to use a class, not an id.
...
Multiple sidebars should be possible; also, I want to add a sidebar
template.
2010-04-15 15:04:17 -04:00
d6bfe2a25e
don't link to ikiwiki-calendar, broken link on basewiki
2010-04-15 14:32:53 -04:00
fe733e2a42
enhance pagestats and rework example blog front page
...
* pagestats: Class parameter can be used to override default class for
custom styling.
* pagestats: Use style=list to get a list of tags, scaled by use like
in a tag cloud. This is useful to put in a sidebar.
* Rework example blog front page.
2010-04-15 14:29:14 -04:00
3131433f64
calendar: Add archive_pagespec, which is used by ikiwiki-calendar to specify which pages to include on the calendar archive pages. (The pagespec can still also be specified on the ikiwiki-calendar command line.)
2010-04-15 13:40:53 -04:00
81ce1cf9da
remove example comments_pagespec setting
...
auto-blog.setup configures this automatically now
2010-04-15 13:38:24 -04:00
55d4e6bdce
Reply to KA about collapsing metadata functionality
2010-04-15 13:54:54 +00:00
19700c70e5
response, alternative proposal
2010-04-15 07:39:32 +00:00
2f6da5fd2b
Describe my tag type proposal
2010-04-15 07:19:47 +00:00
43ed0cd07e
note link types are now available
2010-04-14 16:04:52 -04:00
53c8e674ac
Correct comment. We want to merge the branch *doc* into branch *master* as the sample output suggests.
2010-04-14 17:38:39 +00:00
e6e77d2311
Fixed a typo.
2010-04-14 16:03:20 +00:00
766ad1cb4c
Fixed the double quotes.
2010-04-14 15:56:45 +00:00
43ad6bf961
More details on my personal preferences (as related to Ikiwiki.)
2010-04-14 15:54:49 +00:00
46551be9ef
Give a bit more details about the Wikis (now one more) I run.
2010-04-14 15:42:25 +00:00
aaaef74010
update
2010-04-12 16:46:38 -04:00
24fb346938
fix bug
2010-04-12 16:04:49 -04:00
5ce4c89dee
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-12 15:03:42 -04:00
df022df35e
implemented the other half of this
...
Writing my own sort code actually was faster than the built in sort. Whee!
(That's not supposed to happen, is it. ;)
But, I need to make sure influences are calculated alright.
2010-04-12 15:02:18 -04:00
9060cb0cf8
Space sorting orders consistently
...
Markdown interprets the empty lines resulting from [[!if]] as a request
that each <li> contain a <p>. For consistent spacing in the HTML, either
the unconditional items should have blank lines between (resulting in
each <li> having a <p>), or the conditional items should not (resulting
in messy source code, and no <li> having a <p>). I think the former
looks nicer.
2010-04-11 14:32:18 +01:00
0bfc364a7d
optimization: pagespec_match_list with no num limit matches before sorting
...
This can be a lot faster, since huge numbers of pages are not sorted
only to mostly be thrown away. It sped up a build of my blog by at least
5 minutes.
2010-04-11 01:30:03 -04:00
cecbd52938
plan for more efficient pagespec_match_list sorting
...
(smcv please note)
2010-04-11 00:30:27 -04:00
bb09a1f001
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2010-04-10 18:29:20 -04:00
d2c36a6f4b
close
2010-04-10 15:29:31 -04:00
a8761a086e
2010-04-10 07:06:06 +00:00
1c1c76c53e
close bug, was fixed in 3.20100403
2010-04-09 12:25:10 -04:00
ce9cf967d0
formatting
2010-04-07 23:33:04 +00:00
15a65ffae6
further response to smcv on pagetemplates
2010-04-07 23:29:25 +00:00
c127e964f1
expand my response
2010-04-07 21:25:26 +01:00
e46a3b7534
"safe" and "unsafe" too simplistic, I suspect
2010-04-07 17:39:04 +00:00
2e9fae5c11
response about XSS, meta and pagetemplates
2010-04-07 15:12:39 +00:00
ef1ebf6079
add peter's git repo
2010-04-07 00:28:56 -04:00
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
32ce94f5a3
close (but one question remains!)
2010-04-06 23:30:10 -04:00
04a9d8e867
remove note about more sort types possibly being available
...
Good plugins should document them :)
2010-04-06 23:26:59 -04:00
Joey Hess
privat
Jon Dowland
Jon Dowland
blipvert
http://smcv.pseudorandom.co.uk/
http://seph.myopenid.com/
http://hendry.iki.fi/
http://oblomov.myopenid.com/
http://kerravonsen.dreamwidth.org/
Svend Sorensen
PeteG
Joey Hess
Cord
David Riebenbauer
PaulePanter
http://oneingray.myopenid.com/
Simon McVittie