Joey Hess
5e01e9b4be
update
2013-05-02 19:09:20 -04:00
Joey Hess
d36bce94d6
blog for the day
2013-05-02 19:04:55 -04:00
Joey Hess
6dca92defe
need cpp
2013-05-02 19:00:50 -04:00
Joey Hess
e24490b162
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-02 18:30:15 -04:00
Joey Hess
210e250f87
add screenshot!
2013-05-02 18:28:49 -04:00
Joey Hess
abe8464026
work around getAddrInfo segfault on Android
...
For an unknown reason, getAddrInfo currently is segfaulting. Note that
in February, I had used warpDebug, which uses getAddrInfo, and it worked.
Don't know if my toolchain has changed and broke it, or it's due to having
a different Android device now. Anyway, work around it by hardcoding the
address to use.
2013-05-02 16:48:14 -04:00
Joey Hess
ce47f4cb20
--listen is not supported on Android
2013-05-02 16:47:42 -04:00
Joey Hess
1e9b8e1467
cannot open file:// url on Android, so don't use the htmlshim there
2013-05-02 16:46:47 -04:00
Joey Hess
63cc47dd51
wording
2013-05-02 16:13:37 -04:00
Joey Hess
4aae976f7e
android build improvements
2013-05-02 16:07:44 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
87ed52ef75
typo
2013-05-02 17:14:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
046f8de140
2013-05-02 17:13:29 +00:00
Joey Hess
e92f04f9cc
build fix for -XMPP
2013-05-02 13:04:49 -04:00
Joey Hess
c8b74cdfd7
stop setting ai_addrconfig
...
This caused the code to fail on Android, which doesn't know that flag.
It seems best to let the OS default flags be used. Tested working ok on
Linux. The only difference on Linux is it might return a v4mapped ipv6
address sometimes.
2013-05-02 13:01:42 -04:00
Joey Hess
7d22a47414
update
2013-05-02 11:41:43 -04:00
Joey Hess
2e019a1da6
don't fail android build if there are no splices
2013-05-02 11:18:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
e4db0f8ca5
2013-05-02 09:12:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
08875d7e97
2013-05-02 09:10:47 +00:00
Joey Hess
be253aeff9
add a runshell script to the top of the app directory
...
This is mostly useful when you have adb with root access, to easily start the
git-annex environment in there.
2013-05-02 01:43:22 -04:00
Joey Hess
906258ca5e
include build flags in version info when not in a repo
2013-05-01 23:11:13 -04:00
Joey Hess
d983f68911
change the default GIT_ANNEX_ANDROID_SOURCETREE location to be in ~/tmp/
2013-05-01 22:37:20 -04:00
Joey Hess
ed2fc6fcd3
update
2013-05-01 21:20:27 -04:00
Joey Hess
1c27eaa720
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-01 21:10:12 -04:00
Joey Hess
5c1d67bda0
blog for the day
2013-05-01 21:09:50 -04:00
Richard Hartmann
9a228d08b6
Two typos
2013-05-01 23:46:14 +02:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
7f9f08056d
Added a comment: mimetypes
2013-05-01 20:37:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
f7103c3e8e
2013-05-01 19:55:20 +00:00
Joey Hess
d9e288b0fd
fix build with S3 disabled (for Android)
2013-05-01 13:27:51 -04:00
Joey Hess
2274ec80d7
add news item for git-annex 4.20130501
2013-05-01 13:20:36 -04:00
Joey Hess
b61740e6d3
releasing version 4.20130501
2013-05-01 13:19:29 -04:00
Joey Hess
6f1806f76b
Merge branch 'flush' of https://github.com/brunoqc/git-annex
2013-05-01 12:35:09 -04:00
Bruno Bigras
0fe8eb0953
Fix the URL not showing until the app closes
2013-05-01 15:48:16 +00:00
Joey Hess
2acd981b6e
update for initremote changes
2013-05-01 02:23:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
4a5bfb3b12
Added a comment
2013-05-01 03:12:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
af4a873ba0
Added a comment: I think this already works
2013-05-01 03:09:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
7120a78028
2013-05-01 02:22:27 +00:00
Joey Hess
0f06eb5ecf
reorder
2013-04-30 20:56:43 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
9ad1119346
Added a comment
2013-04-30 23:38:52 +00:00
http://joeyh.name/
bf5bc496e3
Added a comment
2013-04-30 23:36:12 +00:00
Joey Hess
0807211a67
thaw content directory in direct mode too
...
A content directory can be frozen in direct mode. One way this can happen
is if the content is transferred before direct mode has a mapping for it,
so it's stored in the content directory.
So, we need to thaw the content directory before doing things with it.
2013-04-30 19:33:43 -04:00
Joey Hess
1111552efd
update
2013-04-30 19:33:32 -04:00
Joey Hess
11ca4cee34
refactor
2013-04-30 19:09:36 -04:00
Joey Hess
7c73b7584d
blog for the day
2013-04-30 17:59:36 -04:00
http://joeyh.name/
64b94563ec
Added a comment
2013-04-30 21:57:13 +00:00
http://joeyh.name/
88fdccb8eb
Added a comment
2013-04-30 21:51:50 +00:00
Joey Hess
f04a0e221b
Merge branch 'master' of ssh://git-annex.branchable.com
2013-04-30 17:47:22 -04:00
Joey Hess
50a8ea4cdc
avoid auto-accepting pair requests from friends already paired with
...
Unless the request is for repo uuid we already know. This way, if A1 pairs
with friend B1, and B1 pairs with device B2, then B1 can request A1 pair
with it and no confirmation is needed. (In future, may want to try to do
that automatically, to make a more robust network.)
2013-04-30 17:38:58 -04:00
Joey Hess
6e93a8d292
update
2013-04-30 16:57:40 -04:00
Joey Hess
e363cefcb3
assistant: Fix bug that could cause incoming pushes to not get merged into the local tree.
...
Observed that the pushed refs were received, but not merged into master.
The merger never saw an add event for these refs. Either git is not writing
to a new file and renaming it into place, or the inotify code didn't notice
that. Changed it to also watch for modify events and that seems to have
fixed it!
2013-04-30 16:37:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
756a90d917
Added a comment: Another correction
2013-04-30 20:11:58 +00:00
