Merge remote-tracking branch 'origin/master'

4 files changed, 93 insertions, 0 deletions

diff --git a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work/comment_7_a7139f19f0b73c024cd9218eb01e6104._comment b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work/comment_7_a7139f19f0b73c024cd9218eb01e6104._comment
new file mode 100644
index 000000000..36547245e
--- /dev/null
+++ b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work/comment_7_a7139f19f0b73c024cd9218eb01e6104._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs"
+ nickname="Chris"
+ subject="Same error with Android"
+ date="2013-05-21T02:15:25Z"
+ content="""
+I'm using git-annex version 4.20130516-g3240006 on Android, and when I attempt to add a cloud repo with SSH & git, I get that same error - \"unknown UUID: cannot modify\". My Linux box running 4.20130516-gedc4ccd handles the same server as a cloud repo without any problems.
+"""]]
diff --git a/doc/bugs/gpg_error_on_android.mdwn b/doc/bugs/gpg_error_on_android.mdwn
new file mode 100644
index 000000000..42f083015
--- /dev/null
+++ b/doc/bugs/gpg_error_on_android.mdwn
@@ -0,0 +1,36 @@
+### Please describe the problem.
+
+Adding an existing cloud repo on box.com results in an gpg error:
+
+    user error (gpg ["--quiet","--trust-model","always","--batch","--passphrase-fd","86","--decrypt"] exited 2)
+
+### What steps will reproduce the problem?
+
+Enabling an existing cloud repository.
+
+### What version of git-annex are you using? On what operating system?
+
+Latest Android (4.20130516-g32 40006) on a rooted Samsung Galaxy Note (CyanogenMod 10.1)
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
+
+(merging refs/synced/de8a8792-70de-48c3-a646-a168ce1d9d35/c25hdXRoQGphYmJlci5vcmc=/git-annex into git-annex...)
+(Recording state in git...)
+(gpg) gpg: can't open `/usr/local/share/gnupg/options.skel': No such file or directory
+gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/secring.gpg.lock' done via O_EXCL
+gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/pubring.gpg.lock' done via O_EXCL
+gpg: encrypted with unknown algorithm 3
+gpg: decryption failed: secret key not available
+(gpg) gpg: encrypted with unknown algorithm 3
+gpg: decryption failed: secret key not available
+(gpg) gpg: encrypted with unknown algorithm 3
+gpg: decryption failed: secret key not available
+(gpg) gpg: encrypted with unknown algorithm 3
+gpg: decryption failed: secret key not available
+
+# End of transcript or log.
+"""]]
diff --git a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn b/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
new file mode 100644
index 000000000..268bc9ff7
--- /dev/null
+++ b/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
@@ -0,0 +1,5 @@
+It would be very nice with an "advanced settings" for jabber and webdav support.
+
+Currently XMPP fails if you use a google apps account. Since the domain provided in the email is not the same as the XMPP server.
+
+Same goes for webdav support. If i have my own webdav server somewhere on the internet there is no way to set it up in the assistant.
diff --git a/doc/todo/wishlist:_special_remote_mega.co.nz/comment_2_6ca08ef808d4336fc42d0f279d6627b5._comment b/doc/todo/wishlist:_special_remote_mega.co.nz/comment_2_6ca08ef808d4336fc42d0f279d6627b5._comment
new file mode 100644
index 000000000..542b92a67
--- /dev/null
+++ b/doc/todo/wishlist:_special_remote_mega.co.nz/comment_2_6ca08ef808d4336fc42d0f279d6627b5._comment
@@ -0,0 +1,44 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0"
+ nickname="Tobias"
+ subject="Usage of mega hook"
+ date="2013-05-21T09:09:28Z"
+ content="""
+megaannex
+=========
+
+Hook program for gitannex to use mega.co.nz as backend
+
+# Requirements:
+
+    requests>=0.10
+    pycrypto
+
+Credit for the mega api interface goes to: https://github.com/richardasaurus/mega.py 
+
+## Install
+Clone the git repository in your home folder.
+
+    git clone git://github.com/TobiasTheViking/megaannex.git 
+
+This should make a ~/megannex folder
+
+## Setup
+Run the program once to make an empty config file
+
+    cd ~/megaannex; python2 megaannex.py
+
+Edit the megaannex.conf file. Add your mega.co.nz username and password
+
+Note: The folder option in the megaannex.conf file isn't yet used. 
+
+## Commands for gitannex:
+
+    git config annex.mega-store-hook '/usr/bin/python2 ~/megaannex/megaannex.py store --subject $ANNEX_KEY --file $ANNEX_FILE'
+    git config annex.mega-retrieve-hook '/usr/bin/python2 ~/megaannex/megaannex.py  getfile --subject $ANNEX_KEY --file $ANNEX_FILE'
+    git config annex.mega-checkpresent-hook '/usr/bin/python2 ~/megaannex/megaannex.py fileexists --subject $ANNEX_KEY'
+    git config annex.mega-remove-hook '/usr/bin/python2 ~/megaannex/megaannex.py delete --subject $ANNEX_KEY'
+    git annex initremote mega type=hook hooktype=mega encryption=shared
+    git annex describe mega \"the mega.co.nz library\"
+
+"""]]