Joey Hess [Sun, 10 Feb 2008 17:21:20 +0000 (12:21 -0500)]
improved sanitiser test suite
Joey Hess [Sun, 10 Feb 2008 08:42:54 +0000 (03:42 -0500)]
add some more tests
Joey Hess [Sun, 10 Feb 2008 08:38:30 +0000 (03:38 -0500)]
new test case
Joey Hess [Sun, 10 Feb 2008 07:29:19 +0000 (02:29 -0500)]
improve wording and fix an example that is intentionall un-prefixed
Joey Hess [Sun, 10 Feb 2008 07:13:09 +0000 (02:13 -0500)]
fix versions
Joey Hess [Sun, 10 Feb 2008 07:11:05 +0000 (02:11 -0500)]
prefix-directives branch is merged so no need to list anymore
Josh Triplett [Sun, 10 Feb 2008 07:02:52 +0000 (23:02 -0800)]
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Josh Triplett [Sun, 10 Feb 2008 06:53:28 +0000 (22:53 -0800)]
Tighten page name regex to not allow carriage returns or line feeds
Joey Hess [Sun, 10 Feb 2008 06:12:10 +0000 (01:12 -0500)]
add news item for ikiwiki 2.31
Joey Hess [Sun, 10 Feb 2008 06:11:48 +0000 (01:11 -0500)]
releasing version 2.31
Joey Hess [Sun, 10 Feb 2008 04:05:48 +0000 (23:05 -0500)]
* Page templates can now use CTIME to show when the page was created.
Joey Hess [Sun, 10 Feb 2008 03:59:50 +0000 (22:59 -0500)]
change wording
Joey Hess [Sun, 10 Feb 2008 03:59:01 +0000 (22:59 -0500)]
reword to put the more important info (page names) nearer the front
Joey Hess [Sun, 10 Feb 2008 03:56:29 +0000 (22:56 -0500)]
note that's there's a git branch for this
Joey Hess [Sun, 10 Feb 2008 03:54:54 +0000 (22:54 -0500)]
remove random page
Josh Triplett [Sat, 9 Feb 2008 02:35:12 +0000 (18:35 -0800)]
Add --prefix-directives and --no-prefix-directives options to ikiwiki
This avoids the need to set prefix_directives with --set.
Josh Triplett [Sat, 9 Feb 2008 02:01:03 +0000 (18:01 -0800)]
Mention user wikilists in README.Debian
Josh Triplett [Sat, 9 Feb 2008 01:58:43 +0000 (17:58 -0800)]
Use plural "wikis" for consistency
Joey Hess [Fri, 8 Feb 2008 18:57:41 +0000 (13:57 -0500)]
clarify slightly
Joey Hess [Fri, 8 Feb 2008 18:52:31 +0000 (13:52 -0500)]
reply
Joey Hess [Fri, 8 Feb 2008 18:49:14 +0000 (13:49 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Fri, 8 Feb 2008 14:03:51 +0000 (09:03 -0500)]
web commit by lnussel
Joey Hess [Fri, 8 Feb 2008 03:11:54 +0000 (22:11 -0500)]
* Don't die if running with --getctime and rcs_getctime throws an error.
There are several cases (recentchanges files, aggregated files)
where some source files are not in revision control.
Joey Hess [Thu, 7 Feb 2008 23:49:39 +0000 (18:49 -0500)]
web commit by http://marcell.mars.myopenid.com/
Joey Hess [Thu, 7 Feb 2008 22:04:24 +0000 (17:04 -0500)]
web commit by greg
Joey Hess [Thu, 7 Feb 2008 22:01:36 +0000 (17:01 -0500)]
web commit by greg
Joey Hess [Thu, 7 Feb 2008 12:05:51 +0000 (07:05 -0500)]
web commit by edward.myopenid.com/: add [[todo/shortcut_with_different_link_text]] to watchlist
Josh Triplett [Thu, 7 Feb 2008 05:40:23 +0000 (21:40 -0800)]
Update status of prefix-directives branch.
Josh Triplett [Thu, 7 Feb 2008 05:25:30 +0000 (21:25 -0800)]
Add commented example of prefix_directives to sample ikiwiki.setup
Josh Triplett [Thu, 7 Feb 2008 04:00:44 +0000 (20:00 -0800)]
Allow whitespace in page names.
Spaces in page names map to underscores in file names. Newlines and
tabs follow ikiwiki's usual filename escaping rules: __10__ and __9__.
Joey Hess [Tue, 5 Feb 2008 21:18:29 +0000 (16:18 -0500)]
add ! prefix to some directives in templates, and to the recentchanges page
Joey Hess [Tue, 5 Feb 2008 21:14:38 +0000 (16:14 -0500)]
add support for prefix_directives
Joey Hess [Tue, 5 Feb 2008 21:06:50 +0000 (16:06 -0500)]
update after merge
Joey Hess [Tue, 5 Feb 2008 20:59:42 +0000 (15:59 -0500)]
Merge branch 'master' into prefix-directives
Joey Hess [Tue, 5 Feb 2008 20:18:26 +0000 (15:18 -0500)]
web commit by tschwinge: Typo and some more.
Joey Hess [Tue, 5 Feb 2008 18:54:31 +0000 (13:54 -0500)]
typos
Joey Hess [Tue, 5 Feb 2008 18:50:32 +0000 (13:50 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Tue, 5 Feb 2008 18:49:25 +0000 (13:49 -0500)]
add a page describing ikiwiki's git repo, including branches
Joey Hess [Tue, 5 Feb 2008 08:55:24 +0000 (03:55 -0500)]
web commit by edward.myopenid.com/: fix pagespec link
Joey Hess [Tue, 5 Feb 2008 08:54:23 +0000 (03:54 -0500)]
web commit by edward.myopenid.com/: add links
Joey Hess [Tue, 5 Feb 2008 08:48:24 +0000 (03:48 -0500)]
web commit by edward.myopenid.com/: fix link
Joey Hess [Tue, 5 Feb 2008 00:12:38 +0000 (19:12 -0500)]
web commit by edward.myopenid.com/: It would be nice if blog post pages could include the ctime.
Joey Hess [Mon, 4 Feb 2008 23:48:36 +0000 (18:48 -0500)]
web commit by joey.kitenet.net/: commit after preview, one last test
Joey Hess [Mon, 4 Feb 2008 23:46:34 +0000 (18:46 -0500)]
proper fix for the preview/will_render issue
Joey Hess [Mon, 4 Feb 2008 23:45:18 +0000 (18:45 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Feb 2008 23:44:54 +0000 (18:44 -0500)]
preview shouldn't show the feed buttons or post form
Joey Hess [Mon, 4 Feb 2008 23:39:18 +0000 (18:39 -0500)]
web commit by edward.myopenid.com/: had a 'atom' parameter twice
Joey Hess [Mon, 4 Feb 2008 23:36:50 +0000 (18:36 -0500)]
* inline: Add new `allowrss` and `allowatom` config options. These can be
used if you want a wiki that doesn't default to generating rss or atom
feeds, but that does allow them to be turned on for specific blogs.
Joey Hess [Mon, 4 Feb 2008 23:36:16 +0000 (18:36 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Feb 2008 23:35:54 +0000 (18:35 -0500)]
web commit by joey.kitenet.net/: turning on non-default atom feed should work now
Joey Hess [Mon, 4 Feb 2008 23:34:47 +0000 (18:34 -0500)]
note about will_render and preview
Joey Hess [Mon, 4 Feb 2008 23:09:01 +0000 (18:09 -0500)]
rm old page
Joey Hess [Mon, 4 Feb 2008 23:05:40 +0000 (18:05 -0500)]
the old code worked, suprisingly, but I prefer this form
Joey Hess [Mon, 4 Feb 2008 23:03:15 +0000 (18:03 -0500)]
further comments
Joey Hess [Mon, 4 Feb 2008 22:59:07 +0000 (17:59 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Feb 2008 22:58:23 +0000 (17:58 -0500)]
* inline: When previewing, still call will_render on rss/atom files,
just avoid actually writing the files. This is necessary because ikiwiki
saves state after a preview (in case it actually *did* write files),
and if will_render isn't called its security checks will get upset
when the page is saved. Thanks to Edward Betts for his help tracking this
tricky bug down.
Joey Hess [Mon, 4 Feb 2008 22:46:39 +0000 (17:46 -0500)]
web commit by joey.kitenet.net/: and again..
Joey Hess [Mon, 4 Feb 2008 22:46:05 +0000 (17:46 -0500)]
web commit by joey.kitenet.net/: another test commit
Joey Hess [Mon, 4 Feb 2008 22:40:10 +0000 (17:40 -0500)]
web commit by edward.myopenid.com/: do i get an error?
Joey Hess [Mon, 4 Feb 2008 22:38:49 +0000 (17:38 -0500)]
web commit by joey.kitenet.net/: test commit, only whitespace changes
Joey Hess [Mon, 4 Feb 2008 22:28:24 +0000 (17:28 -0500)]
web commit by edward.myopenid.com/: feeds="yes"
Joey Hess [Mon, 4 Feb 2008 21:50:36 +0000 (16:50 -0500)]
web commit by edward.myopenid.com/: sort="mtime"
Joey Hess [Mon, 4 Feb 2008 21:48:04 +0000 (16:48 -0500)]
web commit by edward.myopenid.com/: turn on atom
Joey Hess [Mon, 4 Feb 2008 21:46:11 +0000 (16:46 -0500)]
web commit by edward.myopenid.com/: use space instead of underscore
Joey Hess [Mon, 4 Feb 2008 21:43:49 +0000 (16:43 -0500)]
web commit by edward.myopenid.com/: create a watchlist
Joey Hess [Mon, 4 Feb 2008 11:11:50 +0000 (06:11 -0500)]
web commit by edward.myopenid.com/: prefix diff with a tab on each line so markdown treats it as code
Joey Hess [Mon, 4 Feb 2008 00:51:00 +0000 (19:51 -0500)]
move saveindex call into preview block
This call is only present to handle the case where previewing a page
actually causes files to be rendered.
Joey Hess [Mon, 4 Feb 2008 00:47:01 +0000 (19:47 -0500)]
remove another commit mail mention
Joey Hess [Sun, 3 Feb 2008 23:23:31 +0000 (18:23 -0500)]
add monotone to list
Joey Hess [Sun, 3 Feb 2008 23:16:19 +0000 (18:16 -0500)]
remove spurious EOF
Joey Hess [Sun, 3 Feb 2008 23:14:39 +0000 (18:14 -0500)]
* monotone changes by Brian May:
- On commits, replace "mtn sync" bidirectional with "mtn push" single
direction. No need to pull changes when doing a commit. mtn sync
is still called in rcs_update.
- Support for viewing differences via patches using viewmtn.
Joey Hess [Sun, 3 Feb 2008 22:48:30 +0000 (17:48 -0500)]
removing old patch that was also sent by mail
Joey Hess [Sun, 3 Feb 2008 21:48:26 +0000 (16:48 -0500)]
implement aggregate_locking design
Now aggregation will not lock the wiki. Any changes made during aggregaton are
merged in with the changed state accumulated while aggregating. A separate
lock file prevents multiple concurrent aggregators. Garbage collection
of orphaned guids is much improved. loadstate() is only called once
per process, so tricky support for reloading wiki state is not needed.
(Tested fairly thuroughly.)
Joey Hess [Sun, 3 Feb 2008 20:17:15 +0000 (15:17 -0500)]
add aggregate locking functions
Joey Hess [Sun, 3 Feb 2008 20:05:31 +0000 (15:05 -0500)]
fix broken link
Joey Hess [Sun, 3 Feb 2008 20:02:34 +0000 (15:02 -0500)]
update po files
Joey Hess [Sun, 3 Feb 2008 19:51:03 +0000 (14:51 -0500)]
* recentchanges: Exipre all *._change pages, even if the directory
they're in has changed.
Joey Hess [Sun, 3 Feb 2008 19:48:20 +0000 (14:48 -0500)]
* recentchanges: Improve handling of links on the very static changes pages
by thunking to the CGI, which can redirect to the page, or allow it to be
created if it doesn't exist.
Joey Hess [Sun, 3 Feb 2008 19:22:25 +0000 (14:22 -0500)]
prototype fix
Joey Hess [Sun, 3 Feb 2008 18:56:34 +0000 (13:56 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Sun, 3 Feb 2008 18:56:10 +0000 (13:56 -0500)]
late night thoughts on fixing aggregation locking
(still seem to make sense this morning)
Joey Hess [Sun, 3 Feb 2008 17:18:26 +0000 (12:18 -0500)]
web commit by tschwinge: Another minor bug.
Joey Hess [Sun, 3 Feb 2008 17:16:06 +0000 (12:16 -0500)]
web commit by tschwinge: Thanks!, and a bug report.
Joey Hess [Sun, 3 Feb 2008 09:28:37 +0000 (04:28 -0500)]
web commit by edward.myopenid.com/: fix broken link to http://git.or.cz/gitwiki/GitFaq
Joey Hess [Sun, 3 Feb 2008 08:25:47 +0000 (03:25 -0500)]
clear %pagestate in loadindex
This is to handle the case where loadindex is called multiple times in one run,
as when aggregating.
Joey Hess [Sun, 3 Feb 2008 08:04:19 +0000 (03:04 -0500)]
* aggregate: Revert use of forking to not save state, that was not the right
approach.
Joey Hess [Sun, 3 Feb 2008 05:32:38 +0000 (00:32 -0500)]
rm
Joey Hess [Sun, 3 Feb 2008 05:32:15 +0000 (00:32 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Joey Hess [Sun, 3 Feb 2008 05:30:38 +0000 (00:30 -0500)]
web commit by joey.kitenet.net/: poll vote (It's too slow!)
Joey Hess [Sun, 3 Feb 2008 05:30:06 +0000 (00:30 -0500)]
web commit by joey.kitenet.net/: poll vote (No opinion)
Joey Hess [Sun, 3 Feb 2008 05:29:17 +0000 (00:29 -0500)]
web commit by http://joey.kitenet.net/
Joey Hess [Sun, 3 Feb 2008 05:26:00 +0000 (00:26 -0500)]
* poll: This plugin turns out to have edited pages w/o doing any locking.
Oops. Convert it from a cgi to a sessioncgi hook, which will work
much better.
Joey Hess [Sun, 3 Feb 2008 05:23:04 +0000 (00:23 -0500)]
* cgi hooks are now run before ikiwiki state is loaded.
* This allows locking the wiki before loading state, which avoids some
tricky locking code when saving a web edit.
Joey Hess [Sun, 3 Feb 2008 05:10:28 +0000 (00:10 -0500)]
web commit by http://joey.kitenet.net/
Joey Hess [Sun, 3 Feb 2008 05:08:30 +0000 (00:08 -0500)]
test3
Joey Hess [Sun, 3 Feb 2008 05:07:24 +0000 (00:07 -0500)]
web commit by http://joey.kitenet.net/
Joey Hess [Sun, 3 Feb 2008 05:07:00 +0000 (00:07 -0500)]
web commit by http://joey.kitenet.net/
Joey Hess [Sun, 3 Feb 2008 05:02:49 +0000 (00:02 -0500)]
thoughts on mtime setting
Joey Hess [Sun, 3 Feb 2008 04:56:13 +0000 (23:56 -0500)]
* aggregate: Forking a child broke the one state that mattered: Forcing
the aggregating page to be rebuilt. Fix this.
Joey Hess [Sun, 3 Feb 2008 04:41:33 +0000 (23:41 -0500)]
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info