summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Improve local pairing behavior when two computers both try to start the ↵Gravatar Joey Hess2013-11-02
| | | | | | | | | | | | | | | | | pairing process separately. I was able to reproduce something very like this bug by starting pairing separately on both computers under poor network conditions (ie, weak wifi on my front porch). Neither computer showed an alert for the PairReq messages it was seeing (intermittently) from the other. So, I've made a new PairReq message that has not been seen before always make the alert pop up, even if the assistant thinks it is in the middle of its own pairing process (or even another pairing process with a different box on the LAN). (This shouldn't cause a rogue PairAck to disrupt a pairing process part way through.)
* better control character sanity checkGravatar Joey Hess2013-11-02
| | | | | | | | | The msg contains a haskell-escaped string, so control characters in it can also be escaped. So this didn't work before, really. Got rid of the \n check, because current pairing messages actually do contain a \n, after the ssh public key. Don't want to break back-compatability.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-02
|\
* | fix build w/o webapp (again)Gravatar Joey Hess2013-11-02
| |
| * Added a commentGravatar http://joeyh.name/2013-11-02
| |
| * Added a commentGravatar http://joeyh.name/2013-11-02
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-11-02
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-11-02
| |
| * Added a comment: A possible solutionGravatar https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM2013-11-02
| |
| * Added a commentGravatar RaspberryPie2013-11-02
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM2013-11-02
| |
| * Added a comment: Disk space?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnt7phVzBQ0xO5rCO6sfmEmxQItmFMyqls2013-11-02
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnt7phVzBQ0xO5rCO6sfmEmxQItmFMyqls2013-11-02
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-01
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-01
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-01
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-01
| |
| * Added a comment: Raring?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-01
| |
| * Added a comment: Is there a way to specify a preferred pgp key?Gravatar https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
| |
| * Added a comment: correlation does not imply causationGravatar http://joeyh.name/2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
|/
* add news item for git-annex 4.20131101Gravatar Joey Hess2013-11-01
|
* uninit now leaves behind copies of the files, due to unannex behavior change4.20131101Gravatar Joey Hess2013-11-01
|
* update for renamed commandGravatar Joey Hess2013-11-01
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-01
|\
* | prep releaseGravatar Joey Hess2013-11-01
| |
* | fix quickcheck rangeGravatar Joey Hess2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
| |
| * Added a commentGravatar http://joeyh.name/2013-11-01
| |
* | fix handling of schedled time of 12 PMGravatar Joey Hess2013-11-01
| |
* | prune unused importGravatar Joey Hess2013-11-01
|/
* let's not have comments on the tips pageGravatar Joey Hess2013-11-01
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-01
|\
* | use a long note hereGravatar Joey Hess2013-11-01
| |
| * Added a comment: git-annex in debian 7.2Gravatar https://www.google.com/accounts/o8/id?id=AItOawk453qKaMNy-mpyVoxOs02CHCIIVFOT9l02013-11-01
| |
| * Added a commentGravatar Mebus2013-10-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-10-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-10-31
| |
| * Added a comment: salvaged logsGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-10-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2013-10-31
| |
| * Added a comment: Making "git-annex add" commit largefiles, too?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM2013-10-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2013-10-31
| |
| * Added a comment: comment 2Gravatar https://www.google.com/accounts/o8/id?id=AItOawnh6wz0pMA3NLPFg2j_I3S5JeinaOVqnng2013-10-30
| |
| * Added a comment: Non-E backend drawbacks?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM2013-10-30
| |
| * Added a comment: Bad version on HackageGravatar RaspberryPie2013-10-30
|/