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

4 files changed, 61 insertions, 0 deletions

diff --git a/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_1_91a62a2ce14a1027d2ac8b8e88df5f0c._comment b/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_1_91a62a2ce14a1027d2ac8b8e88df5f0c._comment
new file mode 100644
index 000000000..540e06ee3
--- /dev/null
+++ b/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_1_91a62a2ce14a1027d2ac8b8e88df5f0c._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.1.42"
+ subject="comment 1"
+ date="2013-01-09T23:21:58Z"
+ content="""
+I have a ipv6 enabled computer here, where the webapp works fine. I think you must have something odd in your network configuration if web browsers, when sent to \"http://localhost:port/ don't manage to connect to a web server running on ipv4.
+
+The webapp only uses 127.0.0.1 if \"localhost\" resolves to that address. If \"localhost\" resolves to both ipv6 and ipv4 addresses, the webapp uses the ipv4 and not the ipv6 address. If \"localhost\" resolves to only ipv6, the webapp uses ipv6.
+
+AFAIK it's not possible to bind to both an ipv4 and an ipv6 address, and get the same port number for both, and the webapp needs a port number to use to launch the web browser. Therefore, it has to choose one address. It choses ipv4 in preference to ipv6 because there are some things that still don't support ipv6. [This commit](http://source.git-annex.branchable.com/?p=source.git;a=commit;h=467844d7d3f703f99fcde1f951f33efda5e90074) is relevant.
+"""]]
diff --git a/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_2_4982cd373eaaeee180be03c6e9fda7b1._comment b/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_2_4982cd373eaaeee180be03c6e9fda7b1._comment
new file mode 100644
index 000000000..849bde6e4
--- /dev/null
+++ b/doc/bugs/assistant_listens_on_127.0.0.1_not_::1_which_breaks_IPv6_enabled_hosts/comment_2_4982cd373eaaeee180be03c6e9fda7b1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o"
+ nickname="Andrew"
+ subject="comment 2"
+ date="2013-01-09T23:51:18Z"
+ content="""
+Watching tcpdump on loopback I only see a request from Epiphany to ::1, after that it gives up.  So not terribly helpful.
+
+It looks like it might be a bug in the browsers. :(
+"""]]
diff --git a/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn b/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
new file mode 100644
index 000000000..92c32cdc7
--- /dev/null
+++ b/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
@@ -0,0 +1,27 @@
+What steps will reproduce the problem?
+
+> Open Webapp on Mac OSX Mountain Lion
+
+What is the expected output? What do you see instead?
+
+> I expect notification bubbles and transfer progress bars to show and update on the fly, as well as notifications to disappear when I click the X.
+> 
+> Instead, I have to reload the page after clicking an X or to see new bubbles and progress bar updates.
+
+What version of git-annex are you using? On what operating system?
+
+>     git-annex version: 3.20130107
+>     local repository version: 3
+>     default repository version: 3
+>     supported repository versions: 3
+>     upgrade supported from repository versions: 0 1 2
+> 
+> Mac OS X 10.8.2 Build 12C3006
+> 
+> Chrome Version 23.0.1271.101
+
+Please provide any additional information below.
+
+Javascript console error log says "Syntax error on localhost:5" which is this line:
+
+    <link rel="stylesheet" href="/static/css/bootstrap.css"><link rel="stylesheet" href="/static/css/bootstrap-responsive.css"><style>body{padding-top:60px;padding-bottom:40px}.sidebar-nav{padding:9px 0}</style><script src="/static/jquery.full.js"></script><script src="/static/js/bootstrap-dropdown.js"></script><script src="/static/js/bootstrap-modal.js"></script><script src="/static/js/bootstrap-collapse.js"></script><script src="/static/longpolling.js"></script><script>function longpoll_"sidebar"() {
diff --git a/doc/preferred_content/comment_6_b434c0e2aaa132020fd4a01551285376._comment b/doc/preferred_content/comment_6_b434c0e2aaa132020fd4a01551285376._comment
new file mode 100644
index 000000000..12deccb35
--- /dev/null
+++ b/doc/preferred_content/comment_6_b434c0e2aaa132020fd4a01551285376._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
+ nickname="Andrew"
+ subject="comment 6"
+ date="2013-01-10T03:00:52Z"
+ content="""
+Is there a way to change these definitions for a given annex?
+
+ie: in this repo make \"client\" mean
+
+    present and exclude=*/archive/* and exclude=archive/*
+"""]]