Commit graph

11423 commits

Author SHA1 Message Date
Joey Hess
3e2d50a336 Android: Added an "Open WebApp" item to the terminal's menu. Should work for Android devices that cannot auto-open the webapp on start. 2013-05-28 18:25:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
c9bab8257f Added a comment: I should have read git annex unused first 2013-05-28 22:14:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
51698e7279 Added a comment 2013-05-28 19:21:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
6a188b3ef1 2013-05-28 17:57:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
c7809ac380 2013-05-28 17:44:55 +00:00
http://mey.vn/
2b61bcbfc0 Added a comment: libc6 dep version on amd64 2013-05-28 15:28:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
43a0beba03 Added a comment: Possible quick solution with rsync 2013-05-28 10:52:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
69977400e6 2013-05-28 09:20:27 +00:00
Richard Hartmann
8aaf2023fa Typos 2013-05-28 09:10:06 +02:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
c440f3da46 Added a comment 2013-05-28 06:34:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
20d84016ff Added a comment 2013-05-28 03:23:51 +00:00
EvanDeaubl
ecfef64f03 2013-05-28 00:40:13 +00:00
Joey Hess
0ab9b9d0db Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-27 19:41:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
bf96c07b2e Added a comment 2013-05-27 22:24:44 +00:00
Joey Hess
2afca7a8f6 blog for the da 2013-05-27 18:18:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
21177c7f90 2013-05-27 21:26:21 +00:00
Joey Hess
edc3bf2347 fix a minor fd leak 2013-05-27 16:48:41 -04:00
http://joeyh.name/
eb50fa086f Added a comment 2013-05-27 19:14:37 +00:00
http://joeyh.name/
1cd15390a0 Added a comment 2013-05-27 19:09:50 +00:00
Joey Hess
853ec68253 avoid debug logging unknown xmpp messages, which may contain sensative information 2013-05-27 15:00:07 -04:00
http://joeyh.name/
1b033f36ae Added a comment 2013-05-27 18:47:17 +00:00
Joey Hess
014af3c33c Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-27 14:37:16 -04:00
Joey Hess
d8d46c3ba3 when xmpp connection fails, show the host(s) it tried to connect to 2013-05-27 14:36:20 -04:00
http://joeyh.name/
152c1aab39 Added a comment 2013-05-27 18:35:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
ad9ba6fc97 Added a comment 2013-05-27 18:13:43 +00:00
Joey Hess
5a678244e2 avoid duplicate srv lookup when testing xmpp 2013-05-27 13:48:24 -04:00
http://joeyh.name/
a9a7d14457 Added a comment 2013-05-27 15:31:53 +00:00
Joey Hess
eba9ee5bc6 remove debug print 2013-05-27 11:18:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
51280d3fee 2013-05-27 11:04:44 +00:00
http://sam.mingolelli.pip.verisignlabs.com/
55475186a9 initial add 2013-05-27 09:06:53 +00:00
79.207.25.10
2928fdb466 poll vote (/sdcard/annex) 2013-05-27 06:39:56 +00:00
http://joeyh.name/
d4bf0c3d0b Added a comment 2013-05-27 05:03:05 +00:00
http://edheil.wordpress.com/
73147c497a Added a comment 2013-05-27 01:57:25 +00:00
http://joeyh.name/
b1d8cf2da4 Added a comment 2013-05-27 01:48:43 +00:00
Joey Hess
1b5309d6d8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-26 21:45:50 -04:00
http://tiker.net/openid/
dfdabe001e 2013-05-27 01:41:39 +00:00
Joey Hess
c15a0b796e 3 more fd leaks 2013-05-26 21:27:44 -04:00
http://edheil.wordpress.com/
ec8ea4e7f1 2013-05-27 01:24:25 +00:00
Joey Hess
c092b4fc16 XMPP: Fix a file descriptor leak. 2013-05-26 20:49:16 -04:00
Joey Hess
18b92f97fe blog for the 1/2 day 2013-05-26 18:42:50 -04:00
Joey Hess
f1cce62283 fix merge conflict resolution when both sides have the same key
Still need to git rm the old file so git accepts the merge is resolved.
2013-05-26 18:32:11 -04:00
Joey Hess
749beb5899 fix Android build, broken for 2 days 2013-05-26 18:14:03 -04:00
Joey Hess
2180068e30 correct recent fix
fc37456d0fe1fb0fd3e33338223977b3e7a940bb's fix caused it to try to stage a
symlink in .git/annex/tmp, oops
2013-05-26 18:10:07 -04:00
Joey Hess
919a7d7316 sync: Fix double merge conflict resolution handling.
Ie, when there'a a conflicted merge we may get foo.variant-xxxx
created in a merge. If a second merge conflict occurs on that new file,
it was not falling back to putting in the whole key (which should stop
the merge conflicts happening for good, but is ugly).
2013-05-26 17:42:15 -04:00
Joey Hess
bd8f358e6d typo 2013-05-26 17:12:03 -04:00
Joey Hess
f857c44b45 avoid redundant CanPush messages with different shas being queued up 2013-05-26 17:09:23 -04:00
Joey Hess
c3cf6bef34 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-26 16:16:24 -04:00
Joey Hess
469b3859fc reduce the amount of subdirectories created by the fuzz tester to saner limit 2013-05-26 16:15:25 -04:00
Joey Hess
9978269b55 make fuzztest honor annex.diskreserve 2013-05-26 16:04:52 -04:00
Joey Hess
62c368dd7c fix warning 2013-05-26 16:02:55 -04:00