041923a89e
Merge branch 'master' into autoconfig
...
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
2008-07-31 19:35:37 -04:00
0f312d152e
releasing version 2.56
2008-07-31 19:29:29 -04:00
d266c4dc45
Revert "increase minimum git version"
...
This reverts commit 391c5c2cb5
2008-07-31 19:24:35 -04:00
f7b8f2297c
Add test for old versions of git that don't support --cleanup=verbatim, and munge empty commit messages.
2008-07-31 19:23:54 -04:00
391c5c2cb5
increase minimum git version
...
git commit --cleanup=verbatim was first introduced in git 1.5.4.
2008-07-31 19:01:02 -04:00
71eb56bcac
merged
2008-07-31 18:52:30 -04:00
e12627e0a4
update
2008-07-30 14:44:50 -04:00
12c5786df4
Merge branch 'tova' into autoconfig
...
Conflicts:
debian/changelog
2008-07-29 15:54:45 -04:00
106578f524
changelog
2008-07-29 15:54:07 -04:00
1916afc603
rename
2008-07-27 16:08:44 -04:00
ddef0d3170
Merge branch 'master' into autoconfig
...
Conflicts:
debian/changelog
doc/todo/color_plugin.mdwn
2008-07-27 11:43:47 -04:00
ccd567948e
releasing version 2.55
2008-07-27 11:32:05 -04:00
f28b57526c
setup automator
...
"ikiwiki -setup /etc/ikiwiki/simple.setup"
can be used set up a new wiki in seconds
2008-07-27 01:39:11 -04:00
e1f7146041
avoid clobbering example diffurl
2008-07-27 00:54:15 -04:00
bc3363beb7
ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now always to add.
2008-07-27 00:02:04 -04:00
4ef96e2d99
Merge branch 'master' into autoconfig
2008-07-26 23:22:42 -04:00
ecc40d1769
changelog and tweaks
2008-07-26 23:15:50 -04:00
1c831b472b
changelog
2008-07-26 23:06:40 -04:00
e99cc6dd9e
generate an example ikiwiki.setup as part of the build
2008-07-26 23:02:46 -04:00
4f06e7402a
remove ikiwiki.setup
...
To generate your own, use ikiwiki -dumpsetup ikiwiki.setup
Update docs.
2008-07-26 22:55:39 -04:00
6154dd03cb
finish with rcs plugin conversion
2008-07-26 22:28:18 -04:00
c83fd4a328
wrapper setup reorg
...
Flattened the wrapper setup, as this lets it be handled better by the
setup generation code.
2008-07-26 21:00:11 -04:00
4ee441c152
changelog
2008-07-26 16:23:29 -04:00
b7bf566f55
attachment: Use relative paths when inserting links.
2008-07-25 19:22:29 -04:00
99ec944766
bzr (mostly) done
2008-07-25 12:16:21 -04:00
99b59f2d62
toggle: Fix incompatability between javascript and webkit.
2008-07-25 01:24:20 -04:00
36a0d984c9
fix monotone/mercurial confusion
2008-07-24 22:03:38 -04:00
58e2b2c99c
mercurial: Add support for rename, delete, and also diff. (William Uther)
2008-07-24 14:17:04 -04:00
4691a2ad39
add renamepage hooks
...
Implemented for regular wikilinks, with a test suite.
2008-07-23 18:14:20 -04:00
96dab37a8e
Merge branch 'master' into tova
2008-07-23 17:34:01 -04:00
b95669c3c8
Rebuild pages that change their type. (Gabriel McManus)
2008-07-23 16:13:37 -04:00
335a6a59e6
Merge branch 'master' into tova
2008-07-23 15:00:07 -04:00
1d1767192c
attachment: Do not escape _ when determining attachment filenames.
2008-07-23 14:58:39 -04:00
d76c10cba2
Split out error messages from editpage.tmpl into several separate templates.
2008-07-22 19:58:34 -04:00
9776bbf853
Don't allow uploading an attachment with the same name as an existing page, to avoid confusion.
2008-07-22 17:12:20 -04:00
114e20e948
typo
2008-07-22 17:03:28 -04:00
cbddb5a4b8
add rcs_commit_staged and rcs_rename
...
Implemented for git and svn so far.
Note that rcs_commit_staged does assume that the rcs has the ability to
"stage" multiple changes for a later commit. Support for this varies, but
all we really care about is staging removals and renames, which, AFAIK, all
modern rcs's support.
2008-07-22 16:14:33 -04:00
96c529826d
skeleton rename plugin
2008-07-21 22:30:43 -04:00
9d5c9ce258
Merge branch 'master' into tova
2008-07-21 21:23:58 -04:00
c2a2f71508
Add allow_symlinks_before_srcdir config setting
...
can be used to avoid a security check that is a good safe default, but
problimatic overkill in some situations.
I decided to underdocument this, because the option looks ugly, and I don't
want people randomly turning it on because it looks like a good idea. So if
you need it, you'll get an error message mentioning how to fix it.
2008-07-21 18:33:09 -04:00
e630e7507e
Avoid troublesome abs_path calls in wrapper setup
...
As documented in the forum post.
2008-07-21 18:26:14 -04:00
18d2403647
Merge branch 'master' into tova
...
Conflicts:
debian/changelog
2008-07-21 17:27:50 -04:00
c2ffd205f3
Really fix bug with links to pages with names containing colons
...
Previous fix mised a few cases.
2008-07-21 17:27:14 -04:00
09331644a2
changelog
2008-07-21 17:06:40 -04:00
b1b5860b29
touchups
2008-07-21 14:03:39 -04:00
c924c76bd8
basically, removal works
...
Still need to consider all the edge cases..
2008-07-21 13:50:12 -04:00
c6d1ae33d2
All rcs backends need to implement rcs_remove
...
(Done for svn, git.)
2008-07-21 13:41:17 -04:00
3da279ddd4
editpage: Don't show attachments link when attachments are disabled.
2008-07-21 12:15:55 -04:00
4a3e16f851
prefix_directives enabled in doc wiki, all preprocessor directives converted. (Simon McVittie)
2008-07-21 11:41:32 -04:00
fede380a89
releasing version 2.54
2008-07-21 11:19:01 -04:00
Joey Hess