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

This commit is contained in:
Joey Hess 2013-04-30 14:14:56 -04:00
commit 9249c324f4
16 changed files with 306 additions and 5 deletions

View file

@ -10,7 +10,7 @@ Instead, today I worked on making the webapp require less redundant
password entry when adding multiple repositories using the same cloud
provider. This is especially needed for the Internet Archive, since users
will often want to have quite a few repositories, for different IA items.
Implemented it for for box.com, and Amazon too.
Implemented it for box.com, and Amazon too.
Francois Marier has built an Ubuntu PPA for git-annex, containing the
current version, with the assistant and webapp. It's targeted at Precise,

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw"
nickname="Mark"
subject="Thanks!"
date="2013-04-29T01:24:55Z"
content="""
I was not looking forward to figuring out how to come up with all of those haskell build deps on Precise, so thanks to François Marier for putting this together. (Does Ubuntu/launchpad autobuild all of the architectures, or do they need to be contributed? I see that `armhf` isn't there at the moment...)
"""]]

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
that gets enough votes will be included in a list of choices as well.
[[!poll open=yes expandable=yes 41 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
[[!poll open=yes expandable=yes 42 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]