Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	00be07070c 
 
						 
						
							
							
								
								
								fix build on windows  
							
							 
							
							
							
						 
						
							2016-12-30 12:31:51 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	b219be5100 
 
						 
						
							
							
								
								
								refactor  
							
							 
							
							
							
						 
						
							2016-12-30 12:31:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	dfbd303d66 
 
						 
						
							
							
								
								
								fix windows build  
							
							 
							
							
							
						 
						
							2016-12-30 11:37:24 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	cf6c5d5ca9 
 
						 
						
							
							
								
								
								fix windows build  
							
							 
							
							
							
						 
						
							2016-12-30 11:37:06 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	3ec1478767 
 
						 
						
							
							
								
								
								fix build with old ghc  
							
							 
							
							
							
						 
						
							2016-12-30 11:10:20 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	d785a565ef 
 
						 
						
							
							
								
								
								make this build under windows  
							
							 
							
							
							
						 
						
							2016-12-30 11:04:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	b2834db613 
 
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							 
							
							
							
						 
						
							2016-12-30 10:48:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	a03c51988f 
 
						 
						
							
							
								
								
								idea  
							
							 
							
							
							
						 
						
							2016-12-29 14:57:13 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mhauru 
								
							 
						 
						
							
							
								
							
							
	c2325c2640  
						 
						
							
							
								
								
								Added a comment  
							
							 
							
							
							
						 
						
							2016-12-29 18:00:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mhauru 
								
							 
						 
						
							
							
								
							
							
	a702917848  
						 
						
							
							
								
								
								 
							
							 
							
							
							
						 
						
							2016-12-29 17:49:14 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	e92f2d1080 
 
						 
						
							
							
								
								
								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. 
							
						 
						
							2016-12-28 16:07:49 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	10e4d93212 
 
						 
						
							
							
								
								
								Support all common locations of the torrc file.  
							
							 
							
							
							
						 
						
							2016-12-28 15:12:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	924fdea53f 
 
						 
						
							
							
								
								
								fix windows build  
							
							 
							
							
							
						 
						
							2016-12-28 15:00:44 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	e8a9b3cb7e 
 
						 
						
							
							
								
								
								fix build  
							
							 
							
							
							
						 
						
							2016-12-28 14:31:43 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	9e49660bc2 
 
						 
						
							
							
								
								
								devblog  
							
							 
							
							
							
						 
						
							2016-12-28 12:42:42 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	30136bad93 
 
						 
						
							
							
								
								
								fix link and clarify  
							
							 
							
							
							
						 
						
							2016-12-28 12:40:43 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	fdf934e659 
 
						 
						
							
							
								
								
								wording  
							
							 
							
							
							
						 
						
							2016-12-28 12:38:34 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	c94f135247 
 
						 
						
							
							
								
								
								fix markup  
							
							 
							
							
							
						 
						
							2016-12-28 12:34:42 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	cf6545198b 
 
						 
						
							
							
								
								
								a few last changes post xmpp removal  
							
							 
							
							
							
						 
						
							2016-12-28 12:29:21 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	b21ffe62f5 
 
						 
						
							
							
								
								
								update  
							
							 
							
							
							
						 
						
							2016-12-28 12:26:48 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	93f7d114db 
 
						 
						
							
							
								
								
								Merge branch 'no-xmpp'  
							
							 
							
							
							
						 
						
							2016-12-28 12:26:16 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	b701247b06 
 
						 
						
							
							
								
								
								close; fixed in shakespeare  
							
							 
							
							
							
						 
						
							2016-12-28 12:26:05 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	23ffbbea94 
 
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							 
							
							
							
						 
						
							2016-12-28 12:25:37 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	309742805f 
 
						 
						
							
							
								
								
								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. 
							
						 
						
							2016-12-28 12:21:52 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	4d690dc680 
 
						 
						
							
							
								
								
								re-enable enableTor  
							
							 
							
							
							
						 
						
							2016-12-28 11:23:22 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	9ec9816843 
 
						 
						
							
							
								
								
								improve html for alert box  
							
							 
							
							
							
						 
						
							2016-12-28 11:22:32 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ghen1 
								
							 
						 
						
							
							
								
							
							
	9106a3873b  
						 
						
							
							
								
								
								Added a comment  
							
							 
							
							
							
						 
						
							2016-12-28 11:16:17 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									avar 
								
							 
						 
						
							
							
								
							
							
	01761ab131  
						 
						
							
							
								
								
								Added a comment  
							
							 
							
							
							
						 
						
							2016-12-28 08:28:36 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	9dabe85bb5 
 
						 
						
							
							
								
								
								whitespace  
							
							 
							
							
							
						 
						
							2016-12-28 00:17:36 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									https://launchpad.net/~felixonmars 
								
							 
						 
						
							
							
								
							
							
	1fdbd066b3  
						 
						
							
							
								
								
								Added a comment  
							
							 
							
							
							
						 
						
							2016-12-28 03:04:52 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	3d1a4febd8 
 
						 
						
							
							
								
								
								response  
							
							 
							
							
							
						 
						
							2016-12-27 20:16:34 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									avar 
								
							 
						 
						
							
							
								
							
							
	93164fcf41  
						 
						
							
							
								
								
								 
							
							 
							
							
							
						 
						
							2016-12-28 00:08:07 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	aa6465fdd1 
 
						 
						
							
							
								
								
								response  
							
							 
							
							
							
						 
						
							2016-12-27 17:26:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	662730e1e7 
 
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							 
							
							
							
						 
						
							2016-12-27 17:17:54 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	0712f62ab9 
 
						 
						
							
							
								
								
								devblog  
							
							 
							
							
							
						 
						
							2016-12-27 17:16:20 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	18f16072fb 
 
						 
						
							
							
								
								
								improve html, add screenshots  
							
							 
							
							
							
						 
						
							2016-12-27 17:13:32 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	7d32acdf71 
 
						 
						
							
							
								
								
								fix tabs  
							
							 
							
							
							
						 
						
							2016-12-27 16:47:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	7bce73bf27 
 
						 
						
							
							
								
								
								Merge branch 'master' into no-xmpp  
							
							 
							
							
							
						 
						
							2016-12-27 16:44:44 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	b68d2a4b68 
 
						 
						
							
							
								
								
								webapp: full wormhole pairing UI (untested)  
							
							 
							
							... 
							
							
							
							This commit was sponsored by Riku Voipio. 
							
						 
						
							2016-12-27 16:41:35 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	9a35077168 
 
						 
						
							
							
								
								
								clean up some imports  
							
							 
							
							
							
						 
						
							2016-12-27 16:29:29 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	41d956e0a0 
 
						 
						
							
							
								
								
								avoid leaving MVar empty  
							
							 
							
							... 
							
							
							
							Something might want to observe the code multiple times. 
							
						 
						
							2016-12-27 16:26:26 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									https://launchpad.net/~felixonmars 
								
							 
						 
						
							
							
								
							
							
	d698e440b7  
						 
						
							
							
								
								
								 
							
							 
							
							
							
						 
						
							2016-12-27 09:06:45 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Asureus 
								
							 
						 
						
							
							
								
							
							
	c3290d202a  
						 
						
							
							
								
								
								Added a comment: one more thing  
							
							 
							
							
							
						 
						
							2016-12-25 14:46:46 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Asureus 
								
							 
						 
						
							
							
								
							
							
	6af17e66ef  
						 
						
							
							
								
								
								 
							
							 
							
							
							
						 
						
							2016-12-25 14:26:02 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									xloem 
								
							 
						 
						
							
							
								
							
							
	1baf3b3226  
						 
						
							
							
								
								
								oops, manual reflow  
							
							 
							
							
							
						 
						
							2016-12-25 01:36:30 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									xloem 
								
							 
						 
						
							
							
								
							
							
	cd3ff86e58  
						 
						
							
							
								
								
								Update text with link to assistant/quickstart  
							
							 
							
							
							
						 
						
							2016-12-25 01:29:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	dd24baa66c 
 
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							 
							
							
							
						 
						
							2016-12-24 17:16:07 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	36c35f7fbe 
 
						 
						
							
							
								
								
								devblog  
							
							 
							
							
							
						 
						
							2016-12-24 17:15:01 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	9e0aae036b 
 
						 
						
							
							
								
								
								webapp: check that tor and magic wormhole are installed  
							
							 
							
							
							
						 
						
							2016-12-24 17:08:03 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	de79be2ba6 
 
						 
						
							
							
								
								
								wording  
							
							 
							
							
							
						 
						
							2016-12-24 16:56:56 -04:00