summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* also remove -ignore-package monads-fdGravatar Joey Hess2012-10-24
| | | | My previous change should mean I no longer need that hack.
* deal with mtl/monads-tf conflictGravatar Joey Hess2012-10-24
| | | | | | 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.
* avoid building pushnotifier when there's no xmpp library installedGravatar Joey Hess2012-10-24
|
* added push notifier thread, currently a no-opGravatar Joey Hess2012-10-24
| | | | | | | | | | | 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.
* use a newtype for better type safetyGravatar Joey Hess2012-10-24
|
* Merge branch 'master' into xmppGravatar Joey Hess2012-10-24
|\
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\
| * | simplifyGravatar Joey Hess2012-10-24
| | |
| | * Added a comment: What to do?Gravatar http://www.openid.albertlash.com/openid/2012-10-24
| |/
| * think I had the tagged right the 1st timeGravatar Joey Hess2012-10-24
| |
| * ahahGravatar Joey Hess2012-10-24
| |
| * erm, I forget how this pagespec worksGravatar Joey Hess2012-10-24
| |
| * fix tag matchingGravatar Joey Hess2012-10-24
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\
| * | add page with todo items tagged design/assistantGravatar Joey Hess2012-10-24
| | |
| * | tagGravatar Joey Hess2012-10-24
| | |
| | * Mention assistant explicitly and also relationship to partial contentGravatar http://adamspiers.myopenid.com/2012-10-24
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\|
| * | closeGravatar Joey Hess2012-10-24
| | |
| | * (no commit message)Gravatar http://adamspiers.myopenid.com/2012-10-24
| | |
| | * link to git-annex todo listGravatar http://adamspiers.myopenid.com/2012-10-24
| |/
| * no need to use a traillink here, regular wikilinkGravatar Joey Hess2012-10-24
| |
| * add link to assistant design pageGravatar http://adamspiers.myopenid.com/2012-10-24
| |
| * bugfix: Don't fail transferring content from read-only repos. Closes: #691341Gravatar Joey Hess2012-10-24
| | | | | | | | | | This used to work, but got broken when the transfer info files were added, as it failed writing them on the readonly filesystem.
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-24
| |\
| * | fix buildGravatar Joey Hess2012-10-24
| | |
| | * Added a comment: Remote control clientsGravatar https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw2012-10-24
| | |
| | * Added a comment: PEP is okGravatar https://www.google.com/accounts/o8/id?id=AItOawmQ4Oe5-qOANRuZel9kDvtBfQG1zlEcIzw2012-10-24
| | |
* | | added network-protocol-xmpp and -DWITH_XMPPGravatar Joey Hess2012-10-23
|/ /
| * Added a comment: A little too oldGravatar https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU2012-10-23
| |
| * Added a commentGravatar http://joeyh.name/2012-10-23
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-23
|\
* | bup: Don't pass - to bup-split to make it read stdinGravatar Joey Hess2012-10-23
| | | | | | | | | | | | | | 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.
| * Added a commentGravatar http://joeyh.name/2012-10-23
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-23
|\
* | xmppGravatar Joey Hess2012-10-23
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU2012-10-23
| |
* | linkGravatar Joey Hess2012-10-23
|/
* Added a comment: Error with bup and gnupgGravatar https://www.google.com/accounts/o8/id?id=AItOawkgbXwQtPQSG8igdS7U8l031N8sqDmuyvk2012-10-22
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-22
|\
* | webapp: Switched to using the same multicast IP address that avahi uses.Gravatar Joey Hess2012-10-22
| |
| * Added a commentGravatar http://joeyh.name/2012-10-22
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlZvtBCVyJw4O71OPsdwGpVh6iJ1W-xaPc2012-10-22
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE2012-10-22
|
* No need for mkdir, make it simplerGravatar https://www.google.com/accounts/o8/id?id=AItOawmraN_ldJplGunVGmnjjLN6jL9s9TrVMGE2012-10-22
|
* (no commit message)Gravatar https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec892012-10-22
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-10-22
|\
| * Added a commentGravatar http://joeyh.name/2012-10-22
| |
* | uninit: Check and abort if there are symlinks to annexed content that are ↵Gravatar Joey Hess2012-10-22
| | | | | | | | not checked into git.
| * Added a commentGravatar http://joeyh.name/2012-10-22
| |