Joey Hess
8fd78f45a2
fix build without XMPP
...
not sure if I'll keep bothering with this option
2012-11-12 01:48:15 -04:00
Joey Hess
a1d58959e4
release notes for tomorrow's release
2012-11-12 01:23:42 -04:00
Joey Hess
ebd576ebcb
where indentation
2012-11-12 01:05:04 -04:00
Joey Hess
f0dd6d00d1
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-11 22:30:01 -04:00
Joey Hess
23d3e1c5f7
add
2012-11-11 22:29:38 -04:00
Joey Hess
8b22bd8831
add a yes/no confirm for xmpp pairing requests
2012-11-11 22:29:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
220a4fac70
Added a comment: Base64 vs. yEnc
2012-11-12 02:02:17 +00:00
http://zjs.name/
a1608251e3
2012-11-12 00:24:49 +00:00
Joey Hess
9f5b23d49f
blog for the day
2012-11-11 18:16:49 -04:00
Joey Hess
522e228aef
auto-accept pair requests from JIDs already paired with
2012-11-11 18:16:11 -04:00
Joey Hess
7c30be0e8c
use cabal macro to detect if old version of network is being used
2012-11-11 18:05:01 -04:00
Joey Hess
39cd705952
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-11 17:52:01 -04:00
Joey Hess
b9799df90a
fill in
2012-11-11 17:51:34 -04:00
http://joeyh.name/
08e3fba5c2
Added a comment
2012-11-11 21:49:10 +00:00
Joey Hess
8644d72ffb
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-11 17:44:09 -04:00
Joey Hess
b91f07fe83
split up xmpp and local pairing UIs
2012-11-11 17:41:56 -04:00
Joey Hess
116023e05d
add a new walkthrough for xmpp pairing
2012-11-11 17:36:57 -04:00
http://peter-simons.myopenid.com/
215313f258
Add a request to support earlier versions of the network library
2012-11-11 21:03:55 +00:00
Joey Hess
5e44ab177c
don't try to transfer data to/from XMPP remotes
...
Partition syncRemotes into ones needing git sync (ie, non-special remotes),
and ones needing data sync (ie, non-XMPP remotes).
2012-11-11 16:23:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE
e8e6730eec
Added a comment: How to convert bare repositories to non-bare
2012-11-11 20:14:44 +00:00
Joey Hess
217eeede43
allow both one push and one receive-pack to run at the same time
...
Noticed that when pairing, sometimes both sides start to push, and the other
side sends a PushRequest, and the two deadlock, neither doing anything.
(Timeout eventually breaks this.) So, let both run at the same time.
2012-11-11 15:42:03 -04:00
Joey Hess
b44e8bb4a5
add 120 second timeout when waiting for XMPP packets
2012-11-11 13:38:28 -04:00
Joey Hess
b312e54ba7
added a runTimeout function
...
This adds a dep on haskell's async library, but since that's been
added to the recent haskell platform release, it should not be
much hardship to my poor long-suffering library chasing users.
2012-11-11 13:38:08 -04:00
http://joeyh.name/
2a4367e0ee
Added a comment
2012-11-11 16:06:42 +00:00
http://meep.pl/
25e626e1eb
Added a comment: xmlns
2012-11-11 09:00:01 +00:00
Joey Hess
2172cc586e
where indenting
2012-11-11 00:51:07 -04:00
Joey Hess
6a0756d2fb
use trustExclude
2012-11-11 00:26:29 -04:00
Joey Hess
ec337baaee
add trustExclude
2012-11-11 00:24:32 -04:00
Øyvind A. Holm
e1139c9a01
doc/sync.mdwn: Typo fix
...
5c945f18-2ba1-11e2-8d66-00c0a8deee11
2012-11-11 02:44:32 +01:00
http://christian.amsuess.com/chrysn
bb8286d6c5
Added a comment: further tracking
2012-11-11 01:15:41 +00:00
Joey Hess
3f8ce7a0c5
reword alert
2012-11-10 20:52:46 -04:00
Joey Hess
f3bbe075f2
fix creation of creds directory for xmpp
2012-11-10 20:48:45 -04:00
Joey Hess
f642bdc4b2
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-10 20:46:12 -04:00
Joey Hess
af5317318c
blog for the day
2012-11-10 20:45:41 -04:00
Joey Hess
b160856297
end of xmpp pairing page encourages adding a shared cloud repository
2012-11-10 20:38:52 -04:00
http://phil.0x539.de/
0fe0cb20c8
2012-11-10 21:40:22 +00:00
Joey Hess
75048b43e2
split repository comfiguration page into several widgets
2012-11-10 17:08:43 -04:00
Joey Hess
fd22734392
show when a buddy is already paired
2012-11-10 16:36:21 -04:00
http://phil.0x539.de/
ff7810eb83
poll vote (Amazon Glacier)
2012-11-10 20:19:34 +00:00
Joey Hess
d303190979
we're in month 5 already! It seems to be more cloud stuff, so far..
2012-11-10 15:54:58 -04:00
Joey Hess
3e8fb862db
update todo
2012-11-10 15:52:30 -04:00
http://joeyh.name/
a6edd94e3e
Added a comment
2012-11-10 19:48:01 +00:00
Joey Hess
2aa4a3e7cb
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-10 15:44:26 -04:00
Joey Hess
41085cdc8c
set negative XMPP presence priority
...
This should help prevent git-annex clients receiving messages that
were intended for normal clients they're sharing the account with.
Changed XMPP protocol use to always send chat messages directed at the
specific client, as the negative priority blocks less directed messages.
2012-11-10 15:33:12 -04:00
Joey Hess
ec186d6369
avoid sending xmpp push notifications when not pushing to any remotes
2012-11-10 14:52:25 -04:00
http://phil.0x539.de/
ee0bf529ad
Added a comment
2012-11-10 18:50:47 +00:00
Joey Hess
957e742dfc
full-on git-annex assistant syncing now works over XMPP!
...
I decided to use the fallback push mode from the beginning for XMPP, since
while it uses some ugly branches, it avoids the possibility of a normal
push failing, and needing to pull and re-push. Due to the overhead of XMPP,
and the difficulty of building such a chain of actions due to the async
implementation, this seemed reasonable.
It seems to work great!
2012-11-10 14:38:50 -04:00
Joey Hess
2a88845c28
changelog
2012-11-10 14:04:43 -04:00
Joey Hess
83de93b0f0
Merge branch 'master' of ssh://git-annex.branchable.com
2012-11-10 14:02:36 -04:00
Joey Hess
9d18e9b916
changelog
2012-11-10 14:02:25 -04:00
