Commit Graph

1145 Commits (cbddb5a4b8e0e2fb63886ad9d1cf8a087cdb83b1)

Author SHA1 Message Date
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
http://www.cse.unsw.edu.au/~willu/ 6153fd6d88 Thoughts on example setup file 2008-07-21 06:26:20 -04:00
http://harningt.eharning.us/ 375f7e5351 -- fix attr 2008-07-21 01:56:07 -04:00
Joey Hess 7f4f748c23 add 2008-07-21 00:40:50 -04:00
http://harningt.eharning.us/ a74158e717 Comment about implementation questions to add WMD for Wysiwym markdown editor 2008-07-20 23:52:43 -04:00
http://www.openidfrance.fr/beaufils 6bb934fa76 2008-07-20 20:36:27 -04:00
http://www.openidfrance.fr/beaufils 1ebcf81a32 2008-07-20 20:33:32 -04:00
http://www.openidfrance.fr/beaufils 45388ed356 2008-07-20 20:32:28 -04:00
http://www.openidfrance.fr/beaufils 359af8c197 2008-07-20 20:29:29 -04:00
http://www.openidfrance.fr/beaufils 1a9ae3b241 2008-07-20 20:25:37 -04:00
http://www.openidfrance.fr/beaufils d8d994b07c 2008-07-20 19:44:34 -04:00
bremner 1c9d3b9f5e 2008-07-20 10:26:47 -04:00
bremner ff0fc4689a describe postal-filer filter 2008-07-19 19:53:46 -04:00
bremner d52e0f08b9 shorten musings about encoding references 2008-07-19 19:47:45 -04:00
bremner 712481635a move musing about how to encode thread info 2008-07-19 19:45:49 -04:00
bremner dd24989fde oops, bad markdown fixed 2008-07-19 19:40:22 -04:00
bremner d08ba534a2 moved some discussion to discussion page 2008-07-19 19:38:29 -04:00
bremner 57501a91a9 2008-07-19 19:36:11 -04:00
Joey Hess c7b400af42 response 2008-07-19 13:17:36 -04:00
JoshTriplett d4e757b3a3 template suggestion 2008-07-19 12:43:10 -04:00
intrigeri 64295da8af thinking loud 2008-07-18 06:22:51 -04:00
intrigeri bb7e09b7a7 final congratulations & the future's just started 2008-07-17 19:42:40 -04:00
Joey Hess 17c73336bf response 2008-07-17 19:36:28 -04:00
Joey Hess 1e67780e62 response 2008-07-17 19:35:43 -04:00
intrigeri d61b9c92c5 asking for clarification 2008-07-17 19:31:32 -04:00
Joey Hess afd3126e55 dummy up an email address for web commits
Not doing so breaks cia and other things that try to parse a username out
of the email address.
2008-07-17 19:12:34 -04:00
Joey Hess 10748c2d12 web commit by http://jcflack.myopenid.com/ 2008-07-17 17:53:13 -04:00
Joey Hess ac62a47ea4 git: Put web committer name/openid/address in the git author field
The committer's email address is not used (because leaking email addresses
is not liked by many users). Closes: #451023

A "Web-commit" trailer is added, to allow telling the difference between
web commits and direct commits.
2008-07-17 16:17:15 -04:00
Joey Hess 1b46f52043 web commit by http://jcflack.myopenid.com/ 2008-07-17 15:50:25 -04:00
Joey Hess 226c4acfea web commit by http://jcflack.myopenid.com/ 2008-07-17 15:21:31 -04:00
Joey Hess fc52b0c025 further thoughts 2008-07-16 21:34:23 -04:00
Joey Hess ba1353fed2 response 2008-07-16 17:58:36 -04:00
Joey Hess 9721801af0 response 2008-07-16 17:50:51 -04:00
Joey Hess dc1cbf2c8c merged intrigeri's parentlinks plugin, close todo 2008-07-16 17:49:24 -04:00