mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6281 commits 13 branches 443 tags 106 MiB
Commit graph

6281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
9856641ef1 deal with mtl/monads-tf conflict 
I had been using -ignore-package monads-tf to deal with this, but
the XMPP library uses monads-tf, so that also ignores it. Instead,
use PackageImports to force use of mtl in my own code.
 2012-10-24 14:43:32 -04:00
Joey Hess
04ab4bd93a avoid building pushnotifier when there's no xmpp library installed 2012-10-24 14:39:38 -04:00
Joey Hess
ae8a3ab31e added push notifier thread, currently a no-op 
Hooked up everything that needs to notify on pushes. Note that
syncNewRemote does not notify. This is probably ok, and I'd need to thread
more state through to make it do so.

This is only set up to support a single push notification method; I didn't
use a NotificationBroadcaster. Partly because I don't yet know what info
about pushes needs to be communicated, so my data types are only
preliminary.
 2012-10-24 13:38:28 -04:00
Joey Hess
6b6ce30b42 use a newtype for better type safety 2012-10-24 13:15:31 -04:00
Joey Hess
892d691ffd Merge branch 'master' into xmpp 2012-10-24 12:54:14 -04:00
Joey Hess
100d798b44 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-24 11:48:39 -04:00
Joey Hess
70c8324a72 simplify 2012-10-24 11:48:10 -04:00
http://www.openid.albertlash.com/openid/
6227cd055d Added a comment: What to do? 2012-10-24 15:47:16 +00:00
Joey Hess
031bdf77b6 think I had the tagged right the 1st time 2012-10-24 11:46:31 -04:00
Joey Hess
034dace252 ahah 2012-10-24 11:45:00 -04:00
Joey Hess
78c7025781 erm, I forget how this pagespec works 2012-10-24 11:44:14 -04:00
Joey Hess
8eae88af4a fix tag matching 2012-10-24 11:43:21 -04:00
Joey Hess
36f6c694ea Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-24 11:42:30 -04:00
Joey Hess
25271545c2 add page with todo items tagged design/assistant 2012-10-24 11:42:01 -04:00
Joey Hess
8c6c40e89c tag 2012-10-24 11:39:11 -04:00
http://adamspiers.myopenid.com/
cb3bacd2c2 Mention assistant explicitly and also relationship to partial content 2012-10-24 15:38:36 +00:00
Joey Hess
fd56f5fa7c Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-24 11:38:17 -04:00
Joey Hess
7427a3e291 close 2012-10-24 11:38:01 -04:00
http://adamspiers.myopenid.com/
91e1756dfe 2012-10-24 15:33:01 +00:00
http://adamspiers.myopenid.com/
c2ddf8aa2e link to git-annex todo list 2012-10-24 15:24:07 +00:00
Joey Hess
0edfba7905 no need to use a traillink here, regular wikilink 2012-10-24 11:20:08 -04:00
http://adamspiers.myopenid.com/
accae87a74 add link to assistant design page 2012-10-24 15:16:33 +00:00
Joey Hess
c6fbed48a1 bugfix: Don't fail transferring content from read-only repos. Closes: #691341 
This used to work, but got broken when the transfer info files were added,
as it failed writing them on the readonly filesystem.
 2012-10-24 10:59:25 -04:00
Joey Hess
c396b9f542 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-24 10:55:35 -04:00
Joey Hess
ee24f23ecb fix build 2012-10-24 10:54:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw
80276313fb Added a comment: Remote control clients 2012-10-24 05:18:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw
ab517a1ffb Added a comment: PEP is ok 2012-10-24 05:15:38 +00:00
Joey Hess
2c788a28a1 added network-protocol-xmpp and -DWITH_XMPP 2012-10-23 20:24:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU
e122037e18 Added a comment: A little too old 2012-10-23 20:47:41 +00:00
http://joeyh.name/
12d40092ca Added a comment 2012-10-23 20:01:43 +00:00
Joey Hess
269344ae71 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-23 16:01:20 -04:00
Joey Hess
8b1235b022 bup: Don't pass - to bup-split to make it read stdin 
bup 0.25 does not accept that; and bup split reads from stdin by
default if no file is given. I'm not sure what version of bup changed this.

This only affected bup special remotes that were encrypted.
 2012-10-23 16:01:02 -04:00
http://joeyh.name/
9173c78d8b Added a comment 2012-10-23 19:51:03 +00:00
Joey Hess
e49e9186c8 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-23 15:48:01 -04:00
Joey Hess
e66bcec263 xmpp 2012-10-23 15:47:36 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU
96f070971c 2012-10-23 19:17:11 +00:00
Joey Hess
e5a08bef51 link 2012-10-23 12:43:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkgbXwQtPQSG8igdS7U8l031N8sqDmuyvk
e58dfa94ac Added a comment: Error with bup and gnupg 2012-10-22 20:56:57 +00:00
Joey Hess
95f305aa83 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-22 15:50:36 -04:00
Joey Hess
95f17ed0de webapp: Switched to using the same multicast IP address that avahi uses. 2012-10-22 15:50:30 -04:00
http://joeyh.name/
e79adbf406 Added a comment 2012-10-22 19:49:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlZvtBCVyJw4O71OPsdwGpVh6iJ1W-xaPc
1becee2856 Added a comment 2012-10-22 19:44:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE
f8cc979f6e 2012-10-22 17:36:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE
8d8d6a58d7 No need for mkdir, make it simpler 2012-10-22 17:34:33 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
a251762c7c 2012-10-22 17:04:31 +00:00
Joey Hess
052be10884 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-22 12:19:35 -04:00
http://joeyh.name/
776501307d Added a comment 2012-10-22 16:18:58 +00:00
Joey Hess
b05981d973 uninit: Check and abort if there are symlinks to annexed content that are not checked into git. 2012-10-22 11:54:50 -04:00
http://joeyh.name/
474b560041 Added a comment 2012-10-22 15:35:30 +00:00
Joey Hess
12efabf070 webapp: Allow dashes in ssh key comments when pairing. 2012-10-22 11:18:19 -04:00