Commit Graph

16343 Commits (98b1359e06026cb8e9b475b0063fee3a06e5d3f9)

Author SHA1 Message Date
Joey Hess b514b8d2af response 2012-02-13 12:37:08 -04:00
JoshTriplett c5ba451bb5 Linkify URLs. 2012-02-13 12:07:00 -04:00
JoshTriplett d09de3116f Support for BrowserID as an authentication plugin, ideally on by default. 2012-02-13 12:04:59 -04:00
Joey Hess 303854564e response 2012-02-13 11:58:34 -04:00
Joey Hess 021521ffc8 Merge branch 'master' of ssh://git.ikiwiki.info 2012-02-13 11:43:39 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmUWmB1M35_jviFvGPYDIH-a-_Al-7OrXM e3304d234d Change suggestion to man page. 2012-02-13 10:14:50 -04:00
http://kerravonsen.dreamwidth.org/ 204d29d925 hmmm again 2012-02-10 20:49:30 -04:00
JoshTriplett f1cee65538 Perl plugins for a Haskell program? 2012-02-10 12:43:29 -04:00
http://jamestechnotes.com/ 63494cff89 2012-02-10 12:38:01 -04:00
http://cgray.myopenid.com/ 8f8e7f112f 2012-02-10 11:19:31 -04:00
http://cgray.myopenid.com/ 68717497d3 2012-02-10 11:16:07 -04:00
http://kerravonsen.dreamwidth.org/ 53276c4d67 hmmmm 2012-02-10 01:33:46 -04:00
http://cgray.myopenid.com/ 1a163a568c 2012-02-09 22:38:20 -04:00
http://cgray.myopenid.com/ ddea0488e9 Easier if I go by my github name 2012-02-09 22:34:45 -04:00
Joey Hess 2717d9774a close 2012-02-09 16:04:16 -04:00
Joey Hess 77f8b67238 Merge branch 'master' of ssh://git.ikiwiki.info 2012-02-09 16:01:16 -04:00
http://cgray.myopenid.com/ 4a6450ca73 2012-02-09 15:01:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts 8be7c6137f 2012-02-09 04:01:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts a82afbf488 rename bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn to bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn 2012-02-09 04:01:09 -04:00
Joey Hess 38ff2b44c6 Fix a snail mail address. Closes: #659158 2012-02-08 16:07:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnp4lzWSX1pvSpwAoboehP3SSbmbQESe80 ea7e0b77f2 Added a comment: I'm trying to use OpenID without success 2012-02-08 00:54:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik 087a9d93c2 2012-02-07 15:58:10 -04:00
Joey Hess f995a7bea3 response 2012-02-07 13:22:02 -04:00
Amitai Schlair a42de69fbb Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs 2012-02-07 08:33:35 -05:00
Amitai Schlair a5e84ae3fd Merge branch 'master' into cvs 2012-02-07 08:33:32 -05:00
http://jmtd.net/ cd32099756 whoops, I meant squeeze 2012-02-07 06:05:35 -04:00
Amitai Schlair 9faa0f3c65 Merge branch 'master' into cvs 2012-02-07 02:47:24 -05:00
Joey Hess 1b6c189578 fix display of page name in recentchanges after a revert
When the wiki is in a subdir of the git repo, a web revert would show
in recentchanges as eg, doc/index, instead of just index.

This happened because decode_git_file caches a $prefix that is dependant
on the $git_dir setting, and the revert code runs with a different
$git_dir, which polluted the $prefix for later.

Fix this by adding a with_git_dir that juggles the variables properly.
2012-02-07 03:06:40 -04:00
Amitai Schlair 64aca7c30b Merge branch 'master' into cvs 2012-02-07 01:38:53 -05:00
http://joey.kitenet.net/ c29a088dd8 testing
This reverts commit 26dbe8ba9a
2012-02-07 02:31:59 -04:00
http://joey.kitenet.net/ 26dbe8ba9a testing 2012-02-07 02:30:05 -04:00
Joey Hess b2af77da34 Revert spam 2012-02-07 02:21:06 -04:00
Joey Hess 742579e109 Merge branch 'master' of ssh://git.ikiwiki.info 2012-02-07 02:20:09 -04:00
Joey Hess 4058a5857b dude, it's a wiki 2012-02-07 02:17:56 -04:00
KataMutiara 6320bfcb37 2012-02-07 02:15:51 -04:00
KataMutiara 888d2e1875 This reverts commit 0202f169e8 2012-02-07 02:15:04 -04:00
KataMutiara 0202f169e8 2012-02-07 02:14:04 -04:00
Joey Hess 7d98038700 clarified and largely rewritten 2012-02-07 02:11:17 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI ec33211151 revert spam
This reverts commit bd17671c50
2012-02-07 02:09:03 -04:00
KataMutiara bd17671c50 2012-02-07 02:06:56 -04:00
http://kevinmehall.net/oid/ ac2f879757 2012-02-07 01:01:13 -04:00
Amitai Schlair cd7eb3e625 Merge branch 'master' into cvs 2012-02-05 16:39:32 -05:00
Amitai Schlair 4a47241a3e Merge branch 'master' of git://git.ikiwiki.info 2012-02-05 16:38:52 -05:00
Amitai Schlair 744642d374 fix rcs_add() of a text file under a name that had been a binary file 2012-02-05 16:38:15 -05:00
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts c8f7b96909 2012-02-05 17:38:12 -04:00
Amitai Schlair 37bf6114d5 Notes. 2012-02-05 16:35:29 -05:00
Amitai Schlair e45175d545 More testings and fixings:
* Test that adding a text file under a name formerly tracked as
  binary (and vice versa) gets the right keyword-substitution
  behavior.
* Explicitly set -kkv for text files to make the tests pass.
* CVS warns in these cases about "changing keyword expansion mode",
  but this is correct behavior, so filter it from stderr. Filter
  stdout the same way in case we ever want to keep any of it.
* In rcs_add(), replace comments with obviousness.
2012-02-05 16:33:49 -05:00
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts d22c764045 2012-02-05 17:32:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnfAvT2c50LDmXkgCPJ6KmPLt8CiEIa96w 69d3b14f14 2012-02-05 09:45:57 -04:00
Amitai Schlair 414ccfb1e2 Remember to run all the tests before committing! 2012-02-05 03:33:20 -05:00