aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge tag '3.20120202' into trail3-integratedSimon McVittie2012-03-18
|\
| * releasing version 3.20120202Joey Hess2012-02-02
| |
| * revert change to prettydateJoey Hess2012-02-02
| | | | | | | | | | Its strftime is from Date::Format, doesn't have the problem, and using the POSIX one breaks its %o.
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for writing more thorough tests, in order to safely extract the cvsps output-parsing routine for reuse by an upcoming rcs_revert().
| | * | | | 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
| | | |\ \ \ \
| | * | | | | | Merge remaining TODO items into CVS page, and delete TODO.cvs.Amitai Schlair2012-01-30
| | | | | | | |
| * | | | | | | link addedhttps://www.google.com/accounts/o8/id?id=AItOawnpPUuwvqeRyAInHCU3a5UWxXg-iidR2Y42012-02-02
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | fix typo in LC_TIME locale lookupJoey Hess2012-02-01
| | | | | | |
| * | | | | | clean example bloghttp://smcv.pseudorandom.co.uk/2012-02-01
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This reverts commit e8dfb79a80103c70371b8c741ecac1e80936a63c
| * | | | | A comment.https://www.google.com/accounts/o8/id?id=AItOawm3nkx3XijKnsGW7VLDQW0SrfY2Hs0GKmM2012-01-31
| | |_|_|/ | |/| | |
| * | | | agreedhttp://kerravonsen.dreamwidth.org/2012-01-30
| | | | |
| * | | | there are actually reasons, yeshttp://kerravonsen.dreamwidth.org/2012-01-30
| | | | |
| * | | | remove non-ikiwiki siteJoey Hess2012-01-30
| | | | |
| * | | | Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2012-01-30
| |\ \ \ \
| | * | | | Added a commenthttp://joey.kitenet.net/2012-01-30
| | | | | |
| * | | | | remove stealthy spamJoey Hess2012-01-30
| |/ / / /
| * | | | Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2012-01-30
| |\ \ \ \
| | * | | | Added a commenthttp://joey.kitenet.net/2012-01-30
| | | | | |
| * | | | | fix typo (doubled quote)Joey Hess2012-01-30
| |/ / / /
| * | | | changelogJoey Hess2012-01-30
| | | | |
| * | | | Merge remote-tracking branch 'schmonz/portability'Joey Hess2012-01-30
| |\ \ \ \
| | * | | | Portability fixes:Amitai Schlair2012-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define overridable defaults for SYSCONFDIR and MANDIR. * Avoid GNUisms in sed(1) and cp(1).
| | * | | | When generating scripts, give them the interpreter we generated them with.Amitai Schlair2012-01-08
| | | | | |
| * | | | | cleanupJoey Hess2012-01-30
| | | | | |
| * | | | | Merge branch 'master' of ssh://git.ikiwiki.infoJoey Hess2012-01-30
| |\ \ \ \ \
| | * | | | | comment on haskell rebuildtycho garen2012-01-30
| | | | | | |
| * | | | | | fixJoey Hess2012-01-30
| | | | | | |
| * | | | | | document a bug fixJoey Hess2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original bug was introduced 24 Nov 2011.
| * | | | | | calendar, prettydate: Fix strftime encoding bugJoey Hess2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | mergedJoey Hess2012-01-30
| |/ / / / /
| * | | | | changelogJoey Hess2012-01-30
| | | | | |
| * | | | | nukeJoey Hess2012-01-30
| | | | | |
| * | | | | queryJoey Hess2012-01-30
| | | | | |
| * | | | | Revert "ignore a file that always clutters status on OS X (no known fix)"Joey Hess2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 662d256c821d85d041a7620aa0bac6144ff95af4. I sympathize, but this would prevent commits to that file everywhere else.
| * | | | | Merge remote-tracking branch 'schmonz/cvs'Joey Hess2012-01-30
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Move cvs_keyword_subst_args() down with the other internal support routines.Amitai Schlair2012-01-26
| | | | | |
| | * | | | Uncomment the CVS keyword substitution mode tests, and make them pass:Amitai Schlair2012-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract cvs_keyword_subst_args() and ensure it runs in $config{srcdir}. Using Perl's -T operator appears to work equally well, perhaps switch?
| | * | | | Mollify strictures about barewords.Amitai Schlair2012-01-26
| | | | | |
| | * | | | Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvsAmitai Schlair2012-01-25
| | |\ \ \ \
| | | * | | | Move tests that simulate web commits into test_rcs_add(), then addAmitai Schlair2012-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bunch more tests (that wind up exercising rcs_commit(), rcs_commit_staged(), and rcs_recentchanges()). Extract some support routines for brevity. Most is_in_keyword_substitution_mode() tests are commented out because there's a bug -- non-binary files are being added with "cvs add -kb". Move tests that inspect recentchanges after direct CVS operations into test_rcs_recentchanges().
| | | * | | | Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvsAmitai Schlair2012-01-24
| | | |\ \ \ \