Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2013-04-20 19:29:26 -04:00
commit cefe2fac2d
3 changed files with 11 additions and 3 deletions

View file

@ -18,8 +18,8 @@ and use cases to add. Feel free to chip in with comments! --[[Joey]]
We are, approximately, here: We are, approximately, here:
* Months 10: bugfixing, Android webapp * Month 10: bugfixing, Android webapp
* Months 111: more user-driven features and polishing * Month 11: more user-driven features and polishing
* Month 12: "Windows purgatory" [[Windows]] * Month 12: "Windows purgatory" [[Windows]]
## porting ## porting

View file

@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
want the first time they run it, but to save typing on android, anything want the first time they run it, but to save typing on android, anything
that gets enough votes will be included in a list of choices as well. that gets enough votes will be included in a list of choices as well.
[[!poll open=yes expandable=yes 4 "/sdcard/annex" 1 "Whole /sdcard" 1 "DCIM directory (photos and videos only)"]] [[!poll open=yes expandable=yes 33 "/sdcard/annex" 2 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnE6kFAbud1LWrQuyX76yMYnUjHt9tR-A8"
nickname="Leonardo"
subject="Direct mode"
date="2013-04-20T20:55:09Z"
content="""
I think direct mode should be the default on Android
"""]]