Commit graph

5884 commits

Author SHA1 Message Date
Joey Hess
0dbea8a9a1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-08 15:16:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q
c04be6e5af Formatting changes. 2013-03-08 19:10:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q
4a710ca757 Report of potential git annex get problem. 2013-03-08 19:07:54 +00:00
http://joeyh.name/
6490374957 Added a comment 2013-03-08 19:02:54 +00:00
http://joeyh.name/
507ea8708d Added a comment 2013-03-08 18:59:27 +00:00
Joey Hess
0e508f860a assistant: Sync with all git remotes on startup. 2013-03-08 13:48:27 -04:00
guilhem
736aee4274 2013-03-08 16:51:51 +00:00
guilhem
71e4e30ab9 2013-03-08 16:06:05 +00:00
http://edheil.wordpress.com/
dfc68e4db7 Added a comment 2013-03-08 14:46:55 +00:00
guilhem
e989539a8a 2013-03-08 14:25:20 +00:00
Richard Hartmann
537a5b83bb s/Fosdem/FOSDEM/g 2013-03-08 11:17:31 +01:00
Joey Hess
5fefb49bc9 fix links 2013-03-08 01:00:52 -04:00
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
Joey Hess
22f6673575 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 17:33:11 -04:00
http://joeyh.name/
a1efdd2ce9 Added a comment 2013-03-03 21:32:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
f7c64afc94 Added a comment 2013-03-03 21:24:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
0ccd6306fa removed 2013-03-03 21:23:38 +00:00
Joey Hess
06f28b1b2b Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 17:23:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
45309b98a3 Added a comment 2013-03-03 21:22:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
ee93337af1 removed 2013-03-03 21:22:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
2f6026186f Added a comment 2013-03-03 21:21:40 +00:00
Joey Hess
9c6238ac9d blog for the day 2013-03-03 17:21:03 -04:00
Joey Hess
20c65a6c0e add 2013-03-03 17:20:17 -04:00
Joey Hess
08bdea7e52 webapp: New preferences page allows enabling/disabling debug logging at runtime, as well as configuring numcopies and diskreserve. 2013-03-03 17:07:27 -04:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
ca57d68e36 2013-03-03 20:57:48 +00:00
Joey Hess
d7ad02f893 fix title 2013-03-03 16:45:03 -04:00
annexuser
5c1975cfc8 2013-03-03 20:21:12 +00:00
http://joeyh.name/
d9126c44f4 Added a comment 2013-03-03 19:42:19 +00:00
http://edheil.wordpress.com/
749090a17b Added a comment 2013-03-03 18:58:42 +00:00
http://joeyh.name/
1c78b7f287 Added a comment 2013-03-03 18:53:23 +00:00
http://edheil.wordpress.com/
9d7df0aee4 Added a comment 2013-03-03 18:44:35 +00:00
http://joeyh.name/
16013d3235 Added a comment 2013-03-03 18:36:31 +00:00
http://joeyh.name/
36de78de39 Added a comment 2013-03-03 18:34:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
65c94ce094 Added a comment 2013-03-03 18:31:24 +00:00
Joey Hess
dc706d1eb0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 14:22:00 -04:00
Joey Hess
cd06ede772 move bug report 2013-03-03 14:06:57 -04:00
http://joeyh.name/
c9c10056ae removed 2013-03-03 17:46:39 +00:00
http://joeyh.name/
0d3faff668 Added a comment 2013-03-03 17:45:48 +00:00
http://joeyh.name/
2c17ac7902 Added a comment 2013-03-03 17:45:34 +00:00
http://joeyh.name/
4cb0d7560a Added a comment 2013-03-03 16:57:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmdLmVxigDvxiGhnQ34xhyAaxl0CRRe9gs
cf8b1dc812 Added a comment: Alternate version - smarter integration with other remotes/web special remote? 2013-03-03 14:19:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnT7et8wPkEerW4yk_dJ2kgNijKvgzVm9Q
60e13fe279 2013-03-03 10:10:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
b78ab9d797 Added a comment 2013-03-02 12:54:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwz07HJdp3nzLwCAl7OGKn_3m0tTO4Mxw
015b378318 Added a comment: use existing ssh keys? 2013-03-02 12:05:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
869f7e3363 Added a comment 2013-03-02 11:03:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
e2380ca462 removed 2013-03-02 10:59:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
6621845358 Added a comment 2013-03-02 10:56:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
e20040ff8b Added a comment 2013-03-02 10:05:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
b86b4877fe removed 2013-03-02 10:04:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
41c4c8e091 Added a comment 2013-03-02 10:03:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
1be5b6b5d5 removed 2013-03-02 10:02:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
e55b5b1322 Added a comment 2013-03-02 10:01:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaygIuV4bIfp-U5IRH51FwKHq-i7_os0c
04de265427 2013-03-02 07:12:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
b54d87248b Added a comment 2013-03-01 23:52:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
850cad1cef fixed autobuild download link to point at apk instead of i386 tarball 2013-03-01 23:45:23 +00:00
Joey Hess
3a783b4a3a blog for the day 2013-03-01 17:19:50 -04:00
http://joeyh.name/
2f2d67df85 Added a comment 2013-03-01 20:20:30 +00:00
http://joeyh.name/
dafae75991 Added a comment 2013-03-01 19:59:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
3c9cb4f05b Added a comment 2013-03-01 19:52:13 +00:00
Joey Hess
e2f1f7afc6 update 2013-03-01 14:21:10 -04:00
Joey Hess
a2a9baaa12 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-01 14:16:51 -04:00
Joey Hess
18eb89de8f add 2013-03-01 13:50:12 -04:00
http://joeyh.name/
289f16102c Added a comment 2013-03-01 17:31:31 +00:00
Joey Hess
fed56e24a4 fix another crazy file extension 2013-03-01 13:19:49 -04:00
Joey Hess
c55342f33d fix 2013-03-01 13:03:18 -04:00
Joey Hess
e9de8491c5 fix 2013-03-01 12:57:41 -04:00
Joey Hess
8f75bfcc36 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-01 12:47:38 -04:00
79.214.27.125
1f6470a433 poll vote (I need a Windows port) 2013-03-01 16:46:39 +00:00
79.214.27.125
105428695b poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!) 2013-03-01 16:46:14 +00:00
Joey Hess
0ca279bfa4 people are such randomness generators.. 2013-03-01 12:45:21 -04:00
http://joeyh.name/
c80a02316e Added a comment 2013-03-01 16:44:18 +00:00
Joey Hess
012be77742 move comment to correct place 2013-03-01 12:42:46 -04:00
Joey Hess
7bee4d5f05 fix crazy file extension. Makefile?! 2013-03-01 12:38:48 -04:00
Joey Hess
f94fce32a3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-01 12:37:53 -04:00
http://joeyh.name/
a5242aece2 Added a comment 2013-03-01 16:37:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
cf60e25d89 Added a comment: Tried to add a bug, but website fails 2013-03-01 14:40:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
29d7dea844 2013-03-01 14:23:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
590e371f83 Added a comment 2013-03-01 12:02:09 +00:00
Joey Hess
f3294fb84e better build instructions 2013-03-01 01:27:56 -04:00
http://edheil.wordpress.com/
2917b82911 Added a comment 2013-03-01 04:50:30 +00:00
http://joeyh.name/
6f8ca31e9b Added a comment 2013-03-01 04:23:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
b698335c04 Added a comment 2013-03-01 03:55:46 +00:00
http://joeyh.name/
0e5069d6c5 Added a comment 2013-03-01 03:10:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
794eb7cb88 Added a comment: link busybox: No such file or directory 2013-03-01 02:32:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
6c36e9dde0 Added a comment 2013-03-01 01:26:36 +00:00
Joey Hess
967f3b14e0 blog for the day 2013-02-28 17:56:37 -04:00
Joey Hess
85be9379b0 fix link 2013-02-28 15:54:18 -04:00
http://joeyh.name/
f467486c10 Added a comment 2013-02-28 19:52:59 +00:00
http://joeyh.name/
fadb6552c6 Added a comment 2013-02-28 19:42:09 +00:00
http://joeyh.name/
b28280a730 Added a comment 2013-02-28 19:40:12 +00:00
Joey Hess
0df611a684 fixed in git 2013-02-28 15:35:25 -04:00
http://edheil.wordpress.com/
7c45f01777 2013-02-28 14:32:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
0d0c3993b5 Added a comment: Testpack install fails on ubuntu 12.04 2013-02-28 10:42:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
e0fd647396 Added a comment: lot of stuck git processes 2013-02-28 09:01:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
ee00b3c163 removed 2013-02-28 09:00:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
53184008b6 removed 2013-02-28 09:00:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
5355403acc Added a comment: lot of stuck git process 2013-02-28 08:59:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
b54f5a146b Added a comment: lot of stuck git process 2013-02-28 08:58:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
46c90c178a Added a comment 2013-02-28 08:40:47 +00:00
http://meep.pl/
5625f89c66 Added a comment 2013-02-28 06:13:21 +00:00
http://edheil.wordpress.com/
80a91c26fc Added a comment 2013-02-28 03:31:32 +00:00