git-annex.git
9 years ago(no commit message)
Abdo [Mon, 2 Jan 2017 10:21:02 +0000 (10:21 +0000)]

9 years ago(no commit message)
db48x [Sun, 1 Jan 2017 14:41:07 +0000 (14:41 +0000)]

9 years agoadd news item for git-annex 6.20170101
Joey Hess [Sun, 1 Jan 2017 04:00:44 +0000 (00:00 -0400)]
add news item for git-annex 6.20170101

9 years agoreleasing package git-annex version 6.20170101
Joey Hess [Sun, 1 Jan 2017 03:59:56 +0000 (23:59 -0400)]
releasing package git-annex version 6.20170101

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 31 Dec 2016 19:11:18 +0000 (15:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoAdded a comment: Issue appeared on Android 6.0 (SDK 23)
https://itorres.net/ [Sat, 31 Dec 2016 14:33:25 +0000 (14:33 +0000)]
Added a comment: Issue appeared on Android 6.0 (SDK 23)

9 years agoAdded a comment: To Reproduce
ghen1 [Sat, 31 Dec 2016 14:19:07 +0000 (14:19 +0000)]
Added a comment: To Reproduce

9 years agoremove old item
Joey Hess [Sat, 31 Dec 2016 04:20:08 +0000 (00:20 -0400)]
remove old item

9 years agotodo
Joey Hess [Sat, 31 Dec 2016 04:19:01 +0000 (00:19 -0400)]
todo

9 years agoresponse
Joey Hess [Fri, 30 Dec 2016 22:27:28 +0000 (18:27 -0400)]
response

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 30 Dec 2016 22:25:52 +0000 (18:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agowork around ghc segfault
Joey Hess [Fri, 30 Dec 2016 22:14:19 +0000 (18:14 -0400)]
work around ghc segfault

hSetEncoding of a closed handle segfaults.
https://ghc.haskell.org/trac/ghc/ticket/7161

8484c0c1976b2daa4be674b09f6f54c15c746aa6 introduced the crash.
In particular, stdin may get closed (by eg, getContents) and then trying
to set its encoding will crash. We didn't need to adjust stdin's
encoding anyway, but only stderr, to work around
https://github.com/yesodweb/persistent/issues/474

Thanks to Mesar Hameed for assistance related to reproducing this bug.

9 years ago(no commit message)
ghen1 [Fri, 30 Dec 2016 21:25:34 +0000 (21:25 +0000)]

9 years ago(no commit message)
ghen1 [Fri, 30 Dec 2016 21:13:29 +0000 (21:13 +0000)]

9 years agomore windows build fix
Joey Hess [Fri, 30 Dec 2016 20:39:51 +0000 (16:39 -0400)]
more windows build fix

9 years agofix build on windows
Joey Hess [Fri, 30 Dec 2016 16:31:51 +0000 (12:31 -0400)]
fix build on windows

9 years agorefactor
Joey Hess [Fri, 30 Dec 2016 16:31:17 +0000 (12:31 -0400)]
refactor

9 years agofix windows build
Joey Hess [Fri, 30 Dec 2016 15:37:24 +0000 (11:37 -0400)]
fix windows build

9 years agofix windows build
Joey Hess [Fri, 30 Dec 2016 15:37:06 +0000 (11:37 -0400)]
fix windows build

9 years agofix build with old ghc
Joey Hess [Fri, 30 Dec 2016 15:10:20 +0000 (11:10 -0400)]
fix build with old ghc

9 years agomake this build under windows
Joey Hess [Fri, 30 Dec 2016 15:04:00 +0000 (11:04 -0400)]
make this build under windows

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 30 Dec 2016 14:48:56 +0000 (10:48 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoidea
Joey Hess [Thu, 29 Dec 2016 18:57:13 +0000 (14:57 -0400)]
idea

9 years agoAdded a comment
mhauru [Thu, 29 Dec 2016 18:00:10 +0000 (18:00 +0000)]
Added a comment

9 years ago(no commit message)
mhauru [Thu, 29 Dec 2016 17:49:14 +0000 (17:49 +0000)]

9 years agoimprove description of password prompting
Joey Hess [Wed, 28 Dec 2016 19:55:54 +0000 (15:55 -0400)]
improve description of password prompting

Since the user does not know whether it will run su or sudo, indicate
whether the password prompt will be for root or the user's password,
when possible.

I assume that programs like gksu that can prompt for either depending on
system setup will make clear in their prompt what they're asking for.

9 years agoSupport all common locations of the torrc file.
Joey Hess [Wed, 28 Dec 2016 19:12:31 +0000 (15:12 -0400)]
Support all common locations of the torrc file.

9 years agofix windows build
Joey Hess [Wed, 28 Dec 2016 19:00:44 +0000 (15:00 -0400)]
fix windows build

9 years agofix build
Joey Hess [Wed, 28 Dec 2016 18:31:43 +0000 (14:31 -0400)]
fix build

9 years agodevblog
Joey Hess [Wed, 28 Dec 2016 16:42:42 +0000 (12:42 -0400)]
devblog

9 years agofix link and clarify
Joey Hess [Wed, 28 Dec 2016 16:40:43 +0000 (12:40 -0400)]
fix link and clarify

9 years agowording
Joey Hess [Wed, 28 Dec 2016 16:38:34 +0000 (12:38 -0400)]
wording

9 years agofix markup
Joey Hess [Wed, 28 Dec 2016 16:34:42 +0000 (12:34 -0400)]
fix markup

9 years agoa few last changes post xmpp removal
Joey Hess [Wed, 28 Dec 2016 16:29:21 +0000 (12:29 -0400)]
a few last changes post xmpp removal

9 years agoupdate
Joey Hess [Wed, 28 Dec 2016 16:26:48 +0000 (12:26 -0400)]
update

9 years agoMerge branch 'no-xmpp'
Joey Hess [Wed, 28 Dec 2016 16:26:16 +0000 (12:26 -0400)]
Merge branch 'no-xmpp'

9 years agoclose; fixed in shakespeare
Joey Hess [Wed, 28 Dec 2016 16:26:05 +0000 (12:26 -0400)]
close; fixed in shakespeare

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 28 Dec 2016 16:25:37 +0000 (12:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoremotedaemon: notice on RELOAD when tor hidden service has been enabled
Joey Hess [Wed, 28 Dec 2016 16:21:52 +0000 (12:21 -0400)]
remotedaemon: notice on RELOAD when tor hidden service has been enabled

and start serving it. This makes the webapp wormhole tor pairing work 100%!

This commit was sponsored by Andrea Rota.

9 years agore-enable enableTor
Joey Hess [Wed, 28 Dec 2016 15:23:22 +0000 (11:23 -0400)]
re-enable enableTor

9 years agoimprove html for alert box
Joey Hess [Wed, 28 Dec 2016 15:22:32 +0000 (11:22 -0400)]
improve html for alert box

9 years agoAdded a comment
ghen1 [Wed, 28 Dec 2016 11:16:17 +0000 (11:16 +0000)]
Added a comment

9 years agoAdded a comment
avar [Wed, 28 Dec 2016 08:28:36 +0000 (08:28 +0000)]
Added a comment

9 years agowhitespace
Joey Hess [Wed, 28 Dec 2016 04:17:36 +0000 (00:17 -0400)]
whitespace

9 years agoAdded a comment
https://launchpad.net/~felixonmars [Wed, 28 Dec 2016 03:04:52 +0000 (03:04 +0000)]
Added a comment

9 years agoresponse
Joey Hess [Wed, 28 Dec 2016 00:16:34 +0000 (20:16 -0400)]
response

9 years ago(no commit message)
avar [Wed, 28 Dec 2016 00:08:07 +0000 (00:08 +0000)]

9 years agoresponse
Joey Hess [Tue, 27 Dec 2016 21:26:31 +0000 (17:26 -0400)]
response

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 27 Dec 2016 21:17:54 +0000 (17:17 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agodevblog
Joey Hess [Tue, 27 Dec 2016 21:16:20 +0000 (17:16 -0400)]
devblog

9 years agoimprove html, add screenshots
Joey Hess [Tue, 27 Dec 2016 21:13:32 +0000 (17:13 -0400)]
improve html, add screenshots

9 years agofix tabs
Joey Hess [Tue, 27 Dec 2016 20:47:00 +0000 (16:47 -0400)]
fix tabs

9 years agoMerge branch 'master' into no-xmpp
Joey Hess [Tue, 27 Dec 2016 20:44:44 +0000 (16:44 -0400)]
Merge branch 'master' into no-xmpp

9 years agowebapp: full wormhole pairing UI (untested)
Joey Hess [Tue, 27 Dec 2016 20:36:05 +0000 (16:36 -0400)]
webapp: full wormhole pairing UI (untested)

This commit was sponsored by Riku Voipio.

9 years agoclean up some imports
Joey Hess [Tue, 27 Dec 2016 20:29:29 +0000 (16:29 -0400)]
clean up some imports

9 years agoavoid leaving MVar empty
Joey Hess [Tue, 27 Dec 2016 20:26:26 +0000 (16:26 -0400)]
avoid leaving MVar empty

Something might want to observe the code multiple times.

9 years ago(no commit message)
https://launchpad.net/~felixonmars [Tue, 27 Dec 2016 09:06:45 +0000 (09:06 +0000)]

9 years agoAdded a comment: one more thing
Asureus [Sun, 25 Dec 2016 14:46:46 +0000 (14:46 +0000)]
Added a comment: one more thing

9 years ago(no commit message)
Asureus [Sun, 25 Dec 2016 14:26:02 +0000 (14:26 +0000)]

9 years agooops, manual reflow
xloem [Sun, 25 Dec 2016 01:36:30 +0000 (01:36 +0000)]
oops, manual reflow

9 years agoUpdate text with link to assistant/quickstart
xloem [Sun, 25 Dec 2016 01:29:15 +0000 (01:29 +0000)]
Update text with link to assistant/quickstart

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 24 Dec 2016 21:16:07 +0000 (17:16 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agodevblog
Joey Hess [Sat, 24 Dec 2016 21:15:01 +0000 (17:15 -0400)]
devblog

9 years agowebapp: check that tor and magic wormhole are installed
Joey Hess [Sat, 24 Dec 2016 21:08:03 +0000 (17:08 -0400)]
webapp: check that tor and magic wormhole are installed

9 years agowording
Joey Hess [Sat, 24 Dec 2016 20:56:56 +0000 (16:56 -0400)]
wording

9 years agomocked up wormhole pairing interface in webapp
Joey Hess [Sat, 24 Dec 2016 20:54:43 +0000 (16:54 -0400)]
mocked up wormhole pairing interface in webapp

9 years agoadd back share_with_a_friend_walkthrough, adapted for tor pairing
Joey Hess [Sat, 24 Dec 2016 19:35:28 +0000 (15:35 -0400)]
add back share_with_a_friend_walkthrough, adapted for tor pairing

and some other xmpp to tor related changes

9 years agocopyright year update
Joey Hess [Sat, 24 Dec 2016 19:17:37 +0000 (15:17 -0400)]
copyright year update

9 years agocleanup
Joey Hess [Sat, 24 Dec 2016 19:14:46 +0000 (15:14 -0400)]
cleanup

9 years agoMerge branch 'master' into no-xmpp
Joey Hess [Sat, 24 Dec 2016 18:48:51 +0000 (14:48 -0400)]
Merge branch 'master' into no-xmpp

9 years agoAlways use filesystem encoding for all file and handle reads and writes.
Joey Hess [Sat, 24 Dec 2016 18:46:31 +0000 (14:46 -0400)]
Always use filesystem encoding for all file and handle reads and writes.

This is a big scary change. I have convinced myself it should be safe. I
hope!

9 years agoAdded a comment
https://launchpad.net/~r0lf [Sat, 24 Dec 2016 17:56:13 +0000 (17:56 +0000)]
Added a comment

9 years agoreally fix su command
Joey Hess [Sat, 24 Dec 2016 17:23:52 +0000 (13:23 -0400)]
really fix su command

9 years agotodo
Joey Hess [Sat, 24 Dec 2016 17:10:51 +0000 (13:10 -0400)]
todo

9 years agofix su params
Joey Hess [Sat, 24 Dec 2016 17:08:07 +0000 (13:08 -0400)]
fix su params

9 years agocomment
Joey Hess [Sat, 24 Dec 2016 16:58:45 +0000 (12:58 -0400)]
comment

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 24 Dec 2016 16:55:58 +0000 (12:55 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoupdate
Joey Hess [Sat, 24 Dec 2016 16:53:57 +0000 (12:53 -0400)]
update

9 years agoenable-tor: When run as a regular user, test a connection back to the hidden service...
Joey Hess [Sat, 24 Dec 2016 16:49:28 +0000 (12:49 -0400)]
enable-tor: When run as a regular user, test a connection back to the hidden service over tor.

This way we know that after enable-tor, the tor hidden service is fully
published and working, and so there should be no problems with it at
pairing time.

It has to start up its own temporary listener on the hidden service. It
would be nice to have it start the remotedaemon running, so that extra
step is not needed afterwards. But, there may already be a remotedaemon
running, in communication with the assistant and we don't want to start
another one. I thought about trying to HUP any running remotedaemon, but
Windows does not make it easy to do that. In any case, having the user
start the remotedaemon themselves lets them know it needs to be running
to serve the hidden service.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.

9 years agorefactor
Joey Hess [Sat, 24 Dec 2016 16:12:58 +0000 (12:12 -0400)]
refactor

9 years agoclose
Joey Hess [Sat, 24 Dec 2016 16:07:50 +0000 (12:07 -0400)]
close

9 years agoRevert "close"
Joey Hess [Sat, 24 Dec 2016 16:07:15 +0000 (12:07 -0400)]
Revert "close"

This reverts commit 3aaabc906b776075e190739b42157959b4e09f31.

Commit contained incomplete work.

9 years agoclose
Joey Hess [Thu, 22 Dec 2016 17:59:21 +0000 (13:59 -0400)]
close

9 years agoAdded a comment: compiled with GHC 8, but LOCPATH is still set
http://svario.it/gioele [Wed, 21 Dec 2016 21:51:09 +0000 (21:51 +0000)]
Added a comment: compiled with GHC 8, but LOCPATH is still set

9 years agotodo
Joey Hess [Wed, 21 Dec 2016 19:11:10 +0000 (15:11 -0400)]
todo

9 years agoinclude tor-annex in hidden service directory names
Joey Hess [Wed, 21 Dec 2016 18:31:27 +0000 (14:31 -0400)]
include tor-annex in hidden service directory names

To make it easier to manage/delete them etc.

Backwards compatablity is preserved for existing tor configs.

9 years agocomment
Joey Hess [Wed, 21 Dec 2016 18:21:05 +0000 (14:21 -0400)]
comment

9 years agoAdded a comment: git annex info
marekj [Wed, 21 Dec 2016 12:58:37 +0000 (12:58 +0000)]
Added a comment: git annex info

9 years ago(no commit message)
marekj [Wed, 21 Dec 2016 12:12:42 +0000 (12:12 +0000)]

9 years ago(no commit message)
tom@6463e5ce4c0e478cb7583fb37288d6954e17bfc6 [Wed, 21 Dec 2016 04:18:13 +0000 (04:18 +0000)]

9 years agoAdded a comment
t.z.mates [Tue, 20 Dec 2016 23:08:44 +0000 (23:08 +0000)]
Added a comment

9 years agocleanup
Joey Hess [Tue, 20 Dec 2016 21:46:30 +0000 (17:46 -0400)]
cleanup

9 years agofail before suing when not in a git-annex repo
Joey Hess [Tue, 20 Dec 2016 21:46:14 +0000 (17:46 -0400)]
fail before suing when not in a git-annex repo

9 years agoenable-tor: No longer needs to be run as root.
Joey Hess [Tue, 20 Dec 2016 21:40:36 +0000 (17:40 -0400)]
enable-tor: No longer needs to be run as root.

When run by not root, su's to root automatically.

This commit was sponsored by Brock Spratlen on Patreon.

9 years agorelocate tor socket out of /etc
Joey Hess [Tue, 20 Dec 2016 20:01:10 +0000 (16:01 -0400)]
relocate tor socket out of /etc

weasel explained that apparmor limits on what files tor can read do not
apply to sockets (because they're not files). And apparently the
problems I was seeing with hidden services not being accessible had to
do with onion address propigation and not the location of the socket
file.

remotedaemon looks up the HiddenServicePort in torrc, so if it was
previously configured with the socket in /etc, that will still work.

This commit was sponsored by Denis Dzyubenko on Patreon.

9 years agoanwser
Joey Hess [Tue, 20 Dec 2016 19:38:18 +0000 (15:38 -0400)]
anwser

9 years agoDebian: Suggest tor and magic-wormhole.
Joey Hess [Tue, 20 Dec 2016 19:26:14 +0000 (15:26 -0400)]
Debian: Suggest tor and magic-wormhole.

Suggests, not recommends, because tor is not for everyone.

9 years agoFix build with directory-1.3.
Joey Hess [Tue, 20 Dec 2016 19:23:59 +0000 (15:23 -0400)]
Fix build with directory-1.3.

See https://github.com/haskell/directory/issues/66

9 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 20 Dec 2016 19:15:22 +0000 (15:15 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

9 years agoupdate
Joey Hess [Tue, 20 Dec 2016 19:15:01 +0000 (15:15 -0400)]
update