Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb3d8d3f5 
								
							 
						 
						
							
							
								
								Merge pull request  #885  from optikfluffel/patch-1  
							
							... 
							
							
							
							Update Production-guide.md 
							
						 
						
							2017-04-05 03:24:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								cb1617245b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:20:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								49cd7f7fc4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:19:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								4390ae7bf9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:18:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								7603a1d5d2 
								
							 
						 
						
							
							
								
								Merge pull request  #846  from TrollDecker/master  
							
							... 
							
							
							
							Update social.diskseven.com's IPv6 status 
							
						 
						
							2017-04-05 03:08:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								0662ab35eb 
								
							 
						 
						
							
							
								
								Merge pull request  #842  from Angristan/patch-2  
							
							... 
							
							
							
							Missing quotes 
							
						 
						
							2017-04-05 03:08:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								9c47a07dfa 
								
							 
						 
						
							
							
								
								Merge pull request  #845  from thurloat/patch-1  
							
							... 
							
							
							
							Add mastodon.club to running instances list 
							
						 
						
							2017-04-05 03:07:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								3340074137 
								
							 
						 
						
							
							
								
								Merge pull request  #848  from ProgVal/patch-3  
							
							... 
							
							
							
							Add oc.todon.fr to the list of instances. 
							
						 
						
							2017-04-05 03:07:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								b3523a6a8d 
								
							 
						 
						
							
							
								
								Merge pull request  #854  from Angristan/patch-3  
							
							... 
							
							
							
							Fix crontab edit 
							
						 
						
							2017-04-05 03:07:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								ae1b33d594 
								
							 
						 
						
							
							
								
								Merge pull request  #891  from ashfurrow/patch-1  
							
							... 
							
							
							
							Adds instructions for adding admin users for Heroku installs 
							
						 
						
							2017-04-05 03:01:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								dd839491b6 
								
							 
						 
						
							
							
								
								Merge pull request  #894  from asm/mastodon_cc  
							
							... 
							
							
							
							Adding https://mastodon.cc  
							
						 
						
							2017-04-05 02:56:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ash Furrow 
								
							 
						 
						
							
							
							
							
								
							
							
								bd371b6adb 
								
							 
						 
						
							
							
								
								Updates instructions.  
							
							
							
						 
						
							2017-04-04 20:53:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								a5f1a6bf01 
								
							 
						 
						
							
							
								
								Merge pull request  #872  from kwaio/patch-1  
							
							... 
							
							
							
							typo in admin doc 
							
						 
						
							2017-04-05 02:53:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Snell 
								
							 
						 
						
							
							
							
							
								
							
							
								1771eea458 
								
							 
						 
						
							
							
								
								Adding  https://mastodon.cc  
							
							
							
						 
						
							2017-04-04 16:35:57 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ash Furrow 
								
							 
						 
						
							
							
							
							
								
							
							
								5e8e8ba01d 
								
							 
						 
						
							
							
								
								Adds instructions for adding admin users.  
							
							
							
						 
						
							2017-04-04 18:45:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Udo Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa339d3ff 
								
							 
						 
						
							
							
								
								Update Production-guide.md  
							
							
							
						 
						
							2017-04-04 23:45:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nope Nope 
								
							 
						 
						
							
							
							
							
								
							
							
								583208f5ae 
								
							 
						 
						
							
							
								
								typo in admin doc  
							
							... 
							
							
							
							s/rails/rake/ 
							
						 
						
							2017-04-04 20:45:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								1447ba504b 
								
							 
						 
						
							
							
								
								Add file package  
							
							... 
							
							
							
							If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media. 
							
						 
						
							2017-04-04 19:23:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pierre Ozoux 
								
							 
						 
						
							
							
							
							
								
							
							
								ecbda73b27 
								
							 
						 
						
							
							
								
								Update the list of instances  
							
							
							
						 
						
							2017-04-04 17:28:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valentin Lorentz 
								
							 
						 
						
							
							
							
							
								
							
							
								3187e1b398 
								
							 
						 
						
							
							
								
								Add oc.todon.fr to the list of instances.  
							
							... 
							
							
							
							[SKIP CI] 
							
						 
						
							2017-04-04 18:11:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Santoro 
								
							 
						 
						
							
							
							
							
								
							
							
								8db8132504 
								
							 
						 
						
							
							
								
								Add social.nasqueron.org instance  
							
							
							
						 
						
							2017-04-04 18:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								3ab29e5a9d 
								
							 
						 
						
							
							
								
								Fix crontab edit  
							
							... 
							
							
							
							Missing -u parameter to specify the mastodon user. 
							
						 
						
							2017-04-04 17:23:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jo Decker 
								
							 
						 
						
							
							
							
							
								
							
							
								f9c2d86945 
								
							 
						 
						
							
							
								
								Update social.diskseven.com's IPv6 status  
							
							... 
							
							
							
							As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before. 
							
						 
						
							2017-04-04 15:29:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Thurlow 
								
							 
						 
						
							
							
							
							
								
							
							
								acc597fa98 
								
							 
						 
						
							
							
								
								Add mastodon.club to running instances list  
							
							
							
						 
						
							2017-04-04 11:14:51 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Florian Maunier 
								
							 
						 
						
							
							
							
							
								
							
							
								53b2df62dd 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							... 
							
							
							
							Add my own instance 
							
						 
						
							2017-04-04 16:03:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angristan 
								
							 
						 
						
							
							
							
							
								
							
							
								aee8798179 
								
							 
						 
						
							
							
								
								Missing quotes  
							
							
							
						 
						
							2017-04-04 15:57:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								db5149b963 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-04 14:51:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								7f543e1fca 
								
							 
						 
						
							
							
								
								Merge pull request  #800  from unascribed/patch-1  
							
							... 
							
							
							
							Add fern.surgeplay.com to the instances list 
							
						 
						
							2017-04-04 14:51:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								180aab6e2e 
								
							 
						 
						
							
							
								
								Merge pull request  #799  from Wonderfall/master  
							
							... 
							
							
							
							update social.targaryen.house info 
							
						 
						
							2017-04-04 14:50:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								b9c1c5bdd0 
								
							 
						 
						
							
							
								
								Merge pull request  #788  from yiskah/patch-5  
							
							... 
							
							
							
							Add instances from instances.mastodon.xyz 
							
						 
						
							2017-04-04 14:49:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								4068de0eed 
								
							 
						 
						
							
							
								
								Merge pull request  #815  from walfie/patch-1  
							
							... 
							
							
							
							Fix typo in Heroku guide 
							
						 
						
							2017-04-04 14:49:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leo Wzukw 
								
							 
						 
						
							
							
							
							
								
							
							
								cb21bf5b40 
								
							 
						 
						
							
							
								
								More consistent typography  
							
							
							
						 
						
							2017-04-04 06:58:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									walfie 
								
							 
						 
						
							
							
							
							
								
							
							
								766eabf194 
								
							 
						 
						
							
							
								
								Fix typo in Heroku guide  
							
							
							
						 
						
							2017-04-04 00:00:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8eca42b265 
								
							 
						 
						
							
							
								
								Separate background jobs into different queues. ATTENTION: new queue "pull"  
							
							... 
							
							
							
							must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them. 
							
						 
						
							2017-04-04 00:53:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alice 
								
							 
						 
						
							
							
							
							
								
							
							
								c2787014e5 
								
							 
						 
						
							
							
								
								Add octodon.social  
							
							
							
						 
						
							2017-04-03 23:05:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aesen 
								
							 
						 
						
							
							
							
							
								
							
							
								9a4a766ab3 
								
							 
						 
						
							
							
								
								Add fern.surgeplay.com to the instances list  
							
							... 
							
							
							
							It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere. 
							
						 
						
							2017-04-03 15:52:33 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wonderfall 
								
							 
						 
						
							
							
							
							
								
							
							
								e27807e8e9 
								
							 
						 
						
							
							
								
								update social.targaryen.house info  
							
							
							
						 
						
							2017-04-03 21:36:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
							
							
								
							
							
								37863b45a3 
								
							 
						 
						
							
							
								
								Add instances from instances.mastodon.xyz  
							
							... 
							
							
							
							Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list 
							
						 
						
							2017-04-03 12:28:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									wxcafé 
								
							 
						 
						
							
							
							
							
								
							
							
								5c269d3e0e 
								
							 
						 
						
							
							
								
								Adds social.wxcafe.net  
							
							
							
						 
						
							2017-04-03 17:32:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								dac1ca1e40 
								
							 
						 
						
							
							
								
								"direct" in statuses#create  
							
							
							
						 
						
							2017-04-03 01:23:37 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								145493fd4c 
								
							 
						 
						
							
							
								
								Forgot direct statuses :P  
							
							
							
						 
						
							2017-04-02 22:46:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								a9f7e93396 
								
							 
						 
						
							
							
								
								Typofixes  
							
							
							
						 
						
							2017-04-02 21:17:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								db554277b9 
								
							 
						 
						
							
							
								
								Code now code  
							
							
							
						 
						
							2017-04-02 21:13:15 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								034f60b5c4 
								
							 
						 
						
							
							
								
								Merging 'upstream' updates  
							
							
							
						 
						
							2017-04-02 21:07:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								0b99777853 
								
							 
						 
						
							
							
								
								Updated API docs  
							
							
							
						 
						
							2017-04-02 21:03:49 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								c385fc5d3c 
								
							 
						 
						
							
							
								
								Merge pull request  #757  from yiskah/patch-4  
							
							... 
							
							
							
							Add social.imirhil.fr 
							
						 
						
							2017-04-03 03:40:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd4650511 
								
							 
						 
						
							
							
								
								Merge pull request  #748  from ProgVal/patch-1  
							
							... 
							
							
							
							Fix install instructions. 
							
						 
						
							2017-04-03 03:39:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
							
							
								
							
							
								fd51b1a2a5 
								
							 
						 
						
							
							
								
								Add social.imirhil.fr  
							
							
							
						 
						
							2017-04-02 20:11:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								97a75cc942 
								
							 
						 
						
							
							
								
								Merge pull request  #744  from fpiesche/master  
							
							... 
							
							
							
							Add in-depth user guide 
							
						 
						
							2017-04-03 00:26:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valentin Lorentz 
								
							 
						 
						
							
							
							
							
								
							
							
								02fac04fc5 
								
							 
						 
						
							
							
								
								Also fix the start command.  
							
							
							
						 
						
							2017-04-03 00:10:51 +02:00