6d519e6fd1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 21:44:16 -04:00  
				
					
						
							
							
								 
						
							
								065defefac 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 21:42:10 -04:00  
				
					
						
							
							
								 
						
							
								bc237d17a7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 21:34:41 -04:00  
				
					
						
							
							
								 
						
							
								4fb24a70d3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-07 19:46:07 -04:00  
				
					
						
							
							
								 
						
							
								a872f2f4c6 
								
							 
						 
						
							
							
								
								Merge pull request  #1204  from benklop/patch-1  
							
							... 
							
							
							
							Update Administration-guide.md 
							
						 
						
							2017-04-08 01:00:32 +02:00  
				
					
						
							
							
								 
						
							
								32a6f0884c 
								
							 
						 
						
							
							
								
								Merge pull request  #1200  from huertanix/patch-2  
							
							... 
							
							
							
							Update Heroku-guide.md 
							
						 
						
							2017-04-08 01:00:06 +02:00  
				
					
						
							
							
								 
						
							
								f113af5350 
								
							 
						 
						
							
							
								
								Add HackerNewsBot  
							
							... 
							
							
							
							I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list. 
							
						 
						
							2017-04-07 15:56:02 -07:00  
				
					
						
							
							
								 
						
							
								f578cf8331 
								
							 
						 
						
							
							
								
								Update Administration-guide.md  
							
							... 
							
							
							
							the syntax for running the rake task wasn't correct. 
							
						 
						
							2017-04-07 16:31:50 -06:00  
				
					
						
							
							
								 
						
							
								a7ab2204d4 
								
							 
						 
						
							
							
								
								Update Heroku-guide.md  
							
							... 
							
							
							
							Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit. 
							
						 
						
							2017-04-07 17:44:32 -04:00  
				
					
						
							
							
								 
						
							
								36a83cc4f9 
								
							 
						 
						
							
							
								
								Update Heroku-guide.md  
							
							... 
							
							
							
							Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing. 
							
						 
						
							2017-04-07 17:29:21 -04:00  
				
					
						
							
							
								 
						
							
								30903d5f02 
								
							 
						 
						
							
							
								
								Add indigo.zone to list of instances  
							
							
							
						 
						
							2017-04-07 14:10:37 -07:00  
				
					
						
							
							
								 
						
							
								94536af96d 
								
							 
						 
						
							
							
								
								Adds Oulipo.social to Mastodons list  
							
							... 
							
							
							
							This is a Mastodon with a particular constraint about
what symbols you can post. 
							
						 
						
							2017-04-07 14:06:49 -07:00  
				
					
						
							
							
								 
						
							
								0b32b5108e 
								
							 
						 
						
							
							
								
								Merge pull request  #1191  from d3vgru/master  
							
							... 
							
							
							
							change suggested cipher for nginx 
							
						 
						
							2017-04-07 23:02:49 +02:00  
				
					
						
							
							
								 
						
							
								e2f024147c 
								
							 
						 
						
							
							
								
								Merge pull request  #1172  from mjankowski/mj-heroku-docs  
							
							... 
							
							
							
							Update heroku instructions 
							
						 
						
							2017-04-07 22:50:31 +02:00  
				
					
						
							
							
								 
						
							
								131f505fd0 
								
							 
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2017-04-07 16:33:13 -03:00  
				
					
						
							
							
								 
						
							
								27012aaeb6 
								
							 
						 
						
							
							
								
								change suggested cipher for nginx  
							
							
							
						 
						
							2017-04-07 14:10:39 -05:00  
				
					
						
							
							
								 
						
							
								4c751d25e5 
								
							 
						 
						
							
							
								
								Add mastodon.fun  
							
							
							
						 
						
							2017-04-07 20:33:52 +02:00  
				
					
						
							
							
								 
						
							
								0f4fa59812 
								
							 
						 
						
							
							
								
								Update heroku instructions  
							
							
							
						 
						
							2017-04-07 12:50:29 -04:00  
				
					
						
							
							
								 
						
							
								41396de7a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-04-07 14:01:20 +01:00  
				
					
						
							
							
								 
						
							
								786e6f94b9 
								
							 
						 
						
							
							
								
								Update Finnish translations, add sample Minio config ( #954 )  
							
							
							
						 
						
							2017-04-07 12:58:12 +02:00  
				
					
						
							
							
								 
						
							
								8e7d0bda40 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-07 11:54:41 +03:00  
				
					
						
							
							
								 
						
							
								8a4ff30ceb 
								
							 
						 
						
							
							
								
								updated instance hostname  
							
							
							
						 
						
							2017-04-06 17:18:40 -07:00  
				
					
						
							
							
								 
						
							
								56f4a94e7b 
								
							 
						 
						
							
							
								
								Update Production-guide.md  
							
							... 
							
							
							
							Under ## General dependencies:
apt-get needs sudo and install was typed wrongly. 
							
						 
						
							2017-04-07 01:05:32 +02:00  
				
					
						
							
							
								 
						
							
								4b08b7c502 
								
							 
						 
						
							
							
								
								Added masto.razrnet.fr  
							
							
							
						 
						
							2017-04-06 23:59:56 +02:00  
				
					
						
							
							
								 
						
							
								cfbd90cf44 
								
							 
						 
						
							
							
								
								Added pericles.world in the list of instances  
							
							
							
						 
						
							2017-04-06 12:05:37 -07:00  
				
					
						
							
							
								 
						
							
								acf6436a99 
								
							 
						 
						
							
							
								
								Add manx.social instance  
							
							
							
						 
						
							2017-04-06 19:31:25 +01:00  
				
					
						
							
							
								 
						
							
								a0f1f9c664 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-06 20:18:56 +02:00  
				
					
						
							
							
								 
						
							
								02c1ad5347 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-06 19:33:17 +02:00  
				
					
						
							
							
								 
						
							
								a736b28646 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-06 19:32:31 +02:00  
				
					
						
							
							
								 
						
							
								c392c54271 
								
							 
						 
						
							
							
								
								Merge pull request  #1042  from johnsudaar/feature/scalingo_one_click  
							
							... 
							
							
							
							Cosmetic changes to the scalingo deployment 
							
						 
						
							2017-04-06 19:32:12 +02:00  
				
					
						
							
							
								 
						
							
								0d5d3c7abe 
								
							 
						 
						
							
							
								
								Add an instance.  
							
							
							
						 
						
							2017-04-06 19:15:57 +02:00  
				
					
						
							
							
								 
						
							
								c441208e29 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-06 19:11:39 +02:00  
				
					
						
							
							
								 
						
							
								a3d204e982 
								
							 
						 
						
							
							
								
								Linux users must enable NFS for Vagrant  
							
							
							
						 
						
							2017-04-06 12:16:39 -04:00  
				
					
						
							
							
								 
						
							
								07495cc13f 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-06 18:07:15 +02:00  
				
					
						
							
							
								 
						
							
								6a88151eda 
								
							 
						 
						
							
							
								
								Add meow.social  
							
							
							
						 
						
							2017-04-06 14:51:42 +02:00  
				
					
						
							
							
								 
						
							
								30619a6716 
								
							 
						 
						
							
							
								
								add my instance  
							
							
							
						 
						
							2017-04-06 14:22:01 +02:00  
				
					
						
							
							
								 
						
							
								eadac4e7f4 
								
							 
						 
						
							
							
								
								Added an instance to the list  
							
							... 
							
							
							
							Just launched https://hackertribe.io/ , added it to the list. 
							
						 
						
							2017-04-06 03:12:34 -07:00  
				
					
						
							
							
								 
						
							
								0209b7d1b5 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							... 
							
							
							
							Add mastodon.land instance 
							
						 
						
							2017-04-06 11:07:33 +02:00  
				
					
						
							
							
								 
						
							
								c62696bc46 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-06 08:52:15 +02:00  
				
					
						
							
							
								 
						
							
								83530f0eef 
								
							 
						 
						
							
							
								
								Add mastodon.elao.com instance  
							
							
							
						 
						
							2017-04-06 08:46:16 +02:00  
				
					
						
							
							
								 
						
							
								73b8e67f4b 
								
							 
						 
						
							
							
								
								Add infinimatix.net to instance list  
							
							
							
						 
						
							2017-04-06 01:15:16 -04:00  
				
					
						
							
							
								 
						
							
								b5d87500d2 
								
							 
						 
						
							
							
								
								Add Northeastern University Mastodon  
							
							
							
						 
						
							2017-04-05 20:58:21 -04:00  
				
					
						
							
							
								 
						
							
								d025c5e593 
								
							 
						 
						
							
							
								
								Added off-the-clock.us to the list of instances  
							
							
							
						 
						
							2017-04-05 19:19:44 -04:00  
				
					
						
							
							
								 
						
							
								7aede8e720 
								
							 
						 
						
							
							
								
								Description in instance list for mastodon.ninetailed.uk  
							
							
							
						 
						
							2017-04-05 22:35:35 +01:00  
				
					
						
							
							
								 
						
							
								eb98c99924 
								
							 
						 
						
							
							
								
								Add mastodon.nuzgo.net  
							
							
							
						 
						
							2017-04-05 20:45:23 +02:00  
				
					
						
							
							
								 
						
							
								6b41fb2e6f 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-05 21:44:13 +03:00  
				
					
						
							
							
								 
						
							
								65b3a2a5a6 
								
							 
						 
						
							
							
								
								Adds mtndevelopment  
							
							
							
						 
						
							2017-04-05 13:14:27 -05:00  
				
					
						
							
							
								 
						
							
								8fa8004a2b 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-05 18:20:08 +01:00  
				
					
						
							
							
								 
						
							
								e5566ac6a6 
								
							 
						 
						
							
							
								
								Add Rich.GOP  
							
							
							
						 
						
							2017-04-05 13:05:27 -04:00  
				
					
						
							
							
								 
						
							
								ac1989d2c0 
								
							 
						 
						
							
							
								
								Update description on good-dragon.com  
							
							
							
						 
						
							2017-04-05 17:49:04 +01:00  
				
					
						
							
							
								 
						
							
								32d4b51939 
								
							 
						 
						
							
							
								
								Add good-dragon.com  
							
							
							
						 
						
							2017-04-05 17:47:52 +01:00  
				
					
						
							
							
								 
						
							
								b38bd58921 
								
							 
						 
						
							
							
								
								Adding masto.raildecake.fr, french instance  🌻 🐘  
							
							
							
						 
						
							2017-04-05 18:15:39 +02:00  
				
					
						
							
							
								 
						
							
								96812a6c79 
								
							 
						 
						
							
							
								
								added instance  
							
							
							
						 
						
							2017-04-05 09:05:57 -07:00  
				
					
						
							
							
								 
						
							
								a31f5765af 
								
							 
						 
						
							
							
								
								Added digitalhumanities.club instance  
							
							
							
						 
						
							2017-04-05 12:04:21 -04:00  
				
					
						
							
							
								 
						
							
								9cf0b5b255 
								
							 
						 
						
							
							
								
								Add social.bytestemplar.com to instances list  
							
							
							
						 
						
							2017-04-05 11:49:36 -04:00  
				
					
						
							
							
								 
						
							
								b8218ca482 
								
							 
						 
						
							
							
								
								Make scalingo doc clearer  
							
							
							
						 
						
							2017-04-05 17:48:55 +02:00  
				
					
						
							
							
								 
						
							
								4de3182dc8 
								
							 
						 
						
							
							
								
								Added im-in.space  
							
							
							
						 
						
							2017-04-05 17:00:03 +02:00  
				
					
						
							
							
								 
						
							
								ee758551d1 
								
							 
						 
						
							
							
								
								Correct innacurate info and other fixes  
							
							... 
							
							
							
							This guide was pretty out of date and also contained outright errors which were never true. I have updated it. 
							
						 
						
							2017-04-05 10:58:41 -04:00  
				
					
						
							
							
								 
						
							
								b142a2ebf5 
								
							 
						 
						
							
							
								
								Merge pull request  #947  from johnsudaar/feature/scalingo_one_click  
							
							... 
							
							
							
							Add Scalingo deployment support 
							
						 
						
							2017-04-05 16:50:46 +02:00  
				
					
						
							
							
								 
						
							
								9a534d1df6 
								
							 
						 
						
							
							
								
								Add niu.moe, cuz it's kawaii  
							
							
							
						 
						
							2017-04-05 16:18:52 +02:00  
				
					
						
							
							
								 
						
							
								28fb01c71a 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-05 16:02:47 +02:00  
				
					
						
							
							
								 
						
							
								d6bab0c71c 
								
							 
						 
						
							
							
								
								Add doc  
							
							
							
						 
						
							2017-04-05 16:00:48 +02:00  
				
					
						
							
							
								 
						
							
								a371a9e002 
								
							 
						 
						
							
							
								
								Merge pull request  #940  from fahy/patch-1  
							
							... 
							
							
							
							Adding mastodon.irish 
							
						 
						
							2017-04-05 15:24:52 +02:00  
				
					
						
							
							
								 
						
							
								be807ff7bd 
								
							 
						 
						
							
							
								
								Merge pull request  #930  from nicobz25/patch-1  
							
							... 
							
							
							
							Update List-of-Mastodon-instances.md 
							
						 
						
							2017-04-05 15:24:40 +02:00  
				
					
						
							
							
								 
						
							
								cbcfd92a14 
								
							 
						 
						
							
							
								
								Adding mastodon.irish  
							
							
							
						 
						
							2017-04-05 14:00:35 +01:00  
				
					
						
							
							
								 
						
							
								b45b4865a7 
								
							 
						 
						
							
							
								
								Merge pull request  #938  from wxcafe/patch-3  
							
							... 
							
							
							
							Updates description for `social.wxcafe.net` 
							
						 
						
							2017-04-05 14:57:38 +02:00  
				
					
						
							
							
								 
						
							
								188172c401 
								
							 
						 
						
							
							
								
								Merge pull request  #931  from farlistener/patch-3  
							
							... 
							
							
							
							Typography on partY 
							
						 
						
							2017-04-05 14:57:14 +02:00  
				
					
						
							
							
								 
						
							
								259e626165 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							
							
						 
						
							2017-04-05 14:21:45 +02:00  
				
					
						
							
							
								 
						
							
								5ed2de6be2 
								
							 
						 
						
							
							
								
								Add git and curl as dependencies  
							
							... 
							
							
							
							In some VPS templates, they are not installed by default. 
							
						 
						
							2017-04-05 14:11:08 +02:00  
				
					
						
							
							
								 
						
							
								85c768bf16 
								
							 
						 
						
							
							
								
								Typography on partY  
							
							
							
						 
						
							2017-04-05 13:19:34 +02:00  
				
					
						
							
							
								 
						
							
								9572282a55 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							... 
							
							
							
							Add our mastodon instance :) Thanks ! 
							
						 
						
							2017-04-05 13:13:09 +02:00  
				
					
						
							
							
								 
						
							
								f8a5ff95ec 
								
							 
						 
						
							
							
								
								Merge pull request  #923  from jguerder/patch-1  
							
							... 
							
							
							
							Added mastodon.cx 
							
						 
						
							2017-04-05 12:33:02 +02:00  
				
					
						
							
							
								 
						
							
								af0decf597 
								
							 
						 
						
							
							
								
								Merge pull request  #925  from Angristan/patch-6  
							
							... 
							
							
							
							Add mstdn.io 
							
						 
						
							2017-04-05 12:26:17 +02:00  
				
					
						
							
							
								 
						
							
								ba5e23ecce 
								
							 
						 
						
							
							
								
								Merge pull request  #926  from farlistener/patch-2  
							
							... 
							
							
							
							Add mastodon.partipirate.org 
							
						 
						
							2017-04-05 12:26:02 +02:00  
				
					
						
							
							
								 
						
							
								93e53a3311 
								
							 
						 
						
							
							
								
								add mastodon.cloud to List of instances  
							
							
							
						 
						
							2017-04-05 20:36:21 +11:00  
				
					
						
							
							
								 
						
							
								bdf3ac95b8 
								
							 
						 
						
							
							
								
								Add mastodon.partipirate.org  
							
							
							
						 
						
							2017-04-05 11:24:21 +02:00  
				
					
						
							
							
								 
						
							
								fa6f7c8898 
								
							 
						 
						
							
							
								
								Add mstdn.io  
							
							
							
						 
						
							2017-04-05 11:16:56 +02:00  
				
					
						
							
							
								 
						
							
								5963fce131 
								
							 
						 
						
							
							
								
								Added mastodon.cx  
							
							
							
						 
						
							2017-04-05 10:52:56 +02:00  
				
					
						
							
							
								 
						
							
								5dbcd92193 
								
							 
						 
						
							
							
								
								ECDH only  
							
							... 
							
							
							
							Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer.
Also, it's better so specify the curve.
This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io  
							
						 
						
							2017-04-05 10:44:08 +02:00  
				
					
						
							
							
								 
						
							
								8b8839978a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-04-05 10:29:52 +02:00  
				
					
						
							
							
								 
						
							
								78cf0fe1c7 
								
							 
						 
						
							
							
								
								Merge pull request  #901  from ashfurrow/patch-3  
							
							... 
							
							
							
							Adds mastodon.technology instance 
							
						 
						
							2017-04-05 10:29:14 +02:00  
				
					
						
							
							
								 
						
							
								18d0e817dd 
								
							 
						 
						
							
							
								
								Merge pull request  #911  from IMcD23/patch-1  
							
							... 
							
							
							
							Added mastodon.network instance. 
							
						 
						
							2017-04-05 10:28:58 +02:00  
				
					
						
							
							
								 
						
							
								b5f8273312 
								
							 
						 
						
							
							
								
								Merge pull request  #902  from asm/ssl_best_practices  
							
							... 
							
							
							
							SSL best practices for nginx 
							
						 
						
							2017-04-05 10:26:32 +02:00  
				
					
						
							
							
								 
						
							
								3504da5cac 
								
							 
						 
						
							
							
								
								Fix API method URL typo  
							
							
							
						 
						
							2017-04-05 10:25:05 +02:00  
				
					
						
							
							
								 
						
							
								8040d1d8ce 
								
							 
						 
						
							
							
								
								Update List-of-Mastodon-instances.md  
							
							... 
							
							
							
							Added mastodon.network. 
							
						 
						
							2017-04-04 23:43:57 -05:00  
				
					
						
							
							
								 
						
							
								29efeecb9e 
								
							 
						 
						
							
							
								
								Add  https://securitymastod.one/  
							
							
							
						 
						
							2017-04-04 23:23:15 -05:00  
				
					
						
							
							
								 
						
							
								7d354cc8c5 
								
							 
						 
						
							
							
								
								Corrected misinformation regarding Direct Posts  
							
							... 
							
							
							
							Unless something changed recently I have no clue why this said that direct posts do not federate because they do. 
							
						 
						
							2017-04-04 21:47:13 -04:00  
				
					
						
							
							
								 
						
							
								fa7b74cf51 
								
							 
						 
						
							
							
								
								SSL best practices for nginx  
							
							
							
						 
						
							2017-04-04 18:43:21 -07:00  
				
					
						
							
							
								 
						
							
								128dcb2825 
								
							 
						 
						
							
							
								
								Adds mastodon.technology  
							
							
							
						 
						
							2017-04-04 21:35:45 -04:00  
				
					
						
							
							
								 
						
							
								94d00f2788 
								
							 
						 
						
							
							
								
								Merge pull request  #885  from optikfluffel/patch-1  
							
							... 
							
							
							
							Update Production-guide.md 
							
						 
						
							2017-04-05 03:24:08 +02:00  
				
					
						
							
							
								 
						
							
								aa464aa0d8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:20:37 +02:00  
				
					
						
							
							
								 
						
							
								78c1e2e958 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:19:14 +02:00  
				
					
						
							
							
								 
						
							
								bdaf31bcc9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-1  
							
							
							
						 
						
							2017-04-05 03:18:42 +02:00  
				
					
						
							
							
								 
						
							
								f735efdbc1 
								
							 
						 
						
							
							
								
								Merge pull request  #846  from TrollDecker/master  
							
							... 
							
							
							
							Update social.diskseven.com's IPv6 status 
							
						 
						
							2017-04-05 03:08:59 +02:00  
				
					
						
							
							
								 
						
							
								1709dee0f1 
								
							 
						 
						
							
							
								
								Merge pull request  #842  from Angristan/patch-2  
							
							... 
							
							
							
							Missing quotes 
							
						 
						
							2017-04-05 03:08:24 +02:00  
				
					
						
							
							
								 
						
							
								1c634ad21a 
								
							 
						 
						
							
							
								
								Merge pull request  #845  from thurloat/patch-1  
							
							... 
							
							
							
							Add mastodon.club to running instances list 
							
						 
						
							2017-04-05 03:07:59 +02:00  
				
					
						
							
							
								 
						
							
								682c8a6fc8 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								66ec005bf8 
								
							 
						 
						
							
							
								
								Merge pull request  #854  from Angristan/patch-3  
							
							... 
							
							
							
							Fix crontab edit 
							
						 
						
							2017-04-05 03:07:28 +02:00  
				
					
						
							
							
								 
						
							
								d3dab68978 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								417273326a 
								
							 
						 
						
							
							
								
								Merge pull request  #894  from asm/mastodon_cc  
							
							... 
							
							
							
							Adding https://mastodon.cc  
							
						 
						
							2017-04-05 02:56:54 +02:00