Commit graph

5772 commits

Author SHA1 Message Date
Joey Hess
a8c4b97b02 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-08 00:58:47 -04:00
Joey Hess
7baf0e9cf1 split videos off to their own pages 2013-03-08 00:57:35 -04:00
Noah
dd4d15683a 2013-03-08 03:06:34 +00:00
Noah
c5d09655da 2013-03-08 03:05:51 +00:00
Joey Hess
4713c2fdac Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-07 19:06:29 -04:00
Joey Hess
2f84f3926a blog for the day 2013-03-07 19:00:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
2ec3c18dfd 2013-03-07 20:15:33 +00:00
http://joeyh.name/
47fdd802c9 Added a comment 2013-03-07 18:42:37 +00:00
Joey Hess
d45c73089a update 2013-03-07 14:38:06 -04:00
annexuser
9f348663ce 2013-03-07 17:30:33 +00:00
Philipp Kern
8141b081b7 bugs/encryption_key_is_surprising/comment_7: add a closing brace 2013-03-07 16:24:06 +01:00
http://phil.0x539.de/
d2616b26da Added a comment 2013-03-07 15:21:55 +00:00
Joey Hess
effafbc506 note 2013-03-07 11:09:21 -04:00
193.96.240.2
1b8a3f6373 poll vote (It's too hard to install (please say why in comments)) 2013-03-07 12:46:34 +00:00
193.96.240.2
7d3a870332 poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!) 2013-03-07 12:46:05 +00:00
139.80.40.12
0d7143325c poll vote (Not yet in Debian sid amd64) 2013-03-07 04:53:48 +00:00
Joey Hess
15ef899b12 fixed 2013-03-06 21:49:17 -04:00
Joey Hess
c16adc25c4 assistant: XMPP git pull and push requests are cached and sent when presence of a new client is detected.
Noticed that, At startup or network reconnect, git push messages were sent,
often before presence info has been gathered, so were not sent to any
buddies.

To fix this, keep track of which buddies have seen such messages,
and when new presence is received from a buddy that has not yet seen it,
resend.

This is done only for push initiation messages, so very little data needs
to be stored.
2013-03-06 21:38:01 -04:00
Joey Hess
d76e281de0 todo 2013-03-06 18:40:07 -04:00
Joey Hess
52eb62be26 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-06 16:36:31 -04:00
http://joeyh.name/
f61f33608f Added a comment 2013-03-06 20:35:45 +00:00
Joey Hess
3c8498ec5f blog for the day 2013-03-06 16:32:47 -04:00
Joey Hess
c23ea9e311 assistant: Get back in sync with XMPP remotes after network reconnection, and on startup.
Make manualPull send push requests over XMPP.

When reconnecting with remotes, those that are XMPP remotes cannot
immediately be pulled from and scanned, so instead maintain a set of
(probably) desynced remotes, and put XMPP remotes on it. (This set could be
used in other ways later, if we can detect we're out of sync with other
types of remotes.)

The merger handles detecting when a XMPP push is received from a desynced
remote, and triggers a scan then, if they have in fact diverged.

This has one known bug: A single XMPP remote can have multiple clients
behind it. When this happens, only the UUID of one client is recorded
as the UUID of the XMPP remote. Pushes from the other XMPP clients will not
trigger a scan. If the client whose UUID is expected responds to the push
request, it'll work, but when that client is offline, we're SOL.
2013-03-06 15:09:31 -04:00
http://kaizer.se/
8d1540a98c Added a comment 2013-03-06 05:30:16 +00:00
http://kaizer.se/
21de69d298 Added a comment: GPG Cipher Algo 2013-03-06 04:53:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q
aa77d13b72 initial commit :-) 2013-03-06 03:05:58 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
548005becc Added a comment 2013-03-05 22:43:12 +00:00
http://joeyh.name/
21c9c079d3 Added a comment 2013-03-05 20:34:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp2NWKkfY8fXy-hq9vhj6Yl6gozxxZECo
df5ea48ee1 2013-03-05 17:09:12 +00:00
http://phil.0x539.de/
58977c73c7 Added a comment 2013-03-05 07:17:08 +00:00
Joey Hess
59994d3e8f blog for the day 2013-03-04 16:40:37 -04:00
Joey Hess
aa2bc92b73 clarify todo item 2013-03-04 15:56:09 -04:00
http://joeyh.name/
2b723ce9da removed 2013-03-04 17:43:03 +00:00
http://joeyh.name/
492d46b38a Added a comment 2013-03-04 17:29:28 +00:00
http://joeyh.name/
f458f62e4b Added a comment 2013-03-04 17:29:16 +00:00
http://ao2.it/
3009ab5463 Added a comment: Using the Emulator? 2013-03-04 13:58:18 +00:00
http://phil.0x539.de/
d343992fce Added a comment 2013-03-04 07:36:56 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
1df34ef9a0 2013-03-04 04:44:18 +00:00
http://joeyh.name/
45a3f198f8 Added a comment 2013-03-04 00:57:39 +00:00
Joey Hess
7133e4fae4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 20:55:56 -04:00
Joey Hess
89f973a6bd cloe 2013-03-03 20:50:03 -04:00
Joey Hess
b20c3a6252 document the encryption cipher 2013-03-03 20:47:36 -04:00
http://edheil.wordpress.com/
5913f1b746 Added a comment 2013-03-04 00:20:30 +00:00
http://joeyh.name/
a41504a43b Added a comment 2013-03-04 00:04:53 +00:00
http://joeyh.name/
154594e750 Added a comment 2013-03-03 23:56:17 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
27cc52b0a0 Added a comment 2013-03-03 22:43:41 +00:00
https://launchpad.net/~arand
304a577eae Added a comment 2013-03-03 22:34:27 +00:00
http://phil.0x539.de/
cedb8abcf0 added my name 2013-03-03 22:33:01 +00:00
http://phil.0x539.de/
b65202deda encryption uses a base64 key split into two halfs instead of an unwrapped one 2013-03-03 22:25:02 +00:00
Joey Hess
0b236edba9 fix titles 2013-03-03 17:35:22 -04:00