Commit graph

1891 commits

Author SHA1 Message Date
Joey Hess
9249c324f4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-30 14:14:56 -04:00
Joey Hess
df88c51334 add uuid to all xmpp messages
(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.
2013-04-30 13:22:55 -04:00
92.29.247.30
1f95207388 poll vote (/sdcard/annex) 2013-04-30 06:55:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw
b115839212 Added a comment: Thanks! 2013-04-29 01:24:56 +00:00
Richard Hartmann
31475cf36e Typo 2013-04-27 23:47:40 +02:00
Joey Hess
abd85d9f3d blog for the day 2013-04-27 17:05:27 -04:00
http://joeyh.name/
165fb8c571 removed 2013-04-27 17:25:19 +00:00
Joey Hess
cfaee41cf4 add 2013-04-27 12:43:58 -04:00
Joey Hess
acf8b257ba blog for the day 2013-04-26 18:23:06 -04:00
Joey Hess
77864d188b update 2013-04-26 00:00:46 -04:00
Joey Hess
1d2fb595c4 blog for the day (10 am to 11:50 pm is insane) 2013-04-25 23:50:40 -04:00
2001:980:45c4:1:84e8:c853:c73d:5c6b
be45339a92 poll vote (/sdcard/annex) 2013-04-25 11:51:21 +00:00
62.207.88.33
e90bde6764 poll vote (/sdcard/annex) 2013-04-25 08:08:04 +00:00
Richard Hartmann
bce17baada Typo 2013-04-25 08:52:22 +02:00
Joey Hess
affb89a699 blog for the day 2013-04-24 18:57:52 -04:00
spwhitton
deddc31d26 Added a comment 2013-04-24 17:09:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI
f849e79173 Added a comment: Bugs... 2013-04-23 23:30:47 +00:00
Joey Hess
1c4d5694a1 exclude moreinfo 2013-04-23 18:42:56 -04:00
Joey Hess
9a7fa9fc20 add moreinfo page for bugs 2013-04-23 18:39:37 -04:00
Joey Hess
327b465a75 blog for the day 2013-04-23 18:23:58 -04:00
http://joeyh.name/
fa9d37fab7 Added a comment 2013-04-23 20:16:26 +00:00
spwhitton
6886190a52 Added a comment 2013-04-23 17:11:46 +00:00
108.170.138.61
77c2fd4b50 poll vote (/sdcard/annex) 2013-04-23 11:02:35 +00:00
hhm
68c39cbaa5 Added a comment: file transfer? 2013-04-23 10:22:51 +00:00
hhm
9c3af3c3a2 Added a comment: file transfer? 2013-04-23 10:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
b46681870e poll vote (/sdcard/annex) 2013-04-22 23:48:28 +00:00
Joey Hess
108a1ec520 blog for the day 2013-04-22 17:31:18 -04:00
140.233.6.178
de4557cead poll vote (/sdcard/annex) 2013-04-22 13:28:50 +00:00
Richard Hartmann
46d2343d59 Typo 2013-04-22 09:10:16 +02:00
Joey Hess
49d039fe6a Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-21 19:12:05 -04:00
Joey Hess
b6d53c426b blog for the day 2013-04-21 19:11:53 -04:00
49.176.102.23
dd0532b7c4 poll vote (/sdcard/annex) 2013-04-21 22:59:11 +00:00
84.194.180.65
184a458a12 poll vote (Whole /sdcard) 2013-04-21 20:25:59 +00:00
212.255.225.202
ac74ab2c2a poll vote (/sdcard/annex) 2013-04-21 16:35:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
4b04a835a9 poll vote (/sdcard/annex) 2013-04-21 03:09:20 +00:00
Joey Hess
54e7cdb55c close poll 2013-04-20 19:40:48 -04:00
http://joeyh.name/
26388c453b Added a comment 2013-04-20 23:38:48 +00:00
Joey Hess
cefe2fac2d Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-20 19:29:26 -04:00
Joey Hess
a24a471ea9 blog for the day 2013-04-20 19:28:46 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnE6kFAbud1LWrQuyX76yMYnUjHt9tR-A8
203a2e87b8 Added a comment: Direct mode 2013-04-20 20:55:10 +00:00
82.26.93.238
020af970af poll vote (Whole /sdcard) 2013-04-20 19:23:47 +00:00
82.26.93.238
ec730d423d poll vote (/sdcard/annex) 2013-04-20 18:38:04 +00:00
62.16.199.39
dc8e11471b poll vote (/sdcard/annex) 2013-04-20 17:21:38 +00:00
2a01:e35:8abf:e790:c214:3dff:fed7:730f
fe02126d87 poll vote (/sdcard/annex) 2013-04-20 16:56:58 +00:00
98.232.226.200
39a76de0f5 poll vote (/sdcard/annex) 2013-04-20 16:21:22 +00:00
184.175.42.76
725d3e2ee0 poll vote (/sdcard/annex) 2013-04-20 14:28:57 +00:00
https://m-f-k.myopenid.com/
e4f9238201 poll vote (/sdcard/annex) 2013-04-20 13:42:54 +00:00
93.207.189.79
01c1e38b72 poll vote (DCIM directory (photos and videos only)) 2013-04-20 13:42:35 +00:00
24.22.142.175
1cb5f72687 poll vote (/sdcard/annex) 2013-04-20 13:41:26 +00:00
81.103.22.225
6eb5ed8393 poll vote (/sdcard/annex) 2013-04-20 10:40:05 +00:00