Commit graph

18942 commits

Author SHA1 Message Date
Joey Hess
0408ad35a5 Merge branch 'fix/build-without-Webapp-Quvi' of https://github.com/frasertweedale/git-annex 2014-04-08 16:19:34 -04:00
Joey Hess
913ab7ce87 Merge branch 'gitignore-cabal-sandbox' of https://github.com/frasertweedale/git-annex 2014-04-08 16:18:16 -04:00
Joey Hess
f67d5abc41 support gcrypt remotes (assuming them to be over ssh transport) 2014-04-08 16:16:46 -04:00
Joey Hess
549a64b58b Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 15:38:16 -04:00
Joey Hess
e4ea97427b add contribute page, mention haskell on front page 2014-04-08 15:37:22 -04:00
Joey Hess
ccfceb887c update 2014-04-08 15:30:32 -04:00
Joey Hess
960394a947 discard old transports on pause 2014-04-08 15:26:32 -04:00
Joey Hess
fac7bca05b assistant: Now detects immediately when other repositories push changes to
a ssh remote, and pulls.

XMPP is no longer needed in this configuration!

Requires the remote server have git-annex-shell with notifychanges support.

(untested)

This commit was sponsored by Geog Wechslberger.
2014-04-08 15:23:50 -04:00
Joey Hess
cbcb7f50d8 remotedaemon: avoid extraneous stdout output 2014-04-08 14:02:25 -04:00
Joey Hess
9a4a3bfb43 fix STOP 2014-04-08 13:51:49 -04:00
Joey Hess
fa0cf81b26 cleaned up AnnexState handling in transports 2014-04-08 13:42:57 -04:00
Joey Hess
b3b07ab330 clarify 2014-04-08 12:09:24 -04:00
Fraser Tweedale
fbb30eac13 .gitignore: add cabal sandbox dir and config files 2014-04-08 23:37:04 +10:00
Fraser Tweedale
3a7068ffe6 fix build failure with flags -Webapp -Quvi 2014-04-08 19:49:43 +10:00
Joey Hess
9eedecd9e1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 00:32:05 -04:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
b37d53856b Added a comment: Encrypt with pub or sub? 2014-04-08 03:56:37 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
5b6e93ed74 removed 2014-04-08 03:50:55 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
4e020eb780 Added a comment: Encrypt with pub or sub? 2014-04-08 03:47:26 +00:00
Joey Hess
24a126154f Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 19:32:56 -04:00
Joey Hess
bea3d58a4e Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 19:15:22 -04:00
http://johan.kiviniemi.name/
d1642dcd6a Added a comment 2014-04-07 22:55:13 +00:00
Joey Hess
a388bebf7b devblog 2014-04-07 18:54:57 -04:00
http://johan.kiviniemi.name/
1b5c6bac73 Added a comment 2014-04-07 22:48:19 +00:00
http://johan.kiviniemi.name/
c888c5f46d Added a comment 2014-04-07 22:44:33 +00:00
Joey Hess
a1817e9760 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 18:31:16 -04:00
http://joeyh.name/
c789119a90 Added a comment 2014-04-07 22:17:16 +00:00
http://joeyh.name/
030e67a77b removed 2014-04-07 22:15:25 +00:00
http://joeyh.name/
b5bc33ee8d Added a comment 2014-04-07 22:13:20 +00:00
http://joeyh.name/
1e2a6fa35a Added a comment 2014-04-07 22:12:14 +00:00
http://joeyh.name/
dc6d2a2c6d Added a comment 2014-04-07 21:57:32 +00:00
http://joeyh.name/
b426e073fe Added a comment 2014-04-07 21:55:19 +00:00
Joey Hess
cf99e48ef0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 17:31:02 -04:00
http://joeyh.name/
36c1aae61b Added a comment 2014-04-07 21:07:50 +00:00
Joey Hess
71aae05d39 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 16:58:33 -04:00
Joey Hess
836f2cc816 importfeed: Filename template can now contain an itempubdate variable. Needs feed 0.3.9.2. 2014-04-07 16:55:04 -04:00
Joey Hess
102ba3eb1a Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 16:31:43 -04:00
http://joeyh.name/
242d26b3e5 Added a comment 2014-04-07 20:10:52 +00:00
http://joeyh.name/
24c7f76b6f Added a comment 2014-04-07 20:07:46 +00:00
http://joeyh.name/
c70d63077b Added a comment 2014-04-07 19:51:27 +00:00
Joey Hess
2e8b9cbf29 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 15:30:58 -04:00
Joey Hess
5b503e4458 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 15:27:37 -04:00
Joey Hess
5a3cc65c27
close 2014-04-07 15:25:49 -04:00
http://joeyh.name/
0f2230d776 Added a comment 2014-04-07 19:25:26 +00:00
http://joeyh.name/
529d788c6f Added a comment 2014-04-07 19:24:13 +00:00
Joey Hess
68ba2e7e33 close 2014-04-07 15:22:38 -04:00
Joey Hess
d422a6ddb0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 14:33:00 -04:00
Joey Hess
53af562451 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 13:39:49 -04:00
Joey Hess
ab383dcc10 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 11:31:34 -04:00
madduck
7cfc481e44 2014-04-07 14:56:56 +00:00
Joey Hess
8a0dde0385 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 08:31:01 -04:00