summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into s3-awsGravatar Joey Hess2014-08-15
|\ | | | | | | | | Conflicts: git-annex.cabal
| * Switched from the old haskell HTTP library to http-conduit.Gravatar Joey Hess2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | The hoary old HTTP library was only used when checking if an url exists, when curl was not available. It had many problems, including not supporting https at all. Now, this is done using http-conduit for all urls that it supports. Falls back to curl for any url that http-conduit doesn't like (probably ftp etc, but could also be an url that its parser chokes on for whatever reason). This adds a new dependency on http-conduit, but webdav support already indirectly depended on that, and the s3-aws branch also uses it.
| * silly markdown..Gravatar Joey Hess2014-08-15
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-08-15
| |\
| * | fix linkGravatar Joey Hess2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| |/
| * more reorgGravatar Joey Hess2014-08-15
| |
| * move cabal on OSX stuff to its own pageGravatar Joey Hess2014-08-15
| |
| * reorg, moving MacPorts to a separate pageGravatar Joey Hess2014-08-15
| |
| * closeGravatar Joey Hess2014-08-15
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-08-15
| |\
| * | git-annex-shell sendkey: Don't fail if a remote asks for a key to be sent ↵Gravatar Joey Hess2014-08-15
| | | | | | | | | | | | that already has a transfer lock file indicating it's being sent to that remote. The remote may have moved between networks, or reconnected.
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-08-15
| |\
| * | direct: Avoid leaving file content in misctemp if interrupted.Gravatar Joey Hess2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-08-15
| |\|
| * | use more generic architecture namesGravatar Joey Hess2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| * | clarify config option nameGravatar Joey Hess2014-08-15
| | |
| * | s/space/newline/Gravatar Joey Hess2014-08-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-08-15
| | |
| * | avoid warning about -XMagicHashGravatar Joey Hess2014-08-15
| | |
| * | armel autobuilder now working again!Gravatar Joey Hess2014-08-15
| | |
| | * Added a comment: Problem solvedGravatar Ganwell2014-08-14
| | |
| | * removedGravatar Ganwell2014-08-14
| | |
| | * Added a comment: Problem solvedGravatar Ganwell2014-08-14
| | |
| | * (no commit message)Gravatar Ganwell2014-08-14
| | |
| | * (no commit message)Gravatar Ganwell2014-08-14
| | |
| * | typoGravatar Joey Hess2014-08-14
| | |
| | * Added a comment: cannot connect via google apps domainGravatar https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt02014-08-14
| | |
| | * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt02014-08-14
| | |
| | * Added a comment: same issueGravatar https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt02014-08-14
| | |
| | * (no commit message)Gravatar justinl2014-08-14
| | |
| | * Added a commentGravatar EskildHustvedt2014-08-14
| | |
| * | run only 1 install job at a timeGravatar Joey Hess2014-08-13
| | | | | | | | | | | | In qemu-system-arm, more jobs seems to cause frequent qemu-related crashes.
| * | windows is more or less beta, though with some known problemsGravatar Joey Hess2014-08-13
| |/
| * git-am chooked on this because it has trailing whitespace. srsly?Gravatar Joey Hess2014-08-13
| |
| * disable HAVE_CLOCK_GETTIME to avoid needing to port librt to androidGravatar Joey Hess2014-08-13
| |
| * update git patchGravatar Joey Hess2014-08-13
| |
| * try to fix PATH so test suite will workGravatar Joey Hess2014-08-13
| |
| * clean upGravatar Joey Hess2014-08-13
| |
| * typoGravatar Joey Hess2014-08-13
| |
| * work aroud ongong transformers-compat cabal issueGravatar Joey Hess2014-08-13
| |
| * remove old ghc libsGravatar Joey Hess2014-08-13
| |
| * Merge branch 'master' of https://github.com/zyv/git-annexGravatar Joey Hess2014-08-13
| |\
| * \ Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-08-13
| |\ \