mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2013-06-26 11:44:51 -04:00
commit 46f50f5dc2
7 changed files with 87 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Hanging_on_install_on_Mountain_lion/comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI"
nickname="Zellyn"
subject="Happy to debug"
date="2013-06-26T02:47:35Z"
content="""
Hi Joey, I'm having the same problem. I'm currently trying the homebrew route.
I would be happy to debug, but I'm not familiar at all with git annex or the assistant, so I don't even know where to start looking. Let me know what would be useful to try, and I'll try it and post the results.
"""]]

15
doc/bugs/Hanging_on_install_on_Mountain_lion/comment_7_00962da9288976f8a48d0cbc08e1d9e2._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI"
nickname="Zellyn"
subject="More info"
date="2013-06-26T04:21:47Z"
content="""
Looking at what the browser is doing:
1. Open file://localhost/var/folders/00/0wpr8000h01000cxqpysvccm003kv1/T/webapp72069.html
2. Meta refresh to: http://127.0.0.1:64190/?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9
3. Redirect to: http://127.0.0.1:64190/config?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9
4. Redirect to: http://127.0.0.1:64190/config/repository/new/first?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9
5. hang indefinitely
"""]]

25
doc/design/assistant/blog/day_285__fixed_the_archive_directory_loop/comment_1_1065e756dc6d66aefd214eb8ac5ebe1d._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 1"
date="2013-06-26T08:36:33Z"
content="""
Been pretty bad with keeping the osx builder going, but this should fix it...
<pre>
[jtang@x00 build ((cfb577d...))]$ git diff
diff --git a/.gitignore b/.gitignore
index 93bd49e..717b58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ cabal-dev
.virthualenv
tags
Setup
+*.hi
+*.o
</pre>
The build on OSX leaves some stray files and it complains about it.
"""]]

11
doc/design/assistant/blog/day_288__success_stories/comment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://edheil.wordpress.com/"
ip="99.54.57.201"
subject="comment 1"
date="2013-06-25T22:26:27Z"
content="""
I've been real quiet cause everything's been working great. :)
One thing I have not messed with yet is the whole XMPP thing. I mostly don't share between two machines that are online at the same time, I just use git annex for backups and to have content \"optionally\" available. I should give XMPP a try sometime.
"""]]

10
doc/design/assistant/blog/day_288__success_stories/comment_2_343333356de20e170edb8020faa7400d._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://launchpad.net/~subito"
nickname="subito"
subject="Big success!"
date="2013-06-26T07:00:15Z"
content="""
Annex is working great for me since 8/2012 or something... Using it a lot and the Assistant is awesome!
If you would raise some more funding, I'd be more than happy to support you once more - really great software!
"""]]

15
doc/design/assistant/blog/day_288__success_stories/comment_3_4e4034bec789543b562ac263df3e21dd._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl3A5oeZFLreGhDTFVMOJYIy1auKiTL_ZY"
nickname="Maggie"
subject=":)"
date="2013-06-26T15:04:45Z"
content="""
Poets aren't humble people.
We revel in our own narcissism.
So being mentioned in my brother's blog
was great for me.
I am proud of the success of Git Annex.
(My poems tend to be _much_ better than this.)
"""]]

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