Joey Hess
9d8e15bd37
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 15:31:02 -04:00
Joey Hess
91fa570aad
more prep
2014-04-11 15:10:19 -04:00
Joey Hess
bdb81af880
prep release
2014-04-11 15:01:10 -04:00
Joey Hess
e0ca99b480
rename confusingly named "day"
2014-04-11 14:38:23 -04:00
Joey Hess
2aab47ea3e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 14:35:27 -04:00
Joey Hess
c678798a5c
assistant: Fix high CPU usage triggered when a monthly fsck is scheduled, and the last time the job ran was a day of the month > 12. This caused a runaway loop. Thanks to Anarcat for his assistance, and to Maximiliano Curia for identifying the cause of this bug.
2014-04-11 14:34:09 -04:00
Joey Hess
80b41c5a6b
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 13:31:20 -04:00
http://joeyh.name/
66e81aacfd
Added a comment
2014-04-11 16:32:51 +00:00
Joey Hess
fd49e7f1b1
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 12:30:38 -04:00
Joey Hess
5ef1a160dd
typo
2014-04-11 12:12:34 -04:00
Joey Hess
b8e43fda1e
note that GIT_ANNEX_SHELL_READONLY does not imply GIT_ANNEX_SHELL_LIMITED
2014-04-11 12:08:31 -04:00
Joey Hess
a67c16a81e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 12:04:10 -04:00
Joey Hess
8ca44c25e6
update for g3
2014-04-11 12:03:40 -04:00
Joey Hess
e31c5a1648
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-11 10:31:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn6-8_3tbusU0Myh97-GGuGUY9bBoBP3bQ
60e10298c4
2014-04-11 13:43:55 +00:00
Joey Hess
eb9e7c44ee
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 16:32:20 -04:00
Joey Hess
a6df4698a3
Fix rsync progress parsing in locales that use comma in number display. Closes : #744148
2014-04-10 15:36:51 -04:00
Joey Hess
a40bf97d8c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 13:32:11 -04:00
Joey Hess
aba17a402e
update
2014-04-10 13:27:47 -04:00
Joey Hess
67e280baa9
nuke tmp dir so things don't linger between builds
2014-04-10 13:08:07 -04:00
Joey Hess
27cad7f808
note automatic upgrade issue
2014-04-10 13:05:11 -04:00
Joey Hess
407d60ca5d
Remove wget from OSX dmg, due to issues with cert paths that broke git-annex automatic upgrading. Instead, curl is used, unless the OSX system has wget installed, which will then be used.
2014-04-10 12:54:58 -04:00
Joey Hess
fdd189626e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 11:47:38 -04:00
Joey Hess
9a1ce2b0cd
fix title ( #150 )
2014-04-10 11:27:21 -04:00
Joey Hess
6b43d8432c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 06:32:29 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
66692efed9
2014-04-10 09:34:36 +00:00
Joey Hess
4c89145a26
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 05:31:53 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
9f98234657
2014-04-10 09:23:25 +00:00
Joey Hess
7002766a8a
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-10 04:31:39 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl64jV2rE8GMogJ6XuqESSkz78RVBgVdGw
4c9cce7cb4
Added a comment: I can't add google drive as remote
2014-04-10 07:55:56 +00:00
ayutheos
78ddde9a59
Added a comment
2014-04-10 07:52:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl64jV2rE8GMogJ6XuqESSkz78RVBgVdGw
3bd6e00277
removed
2014-04-10 07:52:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl64jV2rE8GMogJ6XuqESSkz78RVBgVdGw
ae070c310b
Added a comment: I can't add special remotes
2014-04-10 07:50:40 +00:00
Joey Hess
9417526a8f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-09 17:32:23 -04:00
Joey Hess
4cca9cef0c
update
2014-04-09 16:43:43 -04:00
Joey Hess
83654f031d
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-09 16:34:19 -04:00
Joey Hess
4d19487a0b
devblog
2014-04-09 16:33:10 -04:00
Joey Hess
db38678595
webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be set up.
...
This commit was sponsored by Nathan Howell.
2014-04-09 16:27:24 -04:00
Joey Hess
14349fb752
also show signal icon next to connected xmpp remotes
2014-04-09 15:51:00 -04:00
Joey Hess
33b8cff433
webapp: Show a network signal icon next to ssh remotes that it's currently connected with.
2014-04-09 15:26:41 -04:00
Joey Hess
356eec08a6
typo
2014-04-09 14:22:59 -04:00
Joey Hess
fb73792f72
make git-remote-daemon ssh transport robust
...
* Remote system might be available, and connection get lost. Should
reconnect, but needs to avoid bad behavior (ie, constant reconnect
attempts.) Use exponential backoff.
* Detect if old system had a too old git-annex-shell, and show the user
a nice message in the webapp. Required parsing error messages, so perhaps
this code shoudl be removed once enough time has passed..
* Switch the protocol to using remote URI's, rather than remote names.
Names change. Also avoids issues with serialization of names containing
whitespace.
This is nearly ready for merge into master now. I'd still like to make the ssh
transport smarter about reusing ssh connection caching during git pull.
This commit was sponsored by Jim Paris.
2014-04-09 14:14:55 -04:00
Joey Hess
38862bf65d
merge from propellor
2014-04-09 01:15:24 -04:00
Joey Hess
bd21fe0b14
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-08 23:33:00 -04:00
EvanDeaubl
714129a533
Added a comment
2014-04-09 03:28:25 +00:00
Joey Hess
b907ca0525
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-08 19:32:00 -04:00
Joey Hess
e2736a3f5e
add day's sponsor
2014-04-08 19:00:21 -04:00
Joey Hess
1f095f7935
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-08 18:53:17 -04:00
Joey Hess
eea2b36062
how to send patches
2014-04-08 18:52:35 -04:00
augusto
3ebd994bd5
Added a comment
2014-04-08 22:46:18 +00:00
