Commit graph

13435 commits

Author SHA1 Message Date
Joey Hess
dce7389dd0 Remind user when annex-ignore is set for some remotes, if unable to get or drop a file, possibly because it's on an ignored remote. 2013-09-06 16:54:31 -04:00
Joey Hess
89731a2737 clarify 2013-09-06 14:08:58 -04:00
Joey Hess
fe22a04513 close 2013-09-06 14:08:15 -04:00
Joey Hess
1c80428dc4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-06 14:07:11 -04:00
Joey Hess
3812c709fa link 2013-09-06 14:06:55 -04:00
Joey Hess
90bdd70f13 split out roadmap 2013-09-06 14:06:15 -04:00
http://joeyh.name/
dbc87cf05f Added a comment 2013-09-06 18:02:11 +00:00
Joey Hess
431ea4a784 update 2013-09-06 13:25:25 -04:00
107.1.64.82
3ecb852b4a poll vote (/sdcard/annex) 2013-09-06 14:41:58 +00:00
82.243.233.186
f0dd323d46 poll vote (Tahoe-LAFS) 2013-09-06 05:55:49 +00:00
109.190.97.30
a3fe5c1971 poll vote (Tahoe-LAFS) 2013-09-05 23:14:29 +00:00
Joey Hess
fcd884c13e Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-05 17:19:04 -04:00
Joey Hess
9a40783e63 blog for the day 2013-09-05 17:18:21 -04:00
Joey Hess
dad34e0ea8 add getParticipantList
Note that it needs to look at global git config, since git-remote-gcrypt
will see any setting there as a fallback.
2013-09-05 16:34:13 -04:00
Joey Hess
a48a4e2f8a automatically derive an annex-uuid from a gcrypt-uuids 2013-09-05 16:02:39 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkgH7oNEqNbh3g-N1-UHXuqleXaRYDgj1U
c4dd072edb Added a comment 2013-09-05 17:30:08 +00:00
Joey Hess
76d5611da8 retitle 2013-09-05 12:56:16 -04:00
http://joeyh.name/
f615f8ce9c Added a comment 2013-09-05 16:54:36 +00:00
http://joeyh.name/
52d47ac8b2 Added a comment 2013-09-05 16:30:52 +00:00
Joey Hess
3da8cc7008 Fix Feeds display in build flags. 2013-09-05 12:20:39 -04:00
Joey Hess
37f0c448a1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-05 11:15:53 -04:00
Joey Hess
5667553064 fix 2013-09-05 11:15:06 -04:00
Joey Hess
89eecd4b3b rename constructor for clariy 2013-09-05 11:12:01 -04:00
guilhem
ac9807c887 Leverage an ambiguities between Ciphers
Cipher is now a datatype

    data Cipher = Cipher String | MacOnlyCipher String

which makes more precise its interpretation MAC-only vs. MAC + used to
derive a key for symmetric crypto.
2013-09-05 11:09:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
f0bb39bc4e Added a comment 2013-09-05 15:07:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00
9551dca9c8 poll vote (/sdcard/annex) 2013-09-05 12:16:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00
bbe65e7ede Added a comment 2013-09-05 12:14:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00
5551495d63 markdown formatting 2013-09-05 12:03:52 +00:00
2.244.15.209
b04957628d poll vote (/sdcard/annex) 2013-09-05 11:06:19 +00:00
Joey Hess
6883c17d62 highlight the syntax change 2013-09-05 00:10:43 -04:00
Joey Hess
60677bc110 blog for the day 2013-09-05 00:09:25 -04:00
Joey Hess
fc7b5cfe7d Merge branch 'encryption' 2013-09-05 00:09:11 -04:00
Joey Hess
47d0219ac8 update docs for changed initremote encryption syntax 2013-09-04 23:46:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
7740afd10f Added a comment: New YouTube problems 2013-09-05 03:45:16 +00:00
Joey Hess
c5236b7f74 close 2013-09-04 23:25:41 -04:00
Joey Hess
c99902546e close 2013-09-04 23:24:42 -04:00
Joey Hess
08f026e886 keep Utility.Gpg free of dependencies on git-annex 2013-09-04 23:16:33 -04:00
Joey Hess
ce53acf4fe wording 2013-09-04 22:53:58 -04:00
Joey Hess
2b9f3cc175 tabs 2013-09-04 22:47:53 -04:00
Joey Hess
a51f1a4ee4 unimportant tweak
fix something my internal haskell parser does a double take at
2013-09-04 22:39:25 -04:00
Joey Hess
15b8acb885 redundant comment 2013-09-04 22:24:01 -04:00
Joey Hess
930e6d22d6 replace an over-explained Bool with a data type
This also highlights several places where a Read/Show or similar for the
new data type could avoid redundant strings.
2013-09-04 22:18:33 -04:00
Joey Hess
57a15425e8 wording 2013-09-04 21:54:10 -04:00
Joey Hess
359a8bc318 Merge branch 'master' into encryption 2013-09-04 21:45:47 -04:00
Joey Hess
51ce7fcaf1 fix warning 2013-09-04 21:37:13 -04:00
guilhem
3999a860eb Encryption defaults to 'hybrid'
When a keyid= is specified while encryption= is absent.
2013-09-04 21:34:33 -04:00
Joey Hess
b30a322093 reword docs 2013-09-04 20:11:25 -04:00
Joey Hess
6e09893160 reword changelog 2013-09-04 19:31:36 -04:00
Joey Hess
b17defd43a reworded encryption stuff on man page, hopefully clearer and less jargon 2013-09-04 18:39:41 -04:00
Joey Hess
6f531d903d detailed changelog for the encryption changes 2013-09-04 18:15:38 -04:00