Commit graph

28933 commits

Author SHA1 Message Date
David_K
057ee30429 removed 2016-11-16 01:28:32 +00:00
David_K
08ca407e67 Added a comment 2016-11-16 01:28:14 +00:00
David_K
6c1f0c6b02 Added a comment 2016-11-16 01:28:04 +00:00
Joey Hess
69915c6c9b
fix tricky warning with ghc 8
Whether Route was exported from Assistant.WebApp.Types
or not depended on the version of ghc. So, explictly export it.
2016-11-15 18:51:07 -04:00
Joey Hess
65c9485c3a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-15 18:26:58 -04:00
Joey Hess
556b2ded2b
sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer.
This makes merging a remote into a freshly created direct mode repository
work the same as it works in indirect mode.

The git-annex branches would get merged in any case by a sync,
since that doesn't use git merge.

This might need to be revisited later to better mirror git's behavior.
2016-11-15 18:26:17 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
501c29a2ad Added a comment 2016-11-15 18:01:18 +00:00
Joey Hess
6416ae9c09
unbreak all the autobuilders
git-annex.cabal: Loosen bounds on persistent to allow 2.5, which on Debian
has been patched to work with esqueleto. This may break cabal's resolver on
non-Debian systems; if so, either use stack to build, or run cabal with
--constraint='persistent ==2.2.4.1' Hopefully this mess with esqueleto will
be resolved soon.

https://github.com/prowdsponsor/esqueleto/issues/137
2016-11-15 11:19:57 -04:00
Joey Hess
aa0da3663a
close 2016-11-15 11:02:21 -04:00
Joey Hess
852c4700f3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-15 11:00:04 -04:00
christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb
23a8134e0d Added a comment 2016-11-15 12:15:37 +00:00
https://launchpad.net/~stephane-gourichon-lpad
eaf86f4ff5 Added a comment: "Hmm, guyz? Are you serious with these scripts?" Well, what's the matter? 2016-11-15 10:58:32 +00:00
thowz
4805b6e31d 2016-11-15 02:27:52 +00:00
Joey Hess
67c1e87f05
local lan detection 2016-11-14 18:37:56 -04:00
Joey Hess
b9a68957cc
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-14 16:50:14 -04:00
Joey Hess
35116c5d04
devblog 2016-11-14 16:49:18 -04:00
Joey Hess
61fe128bbc
no-xmpp branch 2016-11-14 15:04:16 -04:00
Joey Hess
a7fd200440
updated design
more details on using tor and pairing
2016-11-14 12:10:09 -04:00
gfa@1e86118cd41fbfea50004af221471ad97b55af18
c20505f02a Added a comment: same on Debian 2016-11-14 09:13:20 +00:00
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd
7876298ee2 2016-11-14 00:46:04 +00:00
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd
2e57f97a67 Added a comment 2016-11-13 22:39:44 +00:00
mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f199
b634e006c4 Added additional comment about it working if I build from source 2016-11-13 02:40:02 +00:00
mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f199
1e88c12576 2016-11-13 01:23:15 +00:00
mail@4e627fd997ef5ca9f75e62ffc0aba5b27bd6aea1
0718de2026 2016-11-12 18:17:28 +00:00
https://tribut.de/
2f52d8a28c 2016-11-12 13:15:29 +00:00
Joey Hess
989520a104
remove redundant constraint 2016-11-11 18:39:05 -04:00
Joey Hess
9e97dc7c46
add missing type signature 2016-11-11 18:14:25 -04:00
Joey Hess
62cd2f10aa
add news item for git-annex 6.20161111 2016-11-11 14:47:46 -04:00
Joey Hess
e544cf7a31
releasing package git-annex version 6.20161111 2016-11-11 14:47:31 -04:00
Joey Hess
d48f4caaef
Linux standalone: Avoid using hard links in the tarball so it can be untarred on eg, afs which does not support them. 2016-11-10 15:12:30 -04:00
Joey Hess
c0d93f678e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-10 14:21:16 -04:00
Joey Hess
37780d9fd2
comment 2016-11-10 14:19:09 -04:00
luckcolorsgoo@ab4f3c1c44a7dbcbcb9d9a29315b59ad524ceaaa
3e521b7334 2016-11-10 18:03:23 +00:00
luckcolorsgoo@ab4f3c1c44a7dbcbcb9d9a29315b59ad524ceaaa
42ef371845 2016-11-10 18:02:40 +00:00
Joey Hess
4643470537
webapp: Explicitly avoid checking for auth in static subsite requests.
Yesod didn't used to do auth checks for that, but this may have changed.
I don't have a way to reproduce the reported problem yet, but this change
certianly won't hurt anything.

This commit was sponsored by Thom May on Patreon.
2016-11-10 13:48:54 -04:00
openmedi
6bcddd244e Added a comment 2016-11-10 12:53:34 +00:00
christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb
f9cacdd140 Added a comment 2016-11-10 09:50:40 +00:00
christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb
5cae09562b 2016-11-10 09:46:14 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
30e07dbd9b prefer per-user, fix ExecStart syntax 2016-11-10 06:34:44 +00:00
jesrui@51c25da8d6f34e6df8e3e7ed0277335ed7ddf6a6
ed742953f2 2016-11-10 00:36:05 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
36d0cb5e50 Added a comment: Android 6/7? 2016-11-09 21:44:26 +00:00
public@881708f3cb16d1f967ca9f517a310dd211474013
06eb521ed3 Added a comment: not specific to cloud repo 2016-11-09 21:25:00 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
14a1b2b4e4 Added a comment 2016-11-08 19:18:40 +00:00
Joey Hess
ee8231f982
meh 2016-11-08 14:55:53 -04:00
Joey Hess
9751e6f0c4
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-08 14:53:09 -04:00
Joey Hess
a924c99535
close 2016-11-08 14:52:29 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
96faccdbc6 initial whining 2016-11-08 15:08:32 +00:00
public@881708f3cb16d1f967ca9f517a310dd211474013
013802ea8d Added a comment: joey's test build fixes issue 2016-11-08 14:53:48 +00:00
Euxane
04519cbe48 Added a comment 2016-11-08 10:12:05 +00:00
Euxane
18eb318c57 2016-11-08 10:10:12 +00:00