Eugen 
								
							 
						 
						
							
							
								
							
							
	e571a01853  
						 
						
							
							
								
								
								Fix outdated info  
							
							
							
							
						 
						
							2017-02-14 21:33:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tom McAtee 
								
							 
						 
						
							
							
								
							
							
	68dba5f2eb  
						 
						
							
							
								
								
								Fixed the URL  
							
							... 
							
							
							
							
							Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).
I've replaced the vanilla address with one that includes a specific reference to the root of the repo 
							
						 
						
							2017-02-14 12:46:18 +10:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	bae7cf8cce  
						 
						
							
							
								
								
								Merge pull request  #630  from yiskah/patch-6  
							
							... 
							
							
							
							
							Add memetastic.space to instance list 
							
						 
						
							2017-02-13 20:42:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	fae1799646  
						 
						
							
							
								
								
								Add rake task for making someone into an admin  
							
							
							
							
						 
						
							2017-02-13 20:42:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
								
							
							
	7a99699e2d  
						 
						
							
							
								
								
								Add memetastic.space  
							
							... 
							
							
							
							
							It's uh, it's an instance now. 
							
						 
						
							2017-02-13 14:37:58 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lorenz Diener 
								
							 
						 
						
							
							
								
							
							
	73210a93df  
						 
						
							
							
								
								
								Add  https://icosahedron.website/  
							
							
							
							
						 
						
							2017-02-13 17:25:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
								
							
							
	0eee63f074  
						 
						
							
							
								
								
								Remove toot.zone  
							
							... 
							
							
							
							
							toot.zone is being discontinued 
							
						 
						
							2017-02-12 14:51:53 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	50660d54e8  
						 
						
							
							
								
								
								Fix semantics of follow requests another slaps  
							
							
							
							
						 
						
							2017-02-11 17:13:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	0b95eb3612  
						 
						
							
							
								
								
								Improve docs  
							
							
							
							
						 
						
							2017-02-11 16:21:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
								
							
							
	894a0515d9  
						 
						
							
							
								
								
								Add gnusocial.me to instance list  
							
							... 
							
							
							
							
							I'm never going to get tired of saying "gnusocial.me is a mastodon instance" 
							
						 
						
							2017-02-10 15:07:44 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	874fffb7dc  
						 
						
							
							
								
								
								Merge branch 'master' into patch-3  
							
							
							
							
						 
						
							2017-02-10 19:15:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
								
							
							
	a0e6c80b60  
						 
						
							
							
								
								
								Clean up markdown  
							
							... 
							
							
							
							
							There were some markdown processing errors which I've cleaned up 
							
						 
						
							2017-02-10 12:14:49 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
								
							
							
	63a18efb27  
						 
						
							
							
								
								
								Change List of Instances to Table  
							
							... 
							
							
							
							
							Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team 
							
						 
						
							2017-02-10 11:37:35 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Neville Park 
								
							 
						 
						
							
							
								
							
							
	e9fa557ead  
						 
						
							
							
								
								
								Added awoo.space  
							
							
							
							
						 
						
							2017-02-09 17:57:56 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	aa1213e089  
						 
						
							
							
								
								
								Add postgres setup instructions to docs  
							
							
							
							
						 
						
							2017-02-07 23:57:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	77e13c2bc9  
						 
						
							
							
								
								
								Removing failed push notification API, make context loads use cache  
							
							
							
							
						 
						
							2017-02-05 17:51:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	ccb8ac8573  
						 
						
							
							
								
								
								Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
							
							... 
							
							
							
							
							work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
							
						 
						
							2017-02-04 00:34:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James 
								
							 
						 
						
							
							
								
							
							
	7b7a356aed  
						 
						
							
							
								
								
								fix extraneous text in 2fa readme ( #592 )  
							
							
							
							
						 
						
							2017-02-03 00:10:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	9cf7da4934  
						 
						
							
							
								
								
								Add tootyfruity  
							
							
							
							
						 
						
							2017-02-02 20:27:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	9faf4c9dea  
						 
						
							
							
								
								
								Update Sponsors.md  
							
							
							
							
						 
						
							2017-02-02 20:14:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	1511efc8d2  
						 
						
							
							
								
								
								Update Sponsors.md  
							
							
							
							
						 
						
							2017-02-02 19:43:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	d33dfce34f  
						 
						
							
							
								
								
								Updated list of top sponsors  
							
							
							
							
						 
						
							2017-02-02 19:40:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	aa2fa227e9  
						 
						
							
							
								
								
								Adding documentation for streaming API. Fixing filtering bug  
							
							
							
							
						 
						
							2017-02-02 16:35:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	d9ca46b464  
						 
						
							
							
								
								
								Cleaning up format of broadcast real-time messages, removing  
							
							... 
							
							
							
							
							redis-backed "mentions" timeline as redundant (given notifications) 
							
						 
						
							2017-02-02 00:03:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									James 
								
							 
						 
						
							
							
								
							
							
	b12bdd2aea  
						 
						
							
							
								
								
								Add 2-FA instructions for non-technical users ( #580 )  
							
							
							
							
						 
						
							2017-01-29 19:26:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	2165a0ec63  
						 
						
							
							
								
								
								Update some API docs  
							
							
							
							
						 
						
							2017-01-29 14:40:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	aa52d5fd1e  
						 
						
							
							
								
								
								Add more links to main docs page  
							
							
							
							
						 
						
							2017-01-29 12:59:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	ca8a9d5941  
						 
						
							
							
								
								
								Fix JSON formatting in docs  
							
							
							
							
						 
						
							2017-01-29 12:55:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	fe9306f346  
						 
						
							
							
								
								
								Update docs with information about push notifications  
							
							
							
							
						 
						
							2017-01-29 12:53:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	dc3e0529ca  
						 
						
							
							
								
								
								Update broken links, add new sponsor  
							
							
							
							
						 
						
							2017-01-27 17:01:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
								
							
							
	9f57c7d4a6  
						 
						
							
							
								
								
								Updated translation doc to get working links  
							
							
							
							
						 
						
							2017-01-27 13:17:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	87667e371c  
						 
						
							
							
								
								
								Merge pull request  #549  from ineffyble/docs/add-default-account-to-dev-documentation  
							
							... 
							
							
							
							
							Add default account details to developer documentation. 
							
						 
						
							2017-01-26 23:03:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Walde 
								
							 
						 
						
							
							
								
							
							
	12eddb5cbe  
						 
						
							
							
								
								
								document that /oauth/token does not always return json  
							
							
							
							
						 
						
							2017-01-26 16:28:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
								
							
							
	ae2147d40f  
						 
						
							
							
								
								
								Add default account details to developer documentation.  
							
							
							
							
						 
						
							2017-01-27 02:03:13 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Walde 
								
							 
						 
						
							
							
								
							
							
	3b6af5245b  
						 
						
							
							
								
								
								clarify the intended use of the oauth api call as per this issue:  
							
							... 
							
							
							
							
							https://github.com/alin-rautoiu/mastodroid/issues/23  
						
							2017-01-25 18:31:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	3beb24ad55  
						 
						
							
							
								
								
								Use <summary> to encode content warnings instead  
							
							
							
							
						 
						
							2017-01-25 16:53:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	ca04002c93  
						 
						
							
							
								
								
								Add content warning example to docs  
							
							
							
							
						 
						
							2017-01-25 02:54:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	ab94ad3504  
						 
						
							
							
								
								
								Add description of Mastodon's current protocol extensions  
							
							
							
							
						 
						
							2017-01-25 02:46:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
								
							
							
	92a98f73aa  
						 
						
							
							
								
								
								Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.  
							
							
							
							
						 
						
							2017-01-22 19:50:40 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	536cde4e99  
						 
						
							
							
								
								
								Rename main docs page so it renders in github  
							
							
							
							
						 
						
							2017-01-21 22:54:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	2baf0fabb4  
						 
						
							
							
								
								
								Improve API docs formatting  
							
							
							
							
						 
						
							2017-01-21 22:53:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	e92a1cf436  
						 
						
							
							
								
								
								Add wiki contents to docs/ instead  
							
							
							
							
						 
						
							2017-01-21 22:51:02 +01:00