Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | include build flags in version info when not in a repo | Joey Hess | 2013-05-01 |
| | |||
* | change the default GIT_ANNEX_ANDROID_SOURCETREE location to be in ~/tmp/ | Joey Hess | 2013-05-01 |
| | |||
* | update | Joey Hess | 2013-05-01 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-01 |
|\ | |||
* | | blog for the day | Joey Hess | 2013-05-01 |
| | | |||
| * | Two typos | Richard Hartmann | 2013-05-01 |
| | | |||
| * | Added a comment: mimetypes | https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo | 2013-05-01 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo | 2013-05-01 |
|/ | |||
* | add news item for git-annex 4.20130501 | Joey Hess | 2013-05-01 |
| | |||
* | releasing version 4.201305014.20130501 | Joey Hess | 2013-05-01 |
| | |||
* | Merge branch 'flush' of https://github.com/brunoqc/git-annex | Joey Hess | 2013-05-01 |
|\ | |||
| * | Fix the URL not showing until the app closes | Bruno Bigras | 2013-05-01 |
| | | |||
* | | update for initremote changes | Joey Hess | 2013-05-01 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c | 2013-05-01 |
| | | |||
| * | Added a comment: I think this already works | https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ | 2013-05-01 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c | 2013-05-01 |
| | | |||
* | | reorder | Joey Hess | 2013-04-30 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q | 2013-04-30 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-04-30 |
|/ | |||
* | thaw content directory in direct mode too | Joey Hess | 2013-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. | ||
* | update | Joey Hess | 2013-04-30 |
| | |||
* | refactor | Joey Hess | 2013-04-30 |
| | |||
* | blog for the day | Joey Hess | 2013-04-30 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-04-30 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-04-30 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-04-30 |
|\ | |||
* | | avoid auto-accepting pair requests from friends already paired with | Joey Hess | 2013-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.) | ||
* | | update | Joey Hess | 2013-04-30 |
| | | |||
* | | assistant: Fix bug that could cause incoming pushes to not get merged into ↵ | Joey Hess | 2013-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 correction | https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo | 2013-04-30 |
| | | |||
* | | update changelog | Joey Hess | 2013-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 debugging | Joey Hess | 2013-04-30 |
| | | |||
| * | Added a comment: I should have thought of this | https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo | 2013-04-30 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-04-30 |
|\ | |||
* | | Support building with DAV 0.4. | Joey Hess | 2013-04-30 |
| | | |||
* | | add uuid to all xmpp messages | Joey Hess | 2013-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) | 92.29.247.30 | 2013-04-30 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q | 2013-04-30 |
| | | |||
| * | Added a comment | https://launchpad.net/~maestro-alubia | 2013-04-29 |
| | | |||
| * | Added a comment: standalone app dmg won't open in OSX 10.8.3 | https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w | 2013-04-29 |
| | | |||
| * | Added a comment: can't install git-annex on OS X Mountain Lion without ↵ | https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w | 2013-04-29 |
| | | | | | | | | disabling WebDAV support | ||
| * | (no commit message) | http://identi.ca/cwebber/ | 2013-04-29 |
| | | |||
| * | Added a comment: Thanks! | https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw | 2013-04-29 |
| | | |||
| * | Add homepage and convert a few links to HTTPS | fmarier | 2013-04-28 |
| | | |||
| * | Added a comment: My current XMPP setup | fmarier | 2013-04-28 |
| | | |||
| * | Added a comment | http://edheil.wordpress.com/ | 2013-04-28 |
| | | |||
* | | close | Joey Hess | 2013-04-28 |
| | | |||
| * | Added a comment | http://edheil.wordpress.com/ | 2013-04-28 |
| | | |||
| * | Added a comment | http://edheil.wordpress.com/ | 2013-04-28 |
| | | |||
| * | Added a comment: My PPA (Ubuntu Precise) has git-annex 4.20130417 | fmarier | 2013-04-27 |
| | |