Joey Hess
acb6f66fbe
closures
2008-07-14 21:30:59 -04:00
Joey Hess
40b25255ba
Merge branch 'master' into aggregateinternal
2008-07-14 21:21:16 -04:00
Joey Hess
d7da4a8e16
todo is not built, so don't try to check it
2008-07-14 21:20:48 -04:00
Joey Hess
76b078d587
changelog
2008-07-14 21:12:03 -04:00
Simon McVittie
ee16eae166
Leave aggregateinternal switched off in the template ikiwiki.setup
2008-07-15 02:01:37 +01:00
Simon McVittie
87754e3065
Recommend aggregateinternal => 1 for new wikis, and set it in ikiwiki.setup.
...
Also use [[!foo]] in aggregate.mdwn.
2008-07-15 01:49:44 +01:00
Joey Hess
6773a2514e
response
2008-07-14 20:32:05 -04:00
Joey Hess
e18002c9e9
fix extension name
2008-07-14 20:16:08 -04:00
Joey Hess
af48316b1d
Merge commit 'smcv/aggregateinternal' into aggregateinternal
...
Conflicts:
IkiWiki/Plugin/aggregate.pm
2008-07-14 20:15:08 -04:00
Simon McVittie
49fac7fbdb
Oops, add missing </span>
2008-07-15 01:14:47 +01:00
Joey Hess
3ebb012e3f
document aggregateinternal
2008-07-14 20:06:53 -04:00
Simon McVittie
302bb836f2
Use _aggregated as extension for internalized aggregation
2008-07-15 01:04:29 +01:00
Simon McVittie
e54af6e0a5
Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
2008-07-15 01:00:18 +01:00
Simon McVittie
d1eba95cdc
More CSS hooks for page.tmpl.
...
I notice madduck.net already has a similar change :-)
2008-07-15 00:56:19 +01:00
Joey Hess
51bf0ea529
changes to debug message printing
2008-07-14 19:43:45 -04:00
Joey Hess
b41cc4b15b
web commit by intrigeri: pedigree: answer + updated design proposal
2008-07-14 19:22:16 -04:00
Joey Hess
024d66bb31
web commit by http://smcv.pseudorandom.co.uk/ : ikiwiki-transition aggregateinternal $srcdir $htmlext
2008-07-14 19:05:43 -04:00
Simon McVittie
50a5ab3c4e
Add aggregateinternal mode to ikiwiki-transition.
...
Usage:
1. Update all pagespecs that use aggregated pages to use internal()
2. ikiwiki-transition aggregateinternal $srcdir $htmlext
(where $srcdir and $htmlext are the srcdir and htmlext options in
your .setup file)
3. Add aggregateinternal to your .setup file
4. Rebuild the wiki
2008-07-14 23:39:22 +01:00
Simon McVittie
18b3e970ff
Merge commit 'origin/master' into aggregateinternal
2008-07-14 23:34:07 +01:00
Joey Hess
9f79264f89
web commit by intrigeri: amend previous answer
2008-07-14 17:24:54 -04:00
Joey Hess
66053f6fc7
web commit by intrigeri: pedigree: (begining of) answer
2008-07-14 17:22:06 -04:00
Joey Hess
aecfebc26d
response
2008-07-14 17:05:52 -04:00
Joey Hess
901487df5e
web commit by XTaran: post-commit hooks work fine here at least with recent ikwiki versions and hg 1.0.x -> remove it from todo list
2008-07-14 16:10:47 -04:00
Joey Hess
be16270a09
web commit by XTaran: Example hgrc, some markup, one correction of one of my previous changes
2008-07-14 16:05:10 -04:00
Joey Hess
f6e01e53fd
web commit by XTaran: Cross reference to todo/mercurial
2008-07-14 15:57:11 -04:00
Joey Hess
aa92d75b4a
web commit by XTaran: Correct information about hooks
2008-07-14 15:53:09 -04:00
Joey Hess
5d027102f5
fix link
2008-07-14 15:20:37 -04:00
Joey Hess
d0d9ae5f8c
response
2008-07-14 14:07:36 -04:00
Joey Hess
5acfbb50aa
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2008-07-14 13:42:57 -04:00
Joey Hess
f8de860a44
web commit by http://ptecza.myopenid.com/ : * Request for color plugin
2008-07-14 11:29:19 -04:00
Joey Hess
5f4c424f3b
web commit by intrigeri: added suggestion to move functionnality from the core to pedigree plugin
2008-07-14 10:18:50 -04:00
Joey Hess
59ad1a440a
web commit by intrigeri: added link to pedigree_plugin
2008-07-14 10:15:53 -04:00
Joey Hess
a3c8465565
web commit by http://ptecza.myopenid.com/ : * Broken URL
2008-07-14 10:15:37 -04:00
Joey Hess
219e7e29a4
web commit by intrigeri: initial pedigree plugin proposal
2008-07-14 10:14:13 -04:00
Joey Hess
9957c7fd5d
Cut the size of the binary package in half by excluding pages for bugs and todo items from the html shipped in it.
2008-07-13 15:46:20 -04:00
Joey Hess
ffc99f5904
switch preprocess hooks to use error function
2008-07-13 15:05:34 -04:00
Joey Hess
edb59cd5b9
Error handling improvement for preprocess hooks. It's now safe to call error() from such hooks; it will cause a nicely formatted error message to be inserted into the page.
2008-07-13 14:41:40 -04:00
Joey Hess
2bd4dea7f0
changelog
2008-07-13 13:59:36 -04:00
Simon McVittie
30b3b00f4f
Mark bug "clear: both for .page*?" as [[done]]
2008-07-13 15:33:44 +01:00
Simon McVittie
07de005490
Merge branch 'master' of git://git.ikiwiki.info into css
2008-07-13 15:32:49 +01:00
Joey Hess
2d6263b991
web commit by http://smcv.pseudorandom.co.uk/ : Patched
2008-07-13 10:31:09 -04:00
Simon McVittie
f6e6d561e9
Don't set clear:both on .pagedate etc., only on .pagefooter
...
This removes clear:both from the trailing metadata of inlined entries as
requested by tschwinge, but if you want that feature back, you can set
.inlinefooter { clear: both; } in local.css.
2008-07-13 15:16:41 +01:00
Simon McVittie
879d780603
Add more CSS hooks to inlinepage.tmpl
...
* Wrap everything before the content in <div class="inlineheader">
* Wrap the inlined content itself in <div class="inlinecontent">
* Wrap everything after the content in <div class="inlinefooter">
2008-07-13 15:13:20 +01:00
Simon McVittie
fe242ad996
Add more stylesheet hooks to the page template
...
* Wrap header stuff, including actions, in <div class="pageheader">
(there is already a class="header", which is a subset of this, so
using id="header" would be confusing)
* Add class="pagefooter" to the existing <div id="footer">, for symmetry
2008-07-13 15:09:37 +01:00
Joey Hess
74bc4af998
web commit by http://smcv.pseudorandom.co.uk/ : on second thoughts, more changes are desirable
2008-07-13 09:50:33 -04:00
Joey Hess
4ad9680d52
web commit by http://smcv.pseudorandom.co.uk/ : suggest solution
2008-07-13 09:45:59 -04:00
Joey Hess
a6b4d94e0c
web commit by http://mornfall.myopenid.com/
2008-07-13 08:03:27 -04:00
Joey Hess
154a572ec6
make errors red
2008-07-12 23:45:36 -04:00
Joey Hess
180c963074
revert eval change
2008-07-12 23:45:21 -04:00
Joey Hess
0b140ed1c8
avoid hardlinking files owned by others
...
If hardlinks are enabled, it would hardlink files from the underlay. That
was sorta annoying if you tried to edit by hand for some reason, so let's
not. Files that are hardlinked should be rare enough that a few extra stats
won't hurt.
2008-07-12 23:31:27 -04:00