Joey Hess [Wed, 16 Jul 2008 21:31:15 +0000 (17:31 -0400)]
Merge commit 'intrigeri/pedigree'
Joey Hess [Wed, 16 Jul 2008 20:55:40 +0000 (16:55 -0400)]
two more cases
Joey Hess [Wed, 16 Jul 2008 20:46:36 +0000 (16:46 -0400)]
some design work on rename/delete
Joey Hess [Tue, 15 Jul 2008 22:22:57 +0000 (18:22 -0400)]
web commit by mrled
Joey Hess [Tue, 15 Jul 2008 22:20:19 +0000 (18:20 -0400)]
web commit by mrled
Joey Hess [Tue, 15 Jul 2008 21:06:05 +0000 (17:06 -0400)]
web commit by intrigeri: fixed formatting (I will learn to preview before saving, some day...)
Joey Hess [Tue, 15 Jul 2008 21:04:10 +0000 (17:04 -0400)]
web commit by intrigeri: proposed patch to add a bonus "else" parameter to the map plugin
Joey Hess [Tue, 15 Jul 2008 21:00:33 +0000 (17:00 -0400)]
web commit by intrigeri: fixed git repo url formating, seems that git:// is not supported
Joey Hess [Tue, 15 Jul 2008 17:17:41 +0000 (13:17 -0400)]
web commit by http://dajul.myopenid.com/
Joey Hess [Tue, 15 Jul 2008 14:49:47 +0000 (10:49 -0400)]
web commit by intrigeri: pedigree: renamed to parentlinks, replace core parentlinks
intrigeri [Tue, 15 Jul 2008 14:25:39 +0000 (16:25 +0200)]
pedigree rename to parentlinks: rename/adapt everything
* Renamed to parentlinks every single variable or function called
pedigree
* Removed the parentlinks function from Render.pm
* Enabled the new parentlinks plugin by default
* Adapted testsuite and documentation to reflate the above facts
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Tue, 15 Jul 2008 14:09:40 +0000 (16:09 +0200)]
pedigree rename to parentlinks: renamed files, to start with
Signed-off-by: intrigeri <intrigeri@boum.org>
Joey Hess [Tue, 15 Jul 2008 11:22:55 +0000 (07:22 -0400)]
web commit by intrigeri: created wishlist for applydiff plugin
Joey Hess [Tue, 15 Jul 2008 11:19:24 +0000 (07:19 -0400)]
web commit by intrigeri: user page creation
Joey Hess [Tue, 15 Jul 2008 11:15:23 +0000 (07:15 -0400)]
web commit by intrigeri: pedigree: anounced rewrite according to new design
intrigeri [Tue, 15 Jul 2008 10:35:12 +0000 (12:35 +0200)]
pedigree: rewrote with different design
(and updated testsuite + docs accordingly)
Signed-off-by: intrigeri <intrigeri@boum.org>
Joey Hess [Tue, 15 Jul 2008 09:37:29 +0000 (05:37 -0400)]
web commit by intrigeri: pedigree: compromise?
Joey Hess [Tue, 15 Jul 2008 08:12:13 +0000 (04:12 -0400)]
web commit by http://ptecza.myopenid.com/: * Response
Joey Hess [Tue, 15 Jul 2008 03:00:29 +0000 (23:00 -0400)]
fixes
Joey Hess [Tue, 15 Jul 2008 02:45:12 +0000 (22:45 -0400)]
use prune to delete rendered files
This handles deleting empty directories too.
Joey Hess [Tue, 15 Jul 2008 02:42:22 +0000 (22:42 -0400)]
Merge commit 'smcv/aggregateinternal' into aggregateinternal
Conflicts:
doc/plugins/aggregate.mdwn
Simon McVittie [Tue, 15 Jul 2008 02:24:05 +0000 (03:24 +0100)]
Fix aggregateinternal migration so it skips expired entries, and deletes output
Joey Hess [Tue, 15 Jul 2008 01:43:05 +0000 (21:43 -0400)]
improve instructions
It's better to -refresh rather than rebuild, as this way ikiwiki deletes
all the html files rendered to destdir for the aggregated pages before.
Joey Hess [Tue, 15 Jul 2008 01:30:59 +0000 (21:30 -0400)]
closures
Joey Hess [Tue, 15 Jul 2008 01:21:16 +0000 (21:21 -0400)]
Merge branch 'master' into aggregateinternal
Joey Hess [Tue, 15 Jul 2008 01:20:48 +0000 (21:20 -0400)]
todo is not built, so don't try to check it
Joey Hess [Tue, 15 Jul 2008 01:12:03 +0000 (21:12 -0400)]
changelog
Simon McVittie [Tue, 15 Jul 2008 01:05:25 +0000 (02:05 +0100)]
Merge branch 'aggregateinternal'
Simon McVittie [Tue, 15 Jul 2008 01:01:37 +0000 (02:01 +0100)]
Leave aggregateinternal switched off in the template ikiwiki.setup
Simon McVittie [Tue, 15 Jul 2008 00:49:44 +0000 (01:49 +0100)]
Recommend aggregateinternal => 1 for new wikis, and set it in ikiwiki.setup.
Also use [[!foo]] in aggregate.mdwn.
Joey Hess [Tue, 15 Jul 2008 00:32:05 +0000 (20:32 -0400)]
response
Simon McVittie [Tue, 15 Jul 2008 00:27:17 +0000 (01:27 +0100)]
Merge commit 'origin/master'
Joey Hess [Tue, 15 Jul 2008 00:16:08 +0000 (20:16 -0400)]
fix extension name
Joey Hess [Tue, 15 Jul 2008 00:15:08 +0000 (20:15 -0400)]
Merge commit 'smcv/aggregateinternal' into aggregateinternal
Conflicts:
IkiWiki/Plugin/aggregate.pm
Simon McVittie [Tue, 15 Jul 2008 00:14:47 +0000 (01:14 +0100)]
Oops, add missing </span>
Simon McVittie [Tue, 15 Jul 2008 00:08:09 +0000 (01:08 +0100)]
Merge branch 'aggregateinternal'
Joey Hess [Tue, 15 Jul 2008 00:06:53 +0000 (20:06 -0400)]
document aggregateinternal
Simon McVittie [Tue, 15 Jul 2008 00:04:29 +0000 (01:04 +0100)]
Use _aggregated as extension for internalized aggregation
Simon McVittie [Tue, 15 Jul 2008 00:00:18 +0000 (01:00 +0100)]
Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
Simon McVittie [Mon, 14 Jul 2008 23:56:19 +0000 (00:56 +0100)]
More CSS hooks for page.tmpl.
I notice madduck.net already has a similar change :-)
Joey Hess [Mon, 14 Jul 2008 23:43:45 +0000 (19:43 -0400)]
changes to debug message printing
Joey Hess [Mon, 14 Jul 2008 23:22:16 +0000 (19:22 -0400)]
web commit by intrigeri: pedigree: answer + updated design proposal
Joey Hess [Mon, 14 Jul 2008 23:05:43 +0000 (19:05 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: ikiwiki-transition aggregateinternal $srcdir $htmlext
Simon McVittie [Mon, 14 Jul 2008 23:02:15 +0000 (00:02 +0100)]
Merge branch 'aggregateinternal'
Simon McVittie [Mon, 14 Jul 2008 22:39:22 +0000 (23:39 +0100)]
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
Simon McVittie [Mon, 14 Jul 2008 22:34:07 +0000 (23:34 +0100)]
Merge commit 'origin/master' into aggregateinternal
Joey Hess [Mon, 14 Jul 2008 21:24:54 +0000 (17:24 -0400)]
web commit by intrigeri: amend previous answer
Simon McVittie [Mon, 14 Jul 2008 21:22:39 +0000 (22:22 +0100)]
Merge branch 'master' of git://git.ikiwiki.info
Joey Hess [Mon, 14 Jul 2008 21:22:06 +0000 (17:22 -0400)]
web commit by intrigeri: pedigree: (begining of) answer
Joey Hess [Mon, 14 Jul 2008 20:08:54 +0000 (16:08 -0400)]
response
intrigeri [Mon, 14 Jul 2008 18:56:51 +0000 (20:56 +0200)]
added testsuite for the pedigree plugin
Signed-off-by: intrigeri <intrigeri@boum.org>
Joey Hess [Mon, 14 Jul 2008 20:10:47 +0000 (16:10 -0400)]
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
Joey Hess [Mon, 14 Jul 2008 20:05:10 +0000 (16:05 -0400)]
web commit by XTaran: Example hgrc, some markup, one correction of one of my previous changes
Joey Hess [Mon, 14 Jul 2008 19:57:11 +0000 (15:57 -0400)]
web commit by XTaran: Cross reference to todo/mercurial
Joey Hess [Mon, 14 Jul 2008 19:53:09 +0000 (15:53 -0400)]
web commit by XTaran: Correct information about hooks
Joey Hess [Mon, 14 Jul 2008 19:20:37 +0000 (15:20 -0400)]
fix link
Joey Hess [Mon, 14 Jul 2008 18:07:36 +0000 (14:07 -0400)]
response
Joey Hess [Mon, 14 Jul 2008 17:42:57 +0000 (13:42 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 14 Jul 2008 15:29:19 +0000 (11:29 -0400)]
web commit by http://ptecza.myopenid.com/: * Request for color plugin
Joey Hess [Mon, 14 Jul 2008 14:18:50 +0000 (10:18 -0400)]
web commit by intrigeri: added suggestion to move functionnality from the core to pedigree plugin
Joey Hess [Mon, 14 Jul 2008 14:15:53 +0000 (10:15 -0400)]
web commit by intrigeri: added link to pedigree_plugin
Joey Hess [Mon, 14 Jul 2008 14:15:37 +0000 (10:15 -0400)]
web commit by http://ptecza.myopenid.com/: * Broken URL
Joey Hess [Mon, 14 Jul 2008 14:14:13 +0000 (10:14 -0400)]
web commit by intrigeri: initial pedigree plugin proposal
intrigeri [Mon, 14 Jul 2008 13:27:03 +0000 (15:27 +0200)]
pedigree: added documentation (doc/plugins/pedigree.mdwn)
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Mon, 14 Jul 2008 12:52:34 +0000 (14:52 +0200)]
pedigree: added DISTANCE loop variable
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Mon, 14 Jul 2008 12:16:17 +0000 (14:16 +0200)]
pedigree: fix RELDEPTH in PEDIGREE_BUT_ROOT...
... at least when it's not used in the same template as
PEDIGREE_BUT_TWO_OLDEST (see Known bugs section in pedigree.mdwn for
details)
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Sun, 13 Jul 2008 19:14:29 +0000 (21:14 +0200)]
pedigree: added _but_root & _but_two_oldest loops
... after having learned a bit of Perl, knocked my head against
Perl references and arrays of hashes, tried to use some nice
functionnal programming constructs - no success - to make things
more generic... I'm back to the roots, with this simple code :)
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Sun, 13 Jul 2008 12:51:20 +0000 (14:51 +0200)]
pedigree: fixed misc bugs
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Sat, 12 Jul 2008 21:04:35 +0000 (23:04 +0200)]
added new plugin: pedigree
Signed-off-by: intrigeri <intrigeri@boum.org>
Joey Hess [Sun, 13 Jul 2008 19:46:20 +0000 (15:46 -0400)]
Cut the size of the binary package in half by excluding pages for bugs and todo items from the html shipped in it.
Joey Hess [Sun, 13 Jul 2008 19:05:34 +0000 (15:05 -0400)]
switch preprocess hooks to use error function
Joey Hess [Sun, 13 Jul 2008 18:41:40 +0000 (14:41 -0400)]
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.
Joey Hess [Sun, 13 Jul 2008 17:59:36 +0000 (13:59 -0400)]
changelog
Simon McVittie [Sun, 13 Jul 2008 14:33:44 +0000 (15:33 +0100)]
Mark bug "clear: both for .page*?" as [[done]]
Simon McVittie [Sun, 13 Jul 2008 14:32:49 +0000 (15:32 +0100)]
Merge branch 'master' of git://git.ikiwiki.info into css
Simon McVittie [Sun, 13 Jul 2008 14:32:40 +0000 (15:32 +0100)]
Merge branch 'master' of git://git.ikiwiki.info
Joey Hess [Sun, 13 Jul 2008 14:31:09 +0000 (10:31 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: Patched
Simon McVittie [Sun, 13 Jul 2008 14:29:28 +0000 (15:29 +0100)]
Merge branch 'css'
Simon McVittie [Sun, 13 Jul 2008 14:16:41 +0000 (15:16 +0100)]
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.
Simon McVittie [Sun, 13 Jul 2008 14:13:20 +0000 (15:13 +0100)]
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">
Simon McVittie [Sun, 13 Jul 2008 14:09:37 +0000 (15:09 +0100)]
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
Joey Hess [Sun, 13 Jul 2008 13:50:33 +0000 (09:50 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: on second thoughts, more changes are desirable
Joey Hess [Sun, 13 Jul 2008 13:45:59 +0000 (09:45 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: suggest solution
Joey Hess [Sun, 13 Jul 2008 12:03:27 +0000 (08:03 -0400)]
web commit by http://mornfall.myopenid.com/
Joey Hess [Sun, 13 Jul 2008 03:45:36 +0000 (23:45 -0400)]
make errors red
Joey Hess [Sun, 13 Jul 2008 03:45:21 +0000 (23:45 -0400)]
revert eval change
Joey Hess [Sun, 13 Jul 2008 03:31:27 +0000 (23:31 -0400)]
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.
Joey Hess [Sun, 13 Jul 2008 03:23:25 +0000 (23:23 -0400)]
only htmlize errors when cgi is actually running
Joey Hess [Sun, 13 Jul 2008 00:21:42 +0000 (20:21 -0400)]
convert fatal error to warning
Since perlmagick is not a hard dep, and goodstuff is enabled by default,
imgs should not crash builds
Joey Hess [Sun, 13 Jul 2008 00:20:26 +0000 (20:20 -0400)]
add perlmagick to build deps
needed since the doc wiki is using an [[img]]
Simon McVittie [Sat, 12 Jul 2008 22:01:42 +0000 (23:01 +0100)]
Merge branch 'bugs'
Simon McVittie [Sat, 12 Jul 2008 22:00:57 +0000 (23:00 +0100)]
Hopefully fix regression tests in non-English environments
Simon McVittie [Sat, 12 Jul 2008 21:56:55 +0000 (22:56 +0100)]
Merge branch 'master' of git://git.ikiwiki.info into bugs
Joey Hess [Sat, 12 Jul 2008 21:56:38 +0000 (17:56 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: I think I know what's wrong here too
Joey Hess [Sat, 12 Jul 2008 21:54:21 +0000 (17:54 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Simon McVittie [Sat, 12 Jul 2008 21:53:25 +0000 (22:53 +0100)]
Merge branch 'bugs'
Simon McVittie [Sat, 12 Jul 2008 21:52:46 +0000 (22:52 +0100)]
Add missing requirement of IkiWiki::render before starting to render things
Joey Hess [Sat, 12 Jul 2008 21:50:51 +0000 (17:50 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Joey Hess [Sat, 12 Jul 2008 21:48:41 +0000 (17:48 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Joey Hess [Sat, 12 Jul 2008 21:47:51 +0000 (17:47 -0400)]
web commit by intrigeri: initial bug submission