diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-20 19:29:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-20 19:29:26 -0400 |
| commit | 2fec34c67e34fcbca4bc543f9f7e72c51a444321 (patch) | |
| tree | d9173c9edecd654e022b9f6898061f790dff3f48 | |
| parent | 82bbf866d54dcaf552a063cf95160afacb5d4878 (diff) | |
| parent | 8a9d64c878ff17a49701af5148cd27fa26cf1933 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn index bd36bb203..194ecac2a 100644 --- a/doc/design/assistant.mdwn +++ b/doc/design/assistant.mdwn @@ -18,8 +18,8 @@ and use cases to add. Feel free to chip in with comments! --[[Joey]] We are, approximately, here: -* Months 10: bugfixing, Android webapp -* Months 111: more user-driven features and polishing +* Month 10: bugfixing, Android webapp +* Month 11: more user-driven features and polishing * Month 12: "Windows purgatory" [[Windows]] ## porting diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index b126ef22c..c2a81131d 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -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 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/"]] diff --git a/doc/design/assistant/polls/Android_default_directory/comment_2_2f1eaae95075db26488517720afd1c63._comment b/doc/design/assistant/polls/Android_default_directory/comment_2_2f1eaae95075db26488517720afd1c63._comment new file mode 100644 index 000000000..b2df3b0a2 --- /dev/null +++ b/doc/design/assistant/polls/Android_default_directory/comment_2_2f1eaae95075db26488517720afd1c63._comment @@ -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 +"""]] |