Commit Graph

1178 Commits (190a845fe1ab44d3947f2ecdc0305a180e21e6f2)

Author SHA1 Message Date
Joey Hess 041923a89e Merge branch 'master' into autoconfig
Conflicts:

	IkiWiki/Plugin/git.pm
	debian/changelog
	po/ikiwiki.pot
2008-07-31 19:35:37 -04:00
bremner 9766bb0296 update progress report 2008-07-31 18:12:53 -04:00
bremner cbcf52064b progress report 2008-07-31 17:04:00 -04:00
Joey Hess 5569f5853d question 2008-07-31 16:36:56 -04:00
http://smcv.pseudorandom.co.uk/ 52ba1b2e04 Fix broken link 2008-07-30 20:43:10 -04:00
Joey Hess e12627e0a4 update 2008-07-30 14:44:50 -04:00
http://www.cse.unsw.edu.au/~willu/ ae04ca5546 2008-07-30 00:11:10 -04:00
Joey Hess 12c5786df4 Merge branch 'tova' into autoconfig
Conflicts:

	debian/changelog
2008-07-29 15:54:45 -04:00
http://ptecza.myopenid.com/ f44135c66b * Edition 2008-07-28 03:17:32 -04:00
http://ptecza.myopenid.com/ 0d75610f5b * Completion 2008-07-28 03:14:02 -04:00
http://ptecza.myopenid.com/ 03dfa83af2 * Progressbar plugin? 2008-07-28 03:09:43 -04:00
Joey Hess f484deabbc update 2008-07-27 16:31:22 -04:00
Joey Hess ddef0d3170 Merge branch 'master' into autoconfig
Conflicts:

	debian/changelog
	doc/todo/color_plugin.mdwn
2008-07-27 11:43:47 -04:00
http://ptecza.myopenid.com/ 4c5b83cbcf * RC2 color plugin 2008-07-27 09:30:55 -04:00
Joey Hess 4f06e7402a remove ikiwiki.setup
To generate your own, use ikiwiki -dumpsetup ikiwiki.setup

Update docs.
2008-07-26 22:55:39 -04:00
http://ptecza.myopenid.com/ 8a45362d55 * Response 2008-07-26 09:42:27 -04:00
Joey Hess af5299677e comments 2008-07-25 15:53:46 -04:00
Joey Hess 218dc370f6 mark done 2008-07-25 15:03:28 -04:00
Joey Hess 9e1c7e7d9a Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-07-25 12:17:04 -04:00
Joey Hess 99ec944766 bzr (mostly) done 2008-07-25 12:16:21 -04:00
http://ptecza.myopenid.com/ ac09f1438e * RC1 color plugin 2008-07-25 08:59:23 -04:00
Joey Hess 3640b88f95 turn on archive mode 2008-07-25 01:36:24 -04:00
Joey Hess 8f48dd2a8d resp 2008-07-24 22:09:36 -04:00
Joey Hess 36a0d984c9 fix monotone/mercurial confusion 2008-07-24 22:03:38 -04:00
http://www.cse.unsw.edu.au/~willu/ 7a070c64fa Add notes about possible security issues with rename - these look to be already covered in the source, but I wanted to make sure they're listed in the docs too. 2008-07-24 21:46:23 -04:00
Joey Hess 58e2b2c99c mercurial: Add support for rename, delete, and also diff. (William Uther) 2008-07-24 14:17:04 -04:00
Joey Hess 5a39821497 response 2008-07-24 13:11:45 -04:00
bremner 1b119351de question about license for patch 2008-07-24 05:27:25 -04:00
Joey Hess 1dec41278d updat 2008-07-23 19:47:13 -04:00
Joey Hess c9961ab1e9 add todo 2008-07-23 19:38:09 -04:00
Joey Hess 335a6a59e6 Merge branch 'master' into tova 2008-07-23 15:00:07 -04:00
bremner c1b94f7110 2008-07-22 22:02:11 -04:00
Joey Hess e5ea40bf20 updates 2008-07-22 17:52:36 -04:00
Joey Hess a759a864f3 Merge commit 'origin/master' into tova 2008-07-22 13:17:04 -04:00
http://lollipopman.myopenid.com/ 3ac17b8328 2008-07-22 09:02:45 -04:00
http://lollipopman.myopenid.com/ ee2c3290a9 2008-07-22 09:01:36 -04:00
http://lollipopman.myopenid.com/ b083b409bf 2008-07-22 08:59:53 -04:00
Joey Hess 9d5c9ce258 Merge branch 'master' into tova 2008-07-21 21:23:58 -04:00
Joey Hess fda61c9349 response 2008-07-21 18:20:55 -04:00
Joey Hess f91c2c6d77 response 2008-07-21 18:13:03 -04:00
Joey Hess 18d2403647 Merge branch 'master' into tova
Conflicts:

	debian/changelog
2008-07-21 17:27:50 -04:00
Joey Hess 20cae78ac7 update on some of the conflict cases 2008-07-21 13:56:58 -04:00
http://smcv.pseudorandom.co.uk/ 8fbe201bb3 Fix one missed instance of a directive without [[! (it was committed after I branched) 2008-07-21 13:50:59 -04:00
Joey Hess c6d1ae33d2 All rcs backends need to implement rcs_remove
(Done for svn, git.)
2008-07-21 13:41:17 -04:00
Joey Hess 3f1a81c8e5 thoughts 2008-07-21 12:08:26 -04:00
Joey Hess d5e65e582a Merge commit 'smcv/prefix'
Conflicts:

	doc/news/version_2.49.mdwn

Also fixed the newest news file (and my wikiannounce script).
2008-07-21 11:34:49 -04:00
Joey Hess b386fd2185 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2008-07-21 09:59:50 -04:00
Joey Hess 89e1e7195b elaborate on this idea 2008-07-21 07:49:07 -04:00
Simon McVittie 1ca63edde0 Migrate escaped directives (\[[) in doc/todo to have \[[! prefix 2008-07-21 12:45:54 +01:00
Simon McVittie dd87d82fbe Migrate doc/todo via prefix_directives
This is a partial commit of:
egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition
prefix_directives
2008-07-21 12:31:33 +01:00