mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14760 commits 13 branches 442 tags 103 MiB
Commit graph

14760 commits

This branch
This branch
All branches
Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f74bfae6a4 Added a comment: Super confused 2013-11-02 23:30:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
081ce0b4f7 2013-11-02 23:14:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f3cc842390 2013-11-02 23:12:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
26ff2f95e9 2013-11-02 23:05:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9a7838ec2c Added a comment 2013-11-02 22:59:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
c17c529c2c Added a comment 2013-11-02 22:55:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
36a8684b4e Added a comment 2013-11-02 22:52:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
6e3961a5ae Added a comment 2013-11-02 22:48:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
63f45b1f0e 2013-11-02 22:38:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3a5d760e11 Added a comment 2013-11-02 22:30:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
2c28d9ad1f Added a comment 2013-11-02 21:53:38 +00:00
Joey Hess
d87f47cdd1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 17:07:19 -04:00
Joey Hess
67df9c9e1b devblog 2013-11-02 17:05:54 -04:00
Joey Hess
768c323e74 add 2013-11-02 16:48:37 -04:00
http://joeyh.name/
6992438022 Added a comment 2013-11-02 20:39:36 +00:00
Joey Hess
7be69a2491 gcrypt, bup: Fix bug that prevented using these special remotes with encryption=pubkey. 
I think both of these are all that's affected, but I went ahead and fixed
all the remotes that set their config to M.empty to instead store the
actual config. Who knows what will expect it to be actually present in
future, the Remote instance of getGpgEncParams came to..
 2013-11-02 16:37:28 -04:00
Joey Hess
a46b653bd6 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 16:10:01 -04:00
Joey Hess
4c8454c891 title 2013-11-02 16:07:18 -04:00
http://joeyh.name/
2745d060b9 Added a comment 2013-11-02 20:03:33 +00:00
http://joeyh.name/
3639b1fe25 Added a comment 2013-11-02 19:54:45 +00:00
http://joeyh.name/
7cc73148ab Added a comment 2013-11-02 19:46:28 +00:00
http://joeyh.name/
13fbe711bd Added a comment 2013-11-02 19:42:13 +00:00
http://joeyh.name/
f859a1b838 Added a comment 2013-11-02 19:32:50 +00:00
Joey Hess
bc18cde325 sync: Work even when the local git repository is new and empty, with no master branch. 2013-11-02 15:29:38 -04:00
Joey Hess
43c47b6dbb Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 15:10:53 -04:00
Joey Hess
7e7e765cba Improve local pairing behavior when two computers both try to start the 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.)
 2013-11-02 15:10:29 -04:00
http://joeyh.name/
db41aba34b Added a comment 2013-11-02 19:02:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn2MI-Ci-bS9W5NITngsBJiL8LqWYcJ458
f9cf8e24f5 2013-11-02 18:51:43 +00:00
Joey Hess
b5ddb4f0e6 better control character sanity check 
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.
 2013-11-02 14:44:10 -04:00
http://joeyh.name/
7d4c0c8f5c Added a comment 2013-11-02 17:40:19 +00:00
Joey Hess
d92273d243 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 13:39:50 -04:00
Joey Hess
2eca7eb565 fix build w/o webapp (again) 2013-11-02 13:38:44 -04:00
http://joeyh.name/
190785adc0 Added a comment 2013-11-02 17:36:23 +00:00
http://joeyh.name/
0abe1076d2 Added a comment 2013-11-02 17:32:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
20bd2a198c Added a comment 2013-11-02 17:29:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
5ba9330d8d 2013-11-02 14:58:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
31ea392b33 Added a comment: A possible solution 2013-11-02 14:22:13 +00:00
RaspberryPie
0948b07ffc Added a comment 2013-11-02 12:52:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
777884de5a 2013-11-02 11:44:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
d69837555e Added a comment: Disk space? 2013-11-02 01:33:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
a21668a4a6 2013-11-02 01:26:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnt7phVzBQ0xO5rCO6sfmEmxQItmFMyqls
b180e49896 Added a comment 2013-11-02 01:02:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnt7phVzBQ0xO5rCO6sfmEmxQItmFMyqls
ed95619e3f Added a comment 2013-11-02 00:58:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
69a70fc49e Added a comment 2013-11-01 23:27:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
12b92ac43c Added a comment 2013-11-01 23:10:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
d4f6f05814 Added a comment 2013-11-01 22:12:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9fc83628d2 2013-11-01 22:07:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
1134cdb4b2 Added a comment: Raring? 2013-11-01 20:28:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
a8c05f1dde Added a comment: Is there a way to specify a preferred pgp key? 2013-11-01 18:57:39 +00:00
http://joeyh.name/
d756b8dec0 Added a comment 2013-11-01 16:47:18 +00:00