Merge branch 'master' into webdav

7 files changed, 59 insertions, 1 deletions

diff --git a/Utility/OSX.hs b/Utility/OSX.hs
index cf4a6e859..769d073e8 100644
--- a/Utility/OSX.hs
+++ b/Utility/OSX.hs
@@ -38,6 +38,7 @@ genOSXAutoStartFile label command params = unlines
 	, unlines $ map (\v -> "<string>" ++ v ++ "</string>") (command:params)
 	, "</array>"
 	, "<key>RunAtLoad</key>"
+	, "<true/>"
 	, "</dict>"
 	, "</plist>"
 	]
diff --git a/debian/changelog b/debian/changelog
index 4356bff1e..65c370d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ git-annex (3.20121113) UNRELEASED; urgency=low
   * webapp: The list of repositiories refreshes when new repositories are
     added, including when new repository configurations are pushed in from
     remotes.
+  * OSX: Fix RunAtLoad value in plist file.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 13 Nov 2012 13:17:07 -0400
 
diff --git a/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn b/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn
new file mode 100644
index 000000000..d67cdcd40
--- /dev/null
+++ b/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn
@@ -0,0 +1,15 @@
+What steps will reproduce the problem?
+`cat com.branchable.git-annex.assistant`
+
+What version of git-annex are you using? On what operating system?
+  git-annex version: 3.20121112 on OS X Mountain Lion
+
+Please provide any additional information below.
+The '`RunAtLoad`'  key is missing a value.
+
+It should say:
+
+`<key>RunAtLoad</key>`<br>
+`<true/>`
+
+> Fixed in git. [[done]] --[[Joey]] 
diff --git a/doc/bugs/migrated_files_not_showing_up_in_unused_list.mdwn b/doc/bugs/migrated_files_not_showing_up_in_unused_list.mdwn
index e76448ba0..33776d13a 100644
--- a/doc/bugs/migrated_files_not_showing_up_in_unused_list.mdwn
+++ b/doc/bugs/migrated_files_not_showing_up_in_unused_list.mdwn
@@ -57,3 +57,6 @@ Command outputs (see, specifically, the output of status showing number of SHA25
             100 /var/lib/dpkg/status
          3.20120629 0
             650 http://ftp.us.debian.org/debian/ wheezy/main i386 Packages
+
+
+As Joey predicted, this took care of itself over time. Marking as [[bugs/done]].
diff --git a/doc/bugs/migrated_files_not_showing_up_in_unused_list/comment_2_acb1abeb32c3aba8ba65151afbea753c._comment b/doc/bugs/migrated_files_not_showing_up_in_unused_list/comment_2_acb1abeb32c3aba8ba65151afbea753c._comment
new file mode 100644
index 000000000..ccb711588
--- /dev/null
+++ b/doc/bugs/migrated_files_not_showing_up_in_unused_list/comment_2_acb1abeb32c3aba8ba65151afbea753c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://grossmeier.net/"
+ nickname="greg"
+ subject="comment 2"
+ date="2012-11-15T04:11:55Z"
+ content="""
+You were right, this has taken care of itself.
+
+Thanks much for the solid piece of software.
+"""]]
diff --git a/doc/design/assistant/blog/day_131__webdav_groundwork.mdwn b/doc/design/assistant/blog/day_131__webdav_groundwork.mdwn
new file mode 100644
index 000000000..795acfea1
--- /dev/null
+++ b/doc/design/assistant/blog/day_131__webdav_groundwork.mdwn
@@ -0,0 +1,28 @@
+Read up on WebDAV, and got the haskell library working. Several hours
+were wasted by stumbling over a bug in the library, that requires a
+carefully crafted XML document to prevent. Such a pity about things
+like DAV (and XMPP) being designed back when people were gung-ho about
+XML.. but we're stuck with them now.
+
+Now I'm able to send and receive files to box.com using the library. Trying to
+use an OwnCloud server, though, I get a most strange error message, which
+looks to be coming from deep in the HTTPS library stack: "invalid IV length"
+
+The haskell DAV library didn't have a way to delete files. I've added one
+and sent off a patch.
+
+Roughed in a skeleton of a webdav special remote. Doesn't do anything yet.
+Will soon.
+
+Factored out a Creds module from parts of the S3 special remote and XMPP
+support, that all has to do with credentials storage. Using this for webdav
+creds storage too.
+
+Will also need to factor out the code that's currently in the directory
+special remote, for chunking of files.
+
+----
+
+PS: WebDAV, for all its monstrously complicated feature set, lacks one obvious
+feature: The ability to check how much free space is available to store
+files. Eyeroll.
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index 0ec484e72..142eca222 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
 Help me prioritize my work: What special remote would you most like
 to use with the git-annex assistant?
 
-[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com" 61 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 23 "Google Drive"]]
+[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com" 62 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 23 "Google Drive"]]
 
 This poll is ordered with the options I consider easiest to build
 listed first. Mostly because git-annex already supports them and they