Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								a729d0c2b1 
								
							 
						 
						
							
							
								
								Add user guide to README toc  
							
							 
							
							
							
						 
						
							2017-04-02 22:05:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								066b904205 
								
							 
						 
						
							
							
								
								Fix typo in simple_form.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:04:06 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								71cf9d0608 
								
							 
						 
						
							
							
								
								Fix typo in simple_form.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:04:06 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								b7554089cb 
								
							 
						 
						
							
							
								
								Improve translation of data import in fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:57 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								5e45982ed9 
								
							 
						 
						
							
							
								
								Improve translation of data import in fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:57 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								6162adec16 
								
							 
						 
						
							
							
								
								Better translation for revoked token in doorkeeper.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:41 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								b829460b4a 
								
							 
						 
						
							
							
								
								Better translation for revoked token in doorkeeper.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:41 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								53e0834cf4 
								
							 
						 
						
							
							
								
								Fix date format in doorkeeper.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:31 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								65e6a00817 
								
							 
						 
						
							
							
								
								Fix date format in doorkeeper.fr.yml  
							
							 
							
							
							
						 
						
							2017-04-02 14:03:31 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								9cc9321935 
								
							 
						 
						
							
							
								
								Update to catch up with new features and add missing images.  
							
							 
							
							
							
						 
						
							2017-04-02 22:03:00 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								60a82c9022 
								
							 
						 
						
							
							
								
								Update to catch up with new features and add missing images.  
							
							 
							
							
							
						 
						
							2017-04-02 22:03:00 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								b5be221637 
								
							 
						 
						
							
							
								
								Write up reporting.  
							
							 
							
							
							
						 
						
							2017-04-02 21:45:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								b277e88aae 
								
							 
						 
						
							
							
								
								Write up reporting.  
							
							 
							
							
							
						 
						
							2017-04-02 21:45:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								dfcd9a3a5c 
								
							 
						 
						
							
							
								
								Add information about the Direct privacy setting.  
							
							 
							
							
							
						 
						
							2017-04-02 21:39:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								03b2f37b46 
								
							 
						 
						
							
							
								
								Add information about the Direct privacy setting.  
							
							 
							
							
							
						 
						
							2017-04-02 21:39:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								62d639bb27 
								
							 
						 
						
							
							
								
								Add information on following remote users or using the Search box to find them.  
							
							 
							
							
							
						 
						
							2017-04-02 21:33:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Florian Piesche 
								
							 
						 
						
							
							
							
							
								
							
							
								0f274589dd 
								
							 
						 
						
							
							
								
								Add information on following remote users or using the Search box to find them.  
							
							 
							
							
							
						 
						
							2017-04-02 21:33:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								0bcac82f2a 
								
							 
						 
						
							
							
								
								Merge pull request  #737  from nevillepark/patch-2  
							
							 
							
							... 
							
							
							
							Corrected spelling mistake 
							
						 
						
							2017-04-02 22:23:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								2cd792fc3d 
								
							 
						 
						
							
							
								
								Merge pull request  #737  from nevillepark/patch-2  
							
							 
							
							... 
							
							
							
							Corrected spelling mistake 
							
						 
						
							2017-04-02 22:23:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								e3509e02c0 
								
							 
						 
						
							
							
								
								Merge pull request  #740  from 0x70b1a5/master  
							
							 
							
							... 
							
							
							
							remove black border on video mute/spoiler buttons 
							
						 
						
							2017-04-02 22:22:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								09b4b65fde 
								
							 
						 
						
							
							
								
								Merge pull request  #740  from 0x70b1a5/master  
							
							 
							
							... 
							
							
							
							remove black border on video mute/spoiler buttons 
							
						 
						
							2017-04-02 22:22:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								0335a52e28 
								
							 
						 
						
							
							
								
								Merge pull request  #741  from eramdam/feature/improve-french-locales  
							
							 
							
							... 
							
							
							
							Improve/add some French locales 
							
						 
						
							2017-04-02 22:22:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								48cb2dccd2 
								
							 
						 
						
							
							
								
								Merge pull request  #741  from eramdam/feature/improve-french-locales  
							
							 
							
							... 
							
							
							
							Improve/add some French locales 
							
						 
						
							2017-04-02 22:22:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4bfabbd5e2 
								
							 
						 
						
							
							
								
								Avoid re-loading already loaded relationships. Also fixes issue where wrong  
							
							 
							
							... 
							
							
							
							button would be displayed in account lists for unloaded relationships 
							
						 
						
							2017-04-02 22:02:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a23e4380b2 
								
							 
						 
						
							
							
								
								Avoid re-loading already loaded relationships. Also fixes issue where wrong  
							
							 
							
							... 
							
							
							
							button would be displayed in account lists for unloaded relationships 
							
						 
						
							2017-04-02 22:02:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eb85833dc7 
								
							 
						 
						
							
							
								
								Keep track of which timelines are connected live to avoid redundant  
							
							 
							
							... 
							
							
							
							refreshes on navigation 
							
						 
						
							2017-04-02 21:44:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aaa4d1b0fb 
								
							 
						 
						
							
							
								
								Keep track of which timelines are connected live to avoid redundant  
							
							 
							
							... 
							
							
							
							refreshes on navigation 
							
						 
						
							2017-04-02 21:44:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6966854f3d 
								
							 
						 
						
							
							
								
								Add heartbeat to websockets streaming API connections  
							
							 
							
							
							
						 
						
							2017-04-02 21:27:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3618cc04ff 
								
							 
						 
						
							
							
								
								Add heartbeat to websockets streaming API connections  
							
							 
							
							
							
						 
						
							2017-04-02 21:27:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1ee4c6415c 
								
							 
						 
						
							
							
								
								Catching rack timeout from rails doesn't work  
							
							 
							
							
							
						 
						
							2017-04-02 21:12:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2d07cb5771 
								
							 
						 
						
							
							
								
								Catching rack timeout from rails doesn't work  
							
							 
							
							
							
						 
						
							2017-04-02 21:12:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Merkle 
								
							 
						 
						
							
							
							
							
								
							
							
								bba468bcca 
								
							 
						 
						
							
							
								
								single-quotes  
							
							 
							
							
							
						 
						
							2017-04-02 14:55:13 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Merkle 
								
							 
						 
						
							
							
							
							
								
							
							
								f25fc04ea1 
								
							 
						 
						
							
							
								
								single-quotes  
							
							 
							
							
							
						 
						
							2017-04-02 14:55:13 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Merkle 
								
							 
						 
						
							
							
							
							
								
							
							
								034cfeb1ac 
								
							 
						 
						
							
							
								
								remove black border on buttons  
							
							 
							
							
							
						 
						
							2017-04-02 14:54:24 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Merkle 
								
							 
						 
						
							
							
							
							
								
							
							
								ca21be3e16 
								
							 
						 
						
							
							
								
								remove black border on buttons  
							
							 
							
							
							
						 
						
							2017-04-02 14:54:24 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								00e99e58db 
								
							 
						 
						
							
							
								
								Add proper error page for request timeouts  
							
							 
							
							
							
						 
						
							2017-04-02 19:43:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5b12624847 
								
							 
						 
						
							
							
								
								Add proper error page for request timeouts  
							
							 
							
							
							
						 
						
							2017-04-02 19:43:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Neville Park 
								
							 
						 
						
							
							
							
							
								
							
							
								9575c18707 
								
							 
						 
						
							
							
								
								Corrected spelling mistake  
							
							 
							
							
							
						 
						
							2017-04-02 13:01:55 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Neville Park 
								
							 
						 
						
							
							
							
							
								
							
							
								54c796c8df 
								
							 
						 
						
							
							
								
								Corrected spelling mistake  
							
							 
							
							
							
						 
						
							2017-04-02 13:01:55 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								c083a69d4d 
								
							 
						 
						
							
							
								
								Merge pull request  #729  from Abzol/master  
							
							 
							
							... 
							
							
							
							Fix word-break in account profiles 
							
						 
						
							2017-04-02 17:53:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								34ff11c496 
								
							 
						 
						
							
							
								
								Merge pull request  #729  from Abzol/master  
							
							 
							
							... 
							
							
							
							Fix word-break in account profiles 
							
						 
						
							2017-04-02 17:53:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								1c4ebd95b0 
								
							 
						 
						
							
							
								
								Merge pull request  #735  from TheKinrar/patch-3  
							
							 
							
							... 
							
							
							
							Add link to instances.mastodon.xyz 
							
						 
						
							2017-04-02 17:50:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								25ed563cdb 
								
							 
						 
						
							
							
								
								Merge pull request  #735  from TheKinrar/patch-3  
							
							 
							
							... 
							
							
							
							Add link to instances.mastodon.xyz 
							
						 
						
							2017-04-02 17:50:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TheKinrar 
								
							 
						 
						
							
							
							
							
								
							
							
								ef40b260f3 
								
							 
						 
						
							
							
								
								Add link to instances.mastodon.xyz  
							
							 
							
							
							
						 
						
							2017-04-02 17:48:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TheKinrar 
								
							 
						 
						
							
							
							
							
								
							
							
								9f219d8968 
								
							 
						 
						
							
							
								
								Add link to instances.mastodon.xyz  
							
							 
							
							
							
						 
						
							2017-04-02 17:48:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivia Mossberg 
								
							 
						 
						
							
							
							
							
								
							
							
								6e4703703a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:tootsuite/mastodon  
							
							 
							
							... 
							
							
							
							It's just an upstream merge 
							
						 
						
							2017-04-02 17:04:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivia Mossberg 
								
							 
						 
						
							
							
							
							
								
							
							
								30da6440d0 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:tootsuite/mastodon  
							
							 
							
							... 
							
							
							
							It's just an upstream merge 
							
						 
						
							2017-04-02 17:04:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivia Mossberg 
								
							 
						 
						
							
							
							
							
								
							
							
								2d8a0caf98 
								
							 
						 
						
							
							
								
								Fix word-break in account profiles  
							
							 
							
							... 
							
							
							
							word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors. 
							
						 
						
							2017-04-02 16:54:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivia Mossberg 
								
							 
						 
						
							
							
							
							
								
							
							
								f4b5fe9caf 
								
							 
						 
						
							
							
								
								Fix word-break in account profiles  
							
							 
							
							... 
							
							
							
							word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors. 
							
						 
						
							2017-04-02 16:54:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f04816f005 
								
							 
						 
						
							
							
								
								Fix wording "show reblogs" -> "show boosts", order reports chronologically in  
							
							 
							
							... 
							
							
							
							admin UI 
							
						 
						
							2017-04-02 16:45:49 +02:00