summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* releasing version 4.201305014.20130501Gravatar Joey Hess2013-05-01
|
* Merge branch 'flush' of https://github.com/brunoqc/git-annexGravatar Joey Hess2013-05-01
|\
| * Fix the URL not showing until the app closesGravatar Bruno Bigras2013-05-01
| |
* | update for initremote changesGravatar Joey Hess2013-05-01
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c2013-05-01
| |
| * Added a comment: I think this already worksGravatar https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ2013-05-01
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c2013-05-01
| |
* | reorderGravatar Joey Hess2013-04-30
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q2013-04-30
| |
| * Added a commentGravatar http://joeyh.name/2013-04-30
|/
* thaw content directory in direct mode tooGravatar Joey Hess2013-04-30
| | | | | | | | A content directory can be frozen in direct mode. One way this can happen is if the content is transferred before direct mode has a mapping for it, so it's stored in the content directory. So, we need to thaw the content directory before doing things with it.
* updateGravatar Joey Hess2013-04-30
|
* refactorGravatar Joey Hess2013-04-30
|
* blog for the dayGravatar Joey Hess2013-04-30
|
* Added a commentGravatar http://joeyh.name/2013-04-30
|
* Added a commentGravatar http://joeyh.name/2013-04-30
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-04-30
|\
* | avoid auto-accepting pair requests from friends already paired withGravatar Joey Hess2013-04-30
| | | | | | | | | | | | | | Unless the request is for repo uuid we already know. This way, if A1 pairs with friend B1, and B1 pairs with device B2, then B1 can request A1 pair with it and no confirmation is needed. (In future, may want to try to do that automatically, to make a more robust network.)
* | updateGravatar Joey Hess2013-04-30
| |
* | assistant: Fix bug that could cause incoming pushes to not get merged into ↵Gravatar Joey Hess2013-04-30
| | | | | | | | | | | | | | | | | | | | the local tree. Observed that the pushed refs were received, but not merged into master. The merger never saw an add event for these refs. Either git is not writing to a new file and renaming it into place, or the inotify code didn't notice that. Changed it to also watch for modify events and that seems to have fixed it!
| * Added a comment: Another correctionGravatar https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo2013-04-30
| |
* | update changelogGravatar Joey Hess2013-04-30
| | | | | | | | | | | | | | | | | | Note that the note on d12b1fb179bc1744f813ea3f616d503d2b0dfe09 turned out to be wrong. Multiple repository pairing over XMPP does work, because the annex-uuid of the xmpp remote is updated to the uuid of the new repo when pairing takes place. So the push from it is accepted. (And the other UUIDs are listed in uuid.log, so pushes from those repositories also are accepted of course.)
* | more xmpp debuggingGravatar Joey Hess2013-04-30
| |
| * Added a comment: I should have thought of thisGravatar https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo2013-04-30
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-04-30
|\
* | Support building with DAV 0.4.Gravatar Joey Hess2013-04-30
| |
* | add uuid to all xmpp messagesGravatar Joey Hess2013-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Except for the actual streaming of receive-pack through XMPP, which can only run once we've gotten an appropriate uuid in a push initiation message.) Pushes are now only initiated when the initiation message comes from a known uuid. This allows multiple distinct repositories to use the same xmpp address. Note: This probably breaks initial push after xmpp pairing, because at that point we may not know about the paired uuid, and so reject the push from it. It won't break in simple cases, because the annex-uuid of the remote is checked. However, when there are multiple clients behind a single xmpp address, only uuid of the first is recorded in annex-uuid, and so any pushes from the others will be rejected (unless the first remote pushes their uuids to us beforehand.
| * poll vote (/sdcard/annex)Gravatar 92.29.247.302013-04-30
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q2013-04-30
| |
| * Added a commentGravatar https://launchpad.net/~maestro-alubia2013-04-29
| |
| * Added a comment: standalone app dmg won't open in OSX 10.8.3Gravatar https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w2013-04-29
| |
| * Added a comment: can't install git-annex on OS X Mountain Lion without ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w2013-04-29
| | | | | | | | disabling WebDAV support
| * (no commit message)Gravatar http://identi.ca/cwebber/2013-04-29
| |
| * Added a comment: Thanks!Gravatar https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw2013-04-29
| |
| * Add homepage and convert a few links to HTTPSGravatar fmarier2013-04-28
| |
| * Added a comment: My current XMPP setupGravatar fmarier2013-04-28
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-04-28
| |
* | closeGravatar Joey Hess2013-04-28
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-04-28
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-04-28
| |
| * Added a comment: My PPA (Ubuntu Precise) has git-annex 4.20130417Gravatar fmarier2013-04-27
| |
| * Added a commentGravatar http://joeyh.name/2013-04-27
| |
| * TypoGravatar Richard Hartmann2013-04-27
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-04-27
|/
* removedGravatar http://joeyh.name/2013-04-27
|
* Added a commentGravatar http://joeyh.name/2013-04-27
|
* Added a commentGravatar http://joeyh.name/2013-04-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-04-27
|\
* | blog for the dayGravatar Joey Hess2013-04-27
| |
* | Store an annex-uuid file in the bucket when setting up a new S3 remote.Gravatar Joey Hess2013-04-27
| |