Commit graph

27687 commits

Author SHA1 Message Date
Joey Hess
7f72091b6f
followup and close 2016-05-03 13:47:14 -04:00
Joey Hess
4b9ddb9429
Added DIRHASH_LOWER to external special remote protocol. 2016-05-03 13:36:59 -04:00
Joey Hess
9b73c85952
Android: Icon refresh. Thanks, freewheelinfranks. 2016-05-03 13:27:06 -04:00
Joey Hess
412e89ecaa
response 2016-05-03 13:19:36 -04:00
Joey Hess
8065d195be
not a bug 2016-05-03 13:08:03 -04:00
Joey Hess
a8b25288a1
response 2016-05-03 13:02:11 -04:00
Joey Hess
217f6c117d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-03 12:54:14 -04:00
Joey Hess
bfb4095c13
Improve behavior when a just added http remote is not available during uuid probe. Do not mark it as annex-ignore, so it will be tried again later. 2016-05-03 12:53:42 -04:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
31fb2f54fd Added a comment 2016-05-03 07:22:53 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
3f2f0aa667 Added a comment 2016-05-03 06:25:03 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
d5e40ef574 Added a comment: Here's a link to the image files 2016-05-03 06:14:40 +00:00
spwhitton
0558447ed4 Added a comment 2016-05-02 19:26:47 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
28af7c4b8a Added a comment 2016-05-02 18:43:33 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
02fea5bce5 Added a comment 2016-05-02 18:41:54 +00:00
Joey Hess
157993dd2f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-02 10:53:38 -04:00
Joey Hess
617f2834fc
Fix bug that sometimes prevented git-annex smudge --clean from consuming all its input, which resulted in git add bypassing git-annex. 2016-05-02 10:53:24 -04:00
jfc@123850a543de181bdfae6868101bfb4e742a87ed
16bef50c6c 2016-05-02 14:53:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
67951cdd7c Added a comment 2016-05-01 21:47:18 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cce2c126f9 2016-05-01 21:43:58 +00:00
zarel
a5862331ca 2016-05-01 19:33:03 +00:00
annexuser
1586e16a0b Added a comment 2016-04-30 17:30:18 +00:00
annexuser
1602210c9f 2016-04-30 17:23:33 +00:00
ollie@6d66b5a4b0992998efe3e4c244a66708bf5d96f3
c84d34063f Added a comment 2016-04-29 15:04:17 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
06f152f4c7 2016-04-29 13:25:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5238da9f73 Added a comment 2016-04-29 13:21:04 +00:00
Gus
ad95032dd7 Added a comment: Branching questions 2016-04-29 12:11:35 +00:00
http://svario.it/gioele
24c224f4f9 Added a comment 2016-04-29 10:26:23 +00:00
CandyAngel
4482caf37d Added a comment 2016-04-29 10:04:55 +00:00
ollie@6d66b5a4b0992998efe3e4c244a66708bf5d96f3
754775a029 2016-04-29 09:50:07 +00:00
Joey Hess
d5ddfa44c4
devblog 2016-04-28 16:19:20 -04:00
Joey Hess
9c7e46c9c5
correction of scope of security problem
AFAICS, it's not only affecting resumes, but any upload to a special remote
with chunking enabled.
2016-04-28 16:07:10 -04:00
Joey Hess
b22409db38
avoid warnings about not exported System.Directory.isSymbolicLink 2016-04-28 15:18:11 -04:00
Joey Hess
9f6c29fb38
pin unix to already installed version
This prevents multiple versions of unix, from ghc and needed by newer
versions of some packages conflicting.

Had to update the bytestring and blaze-builder pins follow-on from this
change.
2016-04-28 14:21:57 -04:00
Joey Hess
5fe450514b
Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But,
git-annex does no use symlinks on windows yet and this conflicts with the
function by the same name from unix-compat, so hide it.
2016-04-28 13:18:44 -04:00
Joey Hess
6566795e4f
pin directory to last version that doesn't break MissingH
https://github.com/jgoerzen/missingh/issues/31
2016-04-28 13:02:56 -04:00
Joey Hess
1f253e84f2
add news item for git-annex 6.20160419 2016-04-28 09:48:45 -04:00
Joey Hess
21118084db
releasing package git-annex version 6.20160419 2016-04-28 09:48:08 -04:00
Joey Hess
58b65dd8ee
comment 2016-04-27 17:15:24 -04:00
Joey Hess
d0036b9100
todo 2016-04-27 17:15:02 -04:00
Joey Hess
71e5bebc45
remove warning 2016-04-27 15:17:02 -04:00
Joey Hess
665d7ac6e0
fix build with old ghc that lacks MIN_VERSION_GLASGOW_HASKELL macro 2016-04-27 14:32:05 -04:00
Joey Hess
325e21d8bb
add missing dep on transformers 2016-04-27 14:16:45 -04:00
Joey Hess
a66b265b5c
wording 2016-04-27 14:12:43 -04:00
Joey Hess
30f0052ae0
make assistant not write wrappers when GIT_ANNEX_PACKAGE_INSTALL is set
This way, the git-annex-standalone.deb, which does set GIT_ANNEX_APP_BASE,
will not have the assistant install wrappers that it does not need to,
since git-annex is installed system wide from a package.
2016-04-27 14:05:46 -04:00
Joey Hess
c284fbed68
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-27 13:56:31 -04:00
Joey Hess
a3a0ab77df
--allow-unrelated-histories will be in git 2.9.0, not 2.8.2
Also, I had the logic backwards in the version comparison.
2016-04-27 13:54:46 -04:00
Joey Hess
7f3137f408
reorder 2016-04-27 13:50:01 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
85c17a0085 Added a comment 2016-04-27 17:42:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6b5993fecc Added a comment 2016-04-27 17:41:01 +00:00
Joey Hess
0863102ee6
response 2016-04-27 13:35:33 -04:00