4f7cce25ac 
					 
					
						
						
							
							Add more lcoales in fr.jsx  
						
						
						
						
					 
					
						2017-04-02 14:23:40 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						633e5ec6f6 
					 
					
						
						
							
							Update French Translation  
						
						
						
						
					 
					
						2017-04-02 23:18:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e92796b49c 
					 
					
						
						
							
							Add info on CW tags not automatically hiding images.  
						
						
						
						
					 
					
						2017-04-02 22:07:23 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a729d0c2b1 
					 
					
						
						
							
							Add user guide to README toc  
						
						
						
						
					 
					
						2017-04-02 22:05:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						71cf9d0608 
					 
					
						
						
							
							Fix typo in simple_form.fr.yml  
						
						
						
						
					 
					
						2017-04-02 14:04:06 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5e45982ed9 
					 
					
						
						
							
							Improve translation of data import in fr.yml  
						
						
						
						
					 
					
						2017-04-02 14:03:57 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b829460b4a 
					 
					
						
						
							
							Better translation for revoked token in doorkeeper.fr.yml  
						
						
						
						
					 
					
						2017-04-02 14:03:41 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						65e6a00817 
					 
					
						
						
							
							Fix date format in doorkeeper.fr.yml  
						
						
						
						
					 
					
						2017-04-02 14:03:31 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						60a82c9022 
					 
					
						
						
							
							Update to catch up with new features and add missing images.  
						
						
						
						
					 
					
						2017-04-02 22:03:00 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b277e88aae 
					 
					
						
						
							
							Write up reporting.  
						
						
						
						
					 
					
						2017-04-02 21:45:51 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						03b2f37b46 
					 
					
						
						
							
							Add information about the Direct privacy setting.  
						
						
						
						
					 
					
						2017-04-02 21:39:05 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0f274589dd 
					 
					
						
						
							
							Add information on following remote users or using the Search box to find them.  
						
						
						
						
					 
					
						2017-04-02 21:33:39 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2cd792fc3d 
					 
					
						
						
							
							Merge pull request  #737  from nevillepark/patch-2  
						
						... 
						
						
						
						Corrected spelling mistake 
						
						
					 
					
						2017-04-02 22:23:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						09b4b65fde 
					 
					
						
						
							
							Merge pull request  #740  from 0x70b1a5/master  
						
						... 
						
						
						
						remove black border on video mute/spoiler buttons 
						
						
					 
					
						2017-04-02 22:22:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						48cb2dccd2 
					 
					
						
						
							
							Merge pull request  #741  from eramdam/feature/improve-french-locales  
						
						... 
						
						
						
						Improve/add some French locales 
						
						
					 
					
						2017-04-02 22:22:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aaa4d1b0fb 
					 
					
						
						
							
							Keep track of which timelines are connected live to avoid redundant  
						
						... 
						
						
						
						refreshes on navigation 
						
						
					 
					
						2017-04-02 21:44:06 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3618cc04ff 
					 
					
						
						
							
							Add heartbeat to websockets streaming API connections  
						
						
						
						
					 
					
						2017-04-02 21:27:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2d07cb5771 
					 
					
						
						
							
							Catching rack timeout from rails doesn't work  
						
						
						
						
					 
					
						2017-04-02 21:12:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f25fc04ea1 
					 
					
						
						
							
							single-quotes  
						
						
						
						
					 
					
						2017-04-02 14:55:13 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ca21be3e16 
					 
					
						
						
							
							remove black border on buttons  
						
						
						
						
					 
					
						2017-04-02 14:54:24 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5b12624847 
					 
					
						
						
							
							Add proper error page for request timeouts  
						
						
						
						
					 
					
						2017-04-02 19:43:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						54c796c8df 
					 
					
						
						
							
							Corrected spelling mistake  
						
						
						
						
					 
					
						2017-04-02 13:01:55 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						34ff11c496 
					 
					
						
						
							
							Merge pull request  #729  from Abzol/master  
						
						... 
						
						
						
						Fix word-break in account profiles 
						
						
					 
					
						2017-04-02 17:53:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						25ed563cdb 
					 
					
						
						
							
							Merge pull request  #735  from TheKinrar/patch-3  
						
						... 
						
						
						
						Add link to instances.mastodon.xyz 
						
						
					 
					
						2017-04-02 17:50:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9f219d8968 
					 
					
						
						
							
							Add link to instances.mastodon.xyz  
						
						
						
						
					 
					
						2017-04-02 17:48:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						30da6440d0 
					 
					
						
						
							
							Merge branch 'master' of github.com:tootsuite/mastodon  
						
						... 
						
						
						
						It's just an upstream merge 
						
						
					 
					
						2017-04-02 17:04:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4b7dca4713 
					 
					
						
						
							
							Fix wording "show reblogs" -> "show boosts", order reports chronologically in  
						
						... 
						
						
						
						admin UI 
						
						
					 
					
						2017-04-02 16:45:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3a62721e54 
					 
					
						
						
							
							Merge pull request  #728  from bottitytto/add-mashek  
						
						... 
						
						
						
						Adding social.mashek.net 
						
						
					 
					
						2017-04-02 16:30:30 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d6b965cf08 
					 
					
						
						
							
							Fix issue with feed merge-in code as well  
						
						
						
						
					 
					
						2017-04-02 15:58:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e809caa0e1 
					 
					
						
						
							
							Fix feed regeneration bug  
						
						
						
						
					 
					
						2017-04-02 15:46:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aaea7e1e7c 
					 
					
						
						
							
							Adding social.mashek.net  
						
						
						
						
					 
					
						2017-04-02 16:22:13 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						750662d9e2 
					 
					
						
						
							
							Merge branch 'maximeborges-master'  
						
						
						
						
					 
					
						2017-04-02 12:38:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						34aff3e269 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/maximeborges/mastodon  into maximeborges-master  
						
						
						
						
					 
					
						2017-04-02 12:36:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e70661b495 
					 
					
						
						
							
							Merge pull request  #723  from jkap/patch-1  
						
						... 
						
						
						
						Updated list of instances for gay.crime.team 
						
						
					 
					
						2017-04-02 12:33:34 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a2fa09518f 
					 
					
						
						
							
							Merge branch 'master' into patch-1  
						
						
						
						
					 
					
						2017-04-02 12:33:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3e84a86eb8 
					 
					
						
						
							
							Merge pull request  #727  from TheKinrar/patch-2  
						
						... 
						
						
						
						Add IPv6 column in list and remove dead instance 
						
						
					 
					
						2017-04-02 12:32:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f5d434e433 
					 
					
						
						
							
							Add IPv6 column in list and remove dead instance  
						
						... 
						
						
						
						This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own. 
						
						
					 
					
						2017-04-02 12:05:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3ed75efc31 
					 
					
						
						
							
							Add fr locale for community_timeline in fr.jsx  
						
						
						
						
					 
					
						2017-04-01 23:45:53 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cb1989cbd8 
					 
					
						
						
							
							Add locale in devise.fr.yml  
						
						
						
						
					 
					
						2017-04-01 23:38:40 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						03d676faa8 
					 
					
						
						
							
							Add french translation for "scopes" in doorkeeper.fr.yml  
						
						
						
						
					 
					
						2017-04-01 23:35:11 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9e26af264e 
					 
					
						
						
							
							Fix small typo in doorkeeper.fr.yml  
						
						
						
						
					 
					
						2017-04-01 23:34:37 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9f6098e22 
					 
					
						
						
							
							Complete localization of in simple_form.fr.yml  
						
						
						
						
					 
					
						2017-04-01 23:26:26 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2c881e6717 
					 
					
						
						
							
							Improve french locales on the backend (WIP)  
						
						
						
						
					 
					
						2017-04-01 23:15:49 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1389d5d7fd 
					 
					
						
						
							
							Updated list of instances for gay.crime.team  
						
						... 
						
						
						
						Updated out-of-date info for gay.crime.team 
						
						
					 
					
						2017-04-01 22:37:10 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						433cb198fa 
					 
					
						
						
							
							Fix landing page sign up form ignoring username field  
						
						
						
						
					 
					
						2017-04-02 04:13:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3ffa27e812 
					 
					
						
						
							
							Merge pull request  #720  from 0x70b1a5/master  
						
						... 
						
						
						
						improve video button visibililty (issue #713 ) 
						
						
					 
					
						2017-04-02 03:15:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ae43978433 
					 
					
						
						
							
							improve video button visibililty  
						
						
						
						
					 
					
						2017-04-01 21:02:30 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0f05643f5d 
					 
					
						
						
							
							Merge pull request  #718  from Wonderfall/master  
						
						... 
						
						
						
						Add social.targaryen.house to instances list 
						
						
					 
					
						2017-04-02 01:27:02 +02:00