Commit Graph

12289 Commits (dc3b9934d5660a085d9b5e041b7e8749493b9360)

Author SHA1 Message Date
Simon McVittie dc3b9934d5 Move trail out of the contrib directory in preparation for eventual merge 2012-03-18 17:01:45 +00:00
Simon McVittie 4e54fa1144 tagging version 3.20120202
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIVAwUATytJp8kQ2SIlEuPHAQgKeg/+MPL9KcL13f1DQUwu9TXEr7hSocn3NTa/
 LMvLJvrzqI5BGRP+jBGFG/Kn9yFt6S4gdCvpOwi1INxAanLQnaVoSLoie1teUbU3
 dxi8f3wGMBtEX+BiOi9gbjxF2v98D+Fh73O9H7newsEJiRDRor7U4EE1dWC8uidc
 d/9vhWkaDy1BlEahaU85v7RY94h5EnEzgD0Rm7wkSSr1aquQsr89OijC6SY0dEJe
 b6AunkRqsOGDrm6elSRFi6E5eStPhIu2t6GmyhpulWn5vr4PyqdWZ7jcWvDGYr+r
 v2iuses1fH8qWE1CQ6Y2XadK7Cj2IbGhaiLXp3TdbPgKnB7BS89cSWRKQ5SlvTlJ
 sUUPauhLDMqp1Cux6oUgs5T9ADTO922p1FzR3JuTkgwNLWH7UXTRuwVvtPz4aKqN
 QBmQeknTTQAxqi+DhgBK+CXM7LIt3d2TaoUFt6gl4kKt3FYzGfyh9ohhDSQniAa8
 C52InJ2X5bamz8/fIcELChg+wBT+naQrDW7V74kFKvWzIwnqfvseaF3zVqDgYLQy
 e12vL6GAdnO66VhzULU1NyH/XNvfyKEpwiKHPwCEK5wPTLweWBqjU0952GDBlUov
 PDDoQgwijnSCSxJOcEsAnnpkT16pw0VWHTSLrqkYYZBg7WGkZbhwk4cRVkqcsMK7
 JjKUdA9rK0E=
 =KLr6
 -----END PGP SIGNATURE-----

Merge tag '3.20120202' into trail3-integrated
2012-03-18 15:31:41 +00:00
Joey Hess be1cf943a6 Merge remote-tracking branch 'schmonz/cvs' 2012-02-02 01:11:45 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpPUuwvqeRyAInHCU3a5UWxXg-iidR2Y4 ec2262603c link added 2012-02-02 00:12:30 -04:00
http://smcv.pseudorandom.co.uk/ 8fe55be60d clean example blog
This reverts commit e8dfb79a80
2012-02-01 06:40:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm3nkx3XijKnsGW7VLDQW0SrfY2Hs0GKmM e8dfb79a80 A comment. 2012-01-31 00:55:11 -04:00
Amitai Schlair 8e752d0976 Merge branch 'master' into cvs 2012-01-30 19:56:51 -06:00
Amitai Schlair 51d0aa406d Merge remaining TODO items into CVS page, and delete TODO.cvs. 2012-01-30 19:52:30 -06:00
http://kerravonsen.dreamwidth.org/ 49a60b0413 agreed 2012-01-30 18:52:27 -04:00
http://kerravonsen.dreamwidth.org/ 1bae1bf4e6 there are actually reasons, yes 2012-01-30 18:39:34 -04:00
Joey Hess 3bbf0bad57 remove non-ikiwiki site 2012-01-30 15:47:09 -04:00
Joey Hess d99f065dd6 Merge branch 'master' of ssh://git.ikiwiki.info 2012-01-30 15:40:31 -04:00
Joey Hess ae55a2c9b6 remove stealthy spam 2012-01-30 15:37:01 -04:00
http://joey.kitenet.net/ 5b7730fd19 Added a comment 2012-01-30 15:34:01 -04:00
Joey Hess a568e0458e Merge branch 'master' of ssh://git.ikiwiki.info 2012-01-30 15:33:02 -04:00
Joey Hess 6c5e24f2a1 fix typo (doubled quote) 2012-01-30 15:32:18 -04:00
http://joey.kitenet.net/ b092831d85 Added a comment 2012-01-30 15:30:21 -04:00
Joey Hess 02898461f2 cleanup 2012-01-30 15:16:13 -04:00
Joey Hess c22f316ae1 Merge branch 'master' of ssh://git.ikiwiki.info 2012-01-30 15:15:28 -04:00
Joey Hess a78126c55e calendar, prettydate: Fix strftime encoding bug
strftime is a C function, it does not return decoded utf8.
Several places in ikiwiki manually decoded it, but at least two
forgot to.

Also, strftime might not return even encoded utf8, if LC_TIME is set
to a non-utf8 value. Went ahead and supported decoding whatever encoding
it uses.

The remaining direct calls to strftime() are all ones that first set
LC_TIME=C, in order to get times that are not for human display.
2012-01-30 15:09:37 -04:00
tycho garen f77784affd comment on haskell rebuild 2012-01-30 13:49:19 -05:00
Joey Hess 0ba0d09824 merged 2012-01-30 14:45:29 -04:00
Joey Hess c475269a36 query 2012-01-30 14:41:12 -04:00
Joey Hess 522b24a0f1 comments 2012-01-30 14:31:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI 24e89c6462 functional changes are underway 2012-01-29 10:25:57 -04:00
http://kerravonsen.dreamwidth.org/ d98f3ef9ac even further thought 2012-01-29 07:42:02 -04:00
http://kerravonsen.dreamwidth.org/ a47a18cde0 further thoughts 2012-01-29 05:41:47 -04:00
http://kerravonsen.dreamwidth.org/ 2b05dc6926 comment about Haskell 2012-01-29 05:34:45 -04:00
Joey Hess c6b5d3a8c9 response 2012-01-28 22:50:28 -04:00
Joey Hess e9c38d16fc cleanup 2012-01-28 22:05:59 -04:00
http://kerravonsen.dreamwidth.org/ d96d185f24 why do I always forget something? 2012-01-28 19:19:15 -04:00
http://kerravonsen.dreamwidth.org/ e925b946c8 new plugins, anyone? 2012-01-28 19:18:19 -04:00
http://kerravonsen.dreamwidth.org/ beed6aaaaf new jssearchfield directive 2012-01-28 19:11:39 -04:00
http://kerravonsen.dreamwidth.org/ a5fd547b9f new plugin "jssearchfield" 2012-01-28 19:08:55 -04:00
spalax b0d6eef321 Clearer (I hope) bug report 2012-01-28 15:13:43 -04:00
spalax cac88b738b New bug: encoding problem in calendar plugin 2012-01-28 15:09:31 -04:00
seven 53872ea80b 2012-01-28 10:37:33 -04:00
zut d05463b069 2012-01-28 06:30:47 -04:00
zut a0fe1511ed Oups 2012-01-28 06:29:27 -04:00
zut f312ff30d4 Encoding problem in french with ikiwiki-calendar 2012-01-28 06:26:51 -04:00
simonraven 4ba3c1c104 2012-01-28 06:05:44 -04:00
simonraven c0eca7ddc7 2012-01-28 05:16:52 -04:00
http://kerravonsen.dreamwidth.org/ a631d8b2a5 which came first, the chicken or the egg? 2012-01-26 23:51:04 -04:00
tycho garen 7bfa77380a comment to multi-threading discussion 2012-01-26 21:28:19 -05:00
http://kerravonsen.dreamwidth.org/ 6226d1a765 unofficial opinion 2012-01-26 21:57:21 -04:00
http://roughnecks.myopenid.com/ 0d48385bd3 2012-01-25 19:58:39 -04:00
http://smcv.pseudorandom.co.uk/ a8ded6bf1d Fix wikipedia URL: wikipedia.org, not wikimedia.org 2012-01-25 04:55:25 -04:00
Amitai Schlair 354e4aaa04 Merge branch 'master' of git://git.ikiwiki.info 2012-01-22 20:49:34 -05:00
Amitai Schlair 19280af182 pull request (no functional change, just worried I broke easy merging) 2012-01-22 20:48:40 -05:00
test f9ff7c7aae 2012-01-22 14:55:54 -04:00