Commit graph

6533 commits

Author SHA1 Message Date
Joey Hess
9cff286ea3 avoid repeated pairing alerts 2012-11-03 21:38:27 -04:00
Joey Hess
17e84a8096 switch to directed presence for pair requests
Testing between Google Talk and prosody, the directed IQ messages
were not received. Google Talk probably only relays them between
clients using the same account.

I first tried even more directed presence, with each client JID being sent
a separate presence, but that didn't work on Google Talk, particularly
it was ignored when one client sent it to another client using the same
account.

So, presence directed at the user@host of the client to pair with. Tested
working between Google Talk and prosody (in both directions), as well
as between two clients with the same account on Google Talk, and
two clients with the same account on prosody.

Only problem with this form of directed presence is that if I also use it
for git pushes, more clients than are interested in a push's data will
receive it. So I may need some better approach, or a hybrid between
directed IQ and directed presence.
2012-11-03 21:19:59 -04:00
Joey Hess
5108d4b364 update xmpp protocol
Amusingly, I am not really using xmpp ping for pairing. I forgot to put in
the ping tag! And when I did, it stopped working, on Google Talk. Seems
it handles client to client pings, at least using the same JID, without
actually sending them to the end client. My mistake avoided this,
and seems to work, so I've left it as-is for now, with just the git-annex
tag in an IQ message. Also tested on prosody.
2012-11-03 19:18:26 -04:00
Joey Hess
21a287a0b3 rename xmpp creds file
it's not just about push notifications anymore
2012-11-03 18:58:37 -04:00
Joey Hess
4331cf4e09 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-03 18:12:11 -04:00
Joey Hess
607fed5800 blog for the day 2012-11-03 18:11:46 -04:00
Joey Hess
42f030c905 XMPP pair requests are now received, and an alert displayed 2012-11-03 17:46:22 -04:00
2a01:e35:1382:f950:21d9:7aaa:461b:48ee
967d23d08a poll vote (Google Drive) 2012-11-03 21:17:42 +00:00
Joey Hess
b95c255b6d XMPP pairing notifications are now sent
Rest of pairing process still to do.
2012-11-03 16:01:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc
6ffc2ae502 Added a comment: git-annex.app Not working on 32 bit machines 2012-11-03 19:18:48 +00:00
Joey Hess
cbbfd4d00b bugfix 2012-11-03 14:32:59 -04:00
Joey Hess
9a8d0be866 send a presence query when the buddy list is displayed
This ensures that clients that have not sent presence in a while will show
up in the list.
2012-11-03 14:25:06 -04:00
Joey Hess
a1228e27ed refactor XMPP client 2012-11-03 14:16:17 -04:00
Joey Hess
74385e3d38 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-03 12:11:52 -04:00
Joey Hess
359f386ad6 switch to new URI version by default, -DWITH_OLD_URI for old 2012-11-03 12:10:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnVSFYYxe8zGfv6paEoLZBMwfkYuMPxZ9E
526c64cce3 Delete the duplicate and incorrect installation method for NixOS 2012-11-03 12:14:58 +00:00
Joey Hess
2541b109e0 layout 2012-11-02 21:37:25 -04:00
Joey Hess
a6d15938ab fix marking git-annex clients away when they disconnect 2012-11-02 21:36:26 -04:00
Joey Hess
54fcfd42d2 typo 2012-11-02 21:31:08 -04:00
Joey Hess
bf17262986 ignore our own client presence 2012-11-02 21:23:58 -04:00
Joey Hess
d6ccc29c03 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-02 21:13:57 -04:00
Joey Hess
6f1521e046 blog for the day 2012-11-02 21:13:31 -04:00
Joey Hess
6a61829e2d add buddy list to pairing UI 2012-11-02 21:13:06 -04:00
annexuser
4070e58467 Added a comment 2012-11-02 19:41:27 +00:00
Joey Hess
2ae43e71e0 xmpp buddy list tracking 2012-11-02 14:28:36 -04:00
Joey Hess
ec7a51727a pasto 2012-11-02 12:48:52 -04:00
Joey Hess
70b9d3ae68 Merge branch 'master' of ssh://git-annex.branchable.com 2012-11-02 11:59:44 -04:00
http://christian.amsuess.com/chrysn
a0eea69ea8 enhancement request: no rsync error messages in fsck output when accessing old files 2012-11-02 15:56:04 +00:00
Joey Hess
21d8f96679 give <&&> and <||> same fixity as && and ||
Suggestion by Daniel Trstenjak

These are not currently mixed in my code base, so no real change.
2012-11-02 11:20:55 -04:00
http://hands.com/~phil/
837a3dad56 Added a comment: and you can specify ranges to dropunused 2012-11-02 09:07:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
432a4df8a1 Added a comment 2012-11-02 07:21:15 +00:00
http://olg.myid.net/
ae4e2673a7 2012-11-01 23:48:17 +00:00
Joey Hess
133929eb8f fsck --all should, perhaps, check every file in every ref 2012-11-01 18:15:59 -04:00
annexuser
95fd060d19 2012-11-01 21:37:13 +00:00
http://www.dbruhn.de/
65a66ccbf4 2012-11-01 16:09:44 +00:00
https://me.yahoo.com/a/6xTna_B_h.ECb6_ftC2dYLytAEwrv36etg_054U-#4c1e7
20321af6f7 Added a comment 2012-11-01 14:29:40 +00:00
http://joeyh.name/
66a05ca94c Added a comment 2012-11-01 13:40:40 +00:00
https://me.yahoo.com/a/6xTna_B_h.ECb6_ftC2dYLytAEwrv36etg_054U-#4c1e7
463966c3fd Added a comment 2012-11-01 11:52:30 +00:00
https://me.yahoo.com/a/6xTna_B_h.ECb6_ftC2dYLytAEwrv36etg_054U-#4c1e7
e98d49e3e2 Added a comment 2012-11-01 11:49:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlqL9r-NagkZZWj5P_u08Q6_QIKj3ZgbBo
269a2e7d4e 2012-11-01 05:22:12 +00:00
http://joeyh.name/
036f1474be Added a comment 2012-11-01 02:36:07 +00:00
https://me.yahoo.com/a/6xTna_B_h.ECb6_ftC2dYLytAEwrv36etg_054U-#4c1e7
a0e08d0044 2012-11-01 02:11:45 +00:00
Joey Hess
85f558aa58 bloglet for the day 2012-10-31 18:53:02 -04:00
Joey Hess
fa23f9f739 update 2012-10-31 18:36:13 -04:00
Joey Hess
088e89b422 adjust wording, which was a bit incorrect due to new and planned features
xmpp sync in particular
2012-10-31 16:28:40 -04:00
Joey Hess
3af670473f Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-31 16:25:14 -04:00
Joey Hess
796ebaf6f8 add a link to vixie's personal colo list 2012-10-31 16:24:21 -04:00
Joey Hess
4b55761a79 improve layout 2012-10-31 16:23:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnKgoTWEDuAqxBT7LnQVNJBmI0wajSgORA
49a6f7d3c7 Added a comment: Same on 10.8.2 2012-10-31 20:17:17 +00:00
Joey Hess
33dbb19d99 webapp: Ensure that rsync special remotes are enabled using the same name they were originally created using.
It was creating a new special remote with a different name, unless
the stars perfectly aligned and the names matched.
2012-10-31 16:14:52 -04:00