summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* use cabal macro to detect if old version of network is being usedGravatar Joey Hess2012-11-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-11
|\
* | fill inGravatar Joey Hess2012-11-11
| |
| * Added a commentGravatar http://joeyh.name/2012-11-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-11
|\
* | add a new walkthrough for xmpp pairingGravatar Joey Hess2012-11-11
| |
| * Add a request to support earlier versions of the network libraryGravatar http://peter-simons.myopenid.com/2012-11-11
| |
* | don't try to transfer data to/from XMPP remotesGravatar Joey Hess2012-11-11
| | | | | | | | | | Partition syncRemotes into ones needing git sync (ie, non-special remotes), and ones needing data sync (ie, non-XMPP remotes).
| * Added a comment: How to convert bare repositories to non-bareGravatar https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE2012-11-11
| |
* | allow both one push and one receive-pack to run at the same timeGravatar Joey Hess2012-11-11
| | | | | | | | | | | | Noticed that when pairing, sometimes both sides start to push, and the other side sends a PushRequest, and the two deadlock, neither doing anything. (Timeout eventually breaks this.) So, let both run at the same time.
* | add 120 second timeout when waiting for XMPP packetsGravatar Joey Hess2012-11-11
| |
* | added a runTimeout functionGravatar Joey Hess2012-11-11
| | | | | | | | | | | | This adds a dep on haskell's async library, but since that's been added to the recent haskell platform release, it should not be much hardship to my poor long-suffering library chasing users.
| * Added a commentGravatar http://joeyh.name/2012-11-11
| |
| * Added a comment: xmlnsGravatar http://meep.pl/2012-11-11
| |
* | where indentingGravatar Joey Hess2012-11-11
| |
* | use trustExcludeGravatar Joey Hess2012-11-11
| |
* | add trustExcludeGravatar Joey Hess2012-11-11
| |
| * doc/sync.mdwn: Typo fixGravatar Øyvind A. Holm2012-11-11
| | | | | | | | 5c945f18-2ba1-11e2-8d66-00c0a8deee11
| * Added a comment: further trackingGravatar http://christian.amsuess.com/chrysn2012-11-11
|/
* reword alertGravatar Joey Hess2012-11-10
|
* fix creation of creds directory for xmppGravatar Joey Hess2012-11-10
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-10
|\
* | blog for the dayGravatar Joey Hess2012-11-10
| |
| * (no commit message)Gravatar http://phil.0x539.de/2012-11-10
| |
* | show when a buddy is already pairedGravatar Joey Hess2012-11-10
| |
| * poll vote (Amazon Glacier)Gravatar http://phil.0x539.de/2012-11-10
| |
* | we're in month 5 already! It seems to be more cloud stuff, so far..Gravatar Joey Hess2012-11-10
| |
* | update todoGravatar Joey Hess2012-11-10
| |
| * Added a commentGravatar http://joeyh.name/2012-11-10
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-10
|\
* | set negative XMPP presence priorityGravatar Joey Hess2012-11-10
| | | | | | | | | | | | | | | | This should help prevent git-annex clients receiving messages that were intended for normal clients they're sharing the account with. Changed XMPP protocol use to always send chat messages directed at the specific client, as the negative priority blocks less directed messages.
* | avoid sending xmpp push notifications when not pushing to any remotesGravatar Joey Hess2012-11-10
| |
| * Added a commentGravatar http://phil.0x539.de/2012-11-10
|/
* full-on git-annex assistant syncing now works over XMPP!Gravatar Joey Hess2012-11-10
| | | | | | | | | | I decided to use the fallback push mode from the beginning for XMPP, since while it uses some ugly branches, it avoids the possibility of a normal push failing, and needing to pull and re-push. Due to the overhead of XMPP, and the difficulty of building such a chain of actions due to the async implementation, this seemed reasonable. It seems to work great!
* changelogGravatar Joey Hess2012-11-10
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-10
|\
* | changelogGravatar Joey Hess2012-11-10
| |
* | more refactoringGravatar Joey Hess2012-11-10
| |
* | more nice refactoringGravatar Joey Hess2012-11-10
| |
* | better data types allowed marvelous refactoringGravatar Joey Hess2012-11-10
| |
* | separate data type for push stagesGravatar Joey Hess2012-11-10
| | | | | | | | This improves type safety.
* | version gnutls d-b to avoid segfaultGravatar Joey Hess2012-11-10
| | | | | | | | debian testing still has the buggy version..
| * poll vote (Box.com)Gravatar 174.127.226.1622012-11-10
|/
* refactorGravatar Joey Hess2012-11-10
|
* use a lookup table for speedGravatar Joey Hess2012-11-10
|
* on second thought, do allow deferring StartingPushGravatar Joey Hess2012-11-10
| | | | | | My reasoning is that StartingPush could be received after another push starts being received, and it would be better to respond to it afterwards than not.
* refactorGravatar Joey Hess2012-11-10
|
* fix deferring of CanPush, and stop deferring StartingPushGravatar Joey Hess2012-11-10
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-11-10
|\
* | refactorGravatar Joey Hess2012-11-10
| |