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

6 files changed, 77 insertions, 1 deletions

diff --git a/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn b/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn
new file mode 100644
index 000000000..9cdf3639f
--- /dev/null
+++ b/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn
@@ -0,0 +1,17 @@
+### Please describe the problem.
+
+After submitting the form in the webapp for adding a box.com remote, I get:
+
+   Internal Server Error - WEBDAV failed to write file: "Unauthorized": user error
+
+### What steps will reproduce the problem?
+
+Fill in the box.com add remote form. Username=username, password=password, "share..."=checked, directory=annex, Encryption="Encrypt all data" and hit the "Add repository" button.
+
+### What version of git-annex are you using? On what operating system?
+
+  git-annex version 4.20130513-g5185533 on Android 4.2.2
+
+### Please provide any additional information below.
+
+Didn't find a .git/annex/debug.log
diff --git a/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me/comment_1_0303ce880415d7e043533551c2b24694._comment b/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me/comment_1_0303ce880415d7e043533551c2b24694._comment
new file mode 100644
index 000000000..a55f4eeb2
--- /dev/null
+++ b/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me/comment_1_0303ce880415d7e043533551c2b24694._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo"
+ nickname="Brian"
+ subject="It worked my second try"
+ date="2013-05-14T00:39:08Z"
+ content="""
+I enabled debug logging and tried again and this time the remote was successfully added! Maybe the first time I mistyped my password?
+
+Either way, it is working now and I created a file in my annex directory and the assistant successfully synced it to my box.com repo.
+"""]]
diff --git a/doc/bugs/Browser_fails_to_launch_on_Android___39__git_annex_webapp__39__.mdwn b/doc/bugs/Browser_fails_to_launch_on_Android___39__git_annex_webapp__39__.mdwn
new file mode 100644
index 000000000..5f64e717f
--- /dev/null
+++ b/doc/bugs/Browser_fails_to_launch_on_Android___39__git_annex_webapp__39__.mdwn
@@ -0,0 +1,33 @@
+### Please describe the problem.
+
+When I launch git annex Android application, it fails to open the web browser. Workaround is to copy the url and manually paste it into web browser url line.
+
+### What steps will reproduce the problem?
+
+See above
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version 4.20130513-g5185533 on Android 4.2.2
+
+### Please provide any additional information below.
+
+[[!format sh """
+u0_a126@android:/sdcard/git-annex.home $ git annex webapp
+Launching web browser on http://127.0.0.1:47557/?auth=[...snip...]
+Starting: Intent { act=android.intent.action.VIEW dat=http://127.0.0.1:47557/?auth=[...snip...] }
+java.lang.SecurityException: Permission Denial: startActivity asks to run as user -2 but is calling from user 0; this requires android.permission.INTERACT_ACROSS_USERS_FULL
+        at android.os.Parcel.readException(Parcel.java:1425)
+        at android.os.Parcel.readException(Parcel.java:1379)
+        at android.app.ActivityManagerProxy.startActivityAsUser(ActivityManagerNative.java:1921)
+        at com.android.commands.am.Am.runStart(Am.java:494)
+        at com.android.commands.am.Am.run(Am.java:109)
+        at com.android.commands.am.Am.main(Am.java:82)
+        at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method)
+        at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:235)
+        at dalvik.system.NativeStart.main(Native Method)
+failed to start web browser
+u0_a126@android:/sdcard/git-annex.home $
+
+# End of transcript or log.
+"""]]
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
index bbf332f51..0d1c65ddf 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 43 "/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 44 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/forum/Accessing_files_in_bare_repository/comment_12_0e7ea5161b6da6e9bb9425bdb953de33._comment b/doc/forum/Accessing_files_in_bare_repository/comment_12_0e7ea5161b6da6e9bb9425bdb953de33._comment
new file mode 100644
index 000000000..8d083d32d
--- /dev/null
+++ b/doc/forum/Accessing_files_in_bare_repository/comment_12_0e7ea5161b6da6e9bb9425bdb953de33._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/bBy7WkgQicYHIiiyj.Vm0TcMbxi2quzbPFef#6f9f7"
+ nickname="Frederik Vanrenterghem"
+ subject="comment 12"
+ date="2013-05-14T04:07:37Z"
+ content="""
+Thanks Joey, this worked. The symlinks are in the directory and I can get the actual file contents (except for one attempt that failed - I'll need to check why that didn't seem to have propagated to the bare repository.)
+"""]]
diff --git a/doc/forum/Does_migrate_ensure_data_integrity__63__/comment_2_f389b924c8531b35fdf5dedd10fc8000._comment b/doc/forum/Does_migrate_ensure_data_integrity__63__/comment_2_f389b924c8531b35fdf5dedd10fc8000._comment
new file mode 100644
index 000000000..c377d814c
--- /dev/null
+++ b/doc/forum/Does_migrate_ensure_data_integrity__63__/comment_2_f389b924c8531b35fdf5dedd10fc8000._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="GLITTAH"
+ ip="154.51.136.37"
+ subject="comment 2"
+ date="2013-05-14T15:54:08Z"
+ content="""
+An even better solution.  Thanks for your time and effort joey!
+"""]]