aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into cvsAmitai Schlair2012-02-07
|\
| * fix display of page name in recentchanges after a revertJoey Hess2012-02-07
| * testinghttp://joey.kitenet.net/2012-02-07
| * testinghttp://joey.kitenet.net/2012-02-07
* | Merge branch 'master' into cvsAmitai Schlair2012-02-07
|\|
| * Revert spamJoey Hess2012-02-07
| * Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2012-02-07
| |\
| | * (no commit message)KataMutiara2012-02-07
| | * This reverts commit 0202f169e82fcfe17e09952902e947254dd9bc82KataMutiara2012-02-07
| | * (no commit message)KataMutiara2012-02-07
| * | dude, it's a wikiJoey Hess2012-02-07
| |/
| * clarified and largely rewrittenJoey Hess2012-02-07
| * revert spamhttps://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI2012-02-07
| * (no commit message)KataMutiara2012-02-07
| * (no commit message)http://kevinmehall.net/oid/2012-02-07
* | Merge branch 'master' into cvsAmitai Schlair2012-02-05
|\|
| * Merge branch 'master' of git://git.ikiwiki.infoAmitai Schlair2012-02-05
| |\
| | * (no commit message)https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts2012-02-05
| | * (no commit message)https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts2012-02-05
| | * (no commit message)https://www.google.com/accounts/o8/id?id=AItOawnfAvT2c50LDmXkgCPJ6KmPLt8CiEIa96w2012-02-05
| * | fix rcs_add() of a text file under a name that had been a binary fileAmitai Schlair2012-02-05
| |/
* | Notes.Amitai Schlair2012-02-05
* | More testings and fixings:Amitai Schlair2012-02-05
* | Remember to run all the tests before committing!Amitai Schlair2012-02-05
* | Test checkconfig().Amitai Schlair2012-02-05
* | Test RCS Id keyword expansion on typical commit.Amitai Schlair2012-02-05
* | Merge branch 'master' into cvsAmitai Schlair2012-02-05
|\|
| * rcs_diff() would always return unbounded output, fixedAmitai Schlair2012-02-05
| * Missed a portability spot.Amitai Schlair2012-02-03
* | Notes from an evening's debugging.Amitai Schlair2012-02-05
* | Write rcs_diff() tests according to the API spec, then make them pass.Amitai Schlair2012-02-05
|/
* add news item for ikiwiki 3.20120202Joey Hess2012-02-02
* can't do that, and testing transition already resolvedJoey Hess2012-02-02
* Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2012-02-02
|\
| * (no commit message)http://jmtd.net/2012-02-02
| * Remove dead blog link and add blipfoto link insteadhttps://www.google.com/accounts/o8/id?id=AItOawl-Dfpjeo0tdkNTg42sLTYYyDGTmXE9z9M2012-02-02
| * Account for the strangeness of my committer email.Amitai Schlair2012-02-02
* | releasing version 3.20120202Joey Hess2012-02-02
* | revert change to prettydateJoey Hess2012-02-02
|/
* Merge remote-tracking branch 'schmonz/cvs'Joey Hess2012-02-02
|\
| * Update test plan, missed in previous.Amitai Schlair2012-02-01
| * Merge branch 'master' into cvsAmitai Schlair2012-02-01
| |\
| | * Merge branch 'master' of git://git.ikiwiki.infoAmitai Schlair2012-02-01
| | |\
| | * \ Merge branch 'master' of git://git.ikiwiki.infoAmitai Schlair2012-01-31
| | |\ \
| * | | | Express rcs_recentchanges() tests via utility functions, in preparationAmitai Schlair2012-02-01
| * | | | Fail a test if an rcs_receive() hook is ever defined for CVS.Amitai Schlair2012-02-01
| * | | | Extract add_and_commit(), a common test action.Amitai Schlair2012-02-01
| |/ / /
| * | | Merge branch 'master' into cvsAmitai Schlair2012-01-30
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.ikiwiki.infoAmitai Schlair2012-01-30
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:schmonz/ikiwikiAmitai Schlair2012-01-30
| | |\ \ \ \