Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Formatting changes. | https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q | 2013-03-08 |
| | |||
* | Report of potential git annex get problem. | https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q | 2013-03-08 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-03-08 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-03-08 |
| | |||
* | (no commit message) | guilhem | 2013-03-08 |
| | |||
* | (no commit message) | guilhem | 2013-03-08 |
| | |||
* | Added a comment | http://edheil.wordpress.com/ | 2013-03-08 |
| | |||
* | (no commit message) | guilhem | 2013-03-08 |
| | |||
* | s/Fosdem/FOSDEM/g | Richard Hartmann | 2013-03-08 |
| | |||
* | fix links | Joey Hess | 2013-03-08 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-03-08 |
|\ | |||
* | | split videos off to their own pages | Joey Hess | 2013-03-08 |
| | | |||
| * | (no commit message) | Noah | 2013-03-08 |
| | | |||
| * | (no commit message) | Noah | 2013-03-08 |
|/ | |||
* | reuse fast build for make test | Joey Hess | 2013-03-07 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-03-07 |
|\ | |||
* | | Bugfix: git annex add, when ran without any file or directory specified, ↵ | Joey Hess | 2013-03-07 |
| | | | | | | | | should add files in the current directory, but not act on unlocked files elsewhere in the tree. | ||
* | | blog for the day | Joey Hess | 2013-03-07 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q | 2013-03-07 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-03-07 |
|/ | |||
* | update | Joey Hess | 2013-03-07 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-03-07 |
|\ | |||
* | | logic error | Joey Hess | 2013-03-07 |
| | | |||
| * | (no commit message) | annexuser | 2013-03-07 |
|/ | |||
* | avoid queuing transfers that are already queued | Joey Hess | 2013-03-07 |
| | | | | | | | | I saw this happen in real life, when syncing to a newly added usb drive. I think it got scanned twice, and files were doubled in the queue. This could be optimised a little bit more, to only read from the mvar once, rather than twice. | ||
* | bugs/encryption_key_is_surprising/comment_7: add a closing brace | Philipp Kern | 2013-03-07 |
| | |||
* | Added a comment | http://phil.0x539.de/ | 2013-03-07 |
| | |||
* | fix type introduced in 9bce151d | Joey Hess | 2013-03-07 |
| | | | | | Doubled command name broke show-ref, which broke git annex sync. Re-read all of 9bce151d to check for other problems. | ||
* | note | Joey Hess | 2013-03-07 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-03-07 |
|\ | |||
| * | poll vote (It's too hard to install (please say why in comments)) | 193.96.240.2 | 2013-03-07 |
| | | |||
| * | poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!) | 193.96.240.2 | 2013-03-07 |
| | | |||
* | | empty buddy list when client is connecting | Joey Hess | 2013-03-07 |
| | | | | | | | | | | | | | | | | This is not perfect, because on loss of connection, we do not currently immediately detect it and stop the client. It has to time out, and then the buddy list will clear. The NetWatcher should detect disconnects too.. | ||
* | | remove xa | Joey Hess | 2013-03-07 |
| | | | | | | | | | | | | I have a theory that some google xmpp servers don't send prsense for xa clients, while others do. Seeing some weird lack of presence messages sometimes there. | ||
* | | add alerts while performing xmpp git push/pull | Joey Hess | 2013-03-07 |
| | | |||
| * | poll vote (Not yet in Debian sid amd64) | 139.80.40.12 | 2013-03-07 |
|/ | |||
* | assistant: Fix syncing after XMPP pairing. | Joey Hess | 2013-03-06 |
| | | | | | A missing uuid broke this, and also caused a UI glitch in the webapp's remote list. | ||
* | show when not connected to xmpp server | Joey Hess | 2013-03-06 |
| | |||
* | fixed | Joey Hess | 2013-03-06 |
| | |||
* | assistant: XMPP git pull and push requests are cached and sent when presence ↵ | Joey Hess | 2013-03-06 |
| | | | | | | | | | | | | | | | of a new client is detected. Noticed that, At startup or network reconnect, git push messages were sent, often before presence info has been gathered, so were not sent to any buddies. To fix this, keep track of which buddies have seen such messages, and when new presence is received from a buddy that has not yet seen it, resend. This is done only for push initiation messages, so very little data needs to be stored. | ||
* | todo | Joey Hess | 2013-03-06 |
| | |||
* | better xmpp debugging | Joey Hess | 2013-03-06 |
| | |||
* | avoid false alert about syncing with xmpp remote | Joey Hess | 2013-03-06 |
| | |||
* | avoid too early scanning for xmppremotes | Joey Hess | 2013-03-06 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-03-06 |
|\ | |||
| * | Added a comment | http://joeyh.name/ | 2013-03-06 |
| | | |||
* | | blog for the day | Joey Hess | 2013-03-06 |
| | | |||
* | | tag xmpp pushes with jid | Joey Hess | 2013-03-06 |
| | | | | | | | | | | | | | | | | | | | | This fixes the issue mentioned in the last commit. Turns out just collecting UUID of clients behind a XMPP remote is insufficient (although I should probably still do it for other reasons), because a single remote repo might be connected via both XMPP and local pairing. So a way is needed to know when a push was received from any client using a given XMPP remote over XMPP, as opposed to via ssh. | ||
* | | assistant: Get back in sync with XMPP remotes after network reconnection, ↵ | Joey Hess | 2013-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and on startup. Make manualPull send push requests over XMPP. When reconnecting with remotes, those that are XMPP remotes cannot immediately be pulled from and scanned, so instead maintain a set of (probably) desynced remotes, and put XMPP remotes on it. (This set could be used in other ways later, if we can detect we're out of sync with other types of remotes.) The merger handles detecting when a XMPP push is received from a desynced remote, and triggers a scan then, if they have in fact diverged. This has one known bug: A single XMPP remote can have multiple clients behind it. When this happens, only the UUID of one client is recorded as the UUID of the XMPP remote. Pushes from the other XMPP clients will not trigger a scan. If the client whose UUID is expected responds to the push request, it'll work, but when that client is offline, we're SOL. | ||
| * | Added a comment | http://kaizer.se/ | 2013-03-06 |
| | |