]>
scripts.mit.edu Git - www/ikiwiki.git/log
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: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
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>
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 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
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
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
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
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: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: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: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
Joey Hess [Sat, 12 Jul 2008 21:40:25 +0000 (17:40 -0400)]
web commit by intrigeri: update, found a possible (random) fix
Joey Hess [Sat, 12 Jul 2008 21:32:13 +0000 (17:32 -0400)]
web commit by intrigeri: bug submission
Joey Hess [Sat, 12 Jul 2008 21:25:43 +0000 (17:25 -0400)]
web commit by intrigeri: bug submission
Joey Hess [Sat, 12 Jul 2008 21:15:08 +0000 (17:15 -0400)]
web commit by intrigeri: changed my mind, sorry
Simon McVittie [Sat, 12 Jul 2008 18:01:56 +0000 (19:01 +0100)]
Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
Joey Hess [Sat, 12 Jul 2008 17:30:54 +0000 (13:30 -0400)]
sounds good
Joey Hess [Sat, 12 Jul 2008 17:28:47 +0000 (13:28 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Simon McVittie [Sat, 12 Jul 2008 17:15:11 +0000 (18:15 +0100)]
Make aggregated items be internal pages if --aggregateinternal is used.
This addresses <http://ikiwiki.info/todo/aggregate_to_internal_pages/>
in a simple way. With this approach, a flag day is required, on which all
users of aggregated pages start to inline them using the internal() pagespec;
after that, the aggregateinternal option can safely be switched on in the
setup file (and the old aggregated pages can be deleted by hand).
Joey Hess [Sat, 12 Jul 2008 16:52:06 +0000 (12:52 -0400)]
update, splitting parameters in two
fixed some unclear descriptions
Joey Hess [Sat, 12 Jul 2008 16:43:02 +0000 (12:43 -0400)]
changelog
Simon McVittie [Sat, 12 Jul 2008 16:36:23 +0000 (17:36 +0100)]
Fix link from meta plugin to tips/howto_stop_flooding_aggregators
Simon McVittie [Sat, 12 Jul 2008 16:34:40 +0000 (17:34 +0100)]
Stop prepending urn:uuid: to guids that look like UUIDs
Simon McVittie [Sat, 12 Jul 2008 16:33:40 +0000 (17:33 +0100)]
Re-work [[meta guid=""]] documentation, and stop claiming that urn:uuid: is automatically prepended
Simon McVittie [Sat, 12 Jul 2008 16:27:54 +0000 (17:27 +0100)]
Document [[inline guid="..."]]
Simon McVittie [Sat, 12 Jul 2008 16:12:37 +0000 (17:12 +0100)]
Rename [[!inline atomid="..."]] to [[!inline guid="..."]] to be consistent with [[!meta guid="..."]], which also outputs an Atom <id>
Simon McVittie [Sat, 12 Jul 2008 14:20:28 +0000 (15:20 +0100)]
Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom <id>.
This is often the same as the feed's <link> (in which case it can be omitted) but sometimes it's a urn:uuid: URN instead.
Simon McVittie [Sat, 12 Jul 2008 14:21:37 +0000 (15:21 +0100)]
Add MIME type to Atom feeds' <link rel='self'>
Joey Hess [Sat, 12 Jul 2008 16:04:47 +0000 (12:04 -0400)]
remove example (which was lacking escaping)
Joey Hess [Sat, 12 Jul 2008 16:04:10 +0000 (12:04 -0400)]
fixed
Joey Hess [Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)]
Merge commit 'smcv/master'
Joey Hess [Sat, 12 Jul 2008 16:01:08 +0000 (12:01 -0400)]
Move yesno function out of inline and into IkiWiki core, not exported.
Joey Hess [Sat, 12 Jul 2008 16:01:05 +0000 (12:01 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Joey Hess [Sat, 12 Jul 2008 15:58:11 +0000 (11:58 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:
doc/todo/aggregate_to_internal_pages.mdwn
Joey Hess [Sat, 12 Jul 2008 15:56:44 +0000 (11:56 -0400)]
response
Joey Hess [Sat, 12 Jul 2008 15:52:54 +0000 (11:52 -0400)]
web commit by http://smcv.pseudorandom.co.uk/: reference a patch
Simon McVittie [Sat, 12 Jul 2008 14:14:47 +0000 (15:14 +0100)]
Bug fix: use &IkiWiki::pagetitle rather than nonexistent &pagetitle in meta plugin, so that PageSpecs with title(...) work again
Joey Hess [Sat, 12 Jul 2008 15:41:57 +0000 (11:41 -0400)]
credit smcv
Joey Hess [Sat, 12 Jul 2008 15:38:18 +0000 (11:38 -0400)]
web commit by http://smcv.pseudorandom.co.uk/
Joey Hess [Sat, 12 Jul 2008 15:07:52 +0000 (11:07 -0400)]
response
Joey Hess [Sat, 12 Jul 2008 14:59:45 +0000 (10:59 -0400)]
rename uuid to guid
Joey Hess [Sat, 12 Jul 2008 14:53:57 +0000 (10:53 -0400)]
document uuid
Joey Hess [Sat, 12 Jul 2008 14:49:12 +0000 (10:49 -0400)]
elide temp var
Joey Hess [Sat, 12 Jul 2008 14:43:22 +0000 (10:43 -0400)]
Merge commit 'smcv/force-uuids' into force-uuids
Joey Hess [Sat, 12 Jul 2008 14:40:31 +0000 (10:40 -0400)]
Change deb dependencies to list Text::Markdown before markdown, since the former, while slower, has a much better html parser that avoids numerous bugs.
Joey Hess [Sat, 12 Jul 2008 14:33:20 +0000 (10:33 -0400)]
greatly simplified test case
Joey Hess [Sat, 12 Jul 2008 14:31:07 +0000 (10:31 -0400)]
web commit by intrigeri: created todo, proposed to implement it - need hint to choose the best way
Joey Hess [Sat, 12 Jul 2008 14:28:19 +0000 (10:28 -0400)]
caps
Joey Hess [Sat, 12 Jul 2008 14:26:53 +0000 (10:26 -0400)]
reorg
Joey Hess [Sat, 12 Jul 2008 14:25:20 +0000 (10:25 -0400)]
move all package indo to download page
The package info was getting split between download and install.
Leave install for manual instructions.
Joey Hess [Sat, 12 Jul 2008 14:17:07 +0000 (10:17 -0400)]
fix link