David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								b1155460ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
      app/javascript/styles/mastodon/components.scss 
							
						 
						
							2018-01-17 18:37:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfbbbce1f 
								
							 
						 
						
							
							
								
								Fix home regeneration ( #6251 )  
							
							... 
							
							
							
							* Fix regeneration marker not being removed after completion
* Return HTTP 206 from /api/v1/timelines/home if regeneration in progress
Prioritize RegenerationWorker by putting it into default queue
* Display loading indicator and poll home timeline while it regenerates
* Add graphic to regeneration message
* Make "not found" indicator consistent with home regeneration 
							
						 
						
							2018-01-17 23:56:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								4f86722a65 
								
							 
						 
						
							
							
								
								Weblate translations ( #6284 )  
							
							... 
							
							
							
							* Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (529 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (527 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (528 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 37.2% (197 of 529 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (260 of 260 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Russian)
Currently translated at 99.0% (526 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (45 of 45 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 99.8% (530 of 531 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Japanese)
Currently translated at 92.8% (52 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 75.8% (47 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ 
* Translated using Weblate (Polish)
Currently translated at 77.4% (48 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ 
* Translated using Weblate (Slovak)
Currently translated at 38.3% (204 of 532 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ 
* Translated using Weblate (Russian)
Currently translated at 96.8% (525 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (537 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (541 of 542 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (538 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Dutch)
Currently translated at 97.4% (529 of 543 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations 
							
						 
						
							2018-01-18 07:00:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								8c41fb4acc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-17 16:17:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ea55e437f7 
								
							 
						 
						
							
							
								
								Upgrade ESLint to version 4.x ( #6276 )  
							
							
							
						 
						
							2018-01-17 16:57:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SerCom_KC 
								
							 
						 
						
							
							
							
							
								
							
							
								350f65a6ef 
								
							 
						 
						
							
							
								
								Update Simplified Chinese translations ( #6280 )  
							
							... 
							
							
							
							* i18n: (zh-CN) Update translation for #6252 
* e-mail -> email
* i18n: (zh-CN) Update translations for #6256 
* i18n: (zh-CN) Minor Improvements
* i18n: (zh-CN) Update translations for #6263 
* i18n: (zh-CN) Update translations for #6279  
							
						 
						
							2018-01-17 16:47:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								de7283a318 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock 
							
						 
						
							2018-01-15 22:17:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								19aaf0e99f 
								
							 
						 
						
							
							
								
								Surround mid-text display names with bdi tags ( #6257 )  
							
							... 
							
							
							
							* Fix  #1095  - Surround mid-text display names with bdi tags
* Update jest snapshot 
							
						 
						
							2018-01-15 18:55:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1a90ef9c25 
								
							 
						 
						
							
							
								
								Fix   #6128  - Display unfollow button even if account moved ( #6258 )  
							
							
							
						 
						
							2018-01-15 18:42:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								6e821c4273 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-15 06:17:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									neetshin 
								
							 
						 
						
							
							
							
							
								
							
							
								e980900b7d 
								
							 
						 
						
							
							
								
								Make columns-area unscrollable when modal opened  ( #6241 )  
							
							... 
							
							
							
							* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete 
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
* Add validation for onMuteNotifications
* Make columns-area unscrollable when modal opend
* Make columns-area unscrollable when modal opened 
							
						 
						
							2018-01-15 06:51:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gô Shoemake 
								
							 
						 
						
							
							
							
							
								
							
							
								c6d5ea8695 
								
							 
						 
						
							
							
								
								Fix column headers accessibility ( #6199 )  
							
							... 
							
							
							
							* Fix accessibility of column headers
As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed:
 * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling.
 * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks.
 * I didn't even realize there was a Settings toggle until I made this change.
Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands.
Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks!
* Styling fixes
* Fixed overflow issue 
							
						 
						
							2018-01-15 04:33:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								430f9c37ea 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'  
							
							
							
						 
						
							2018-01-12 20:10:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								6be6f6f5bd 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-01-12 23:08:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								a6ef3cde8e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-09 12:17:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								164ec8297f 
								
							 
						 
						
							
							
								
								Weblate translations ( #6228 )  
							
							... 
							
							
							
							* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 80.3% (45 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 83.9% (47 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Persian)
Currently translated at 87.6% (460 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ 
* Translated using Weblate (Catalan)
Currently translated at 99.2% (521 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 47.2% (248 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 48.0% (252 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (520 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 90.4% (475 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Persian)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Portuguese)
Currently translated at 48.3% (254 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 56.5% (297 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 59.4% (312 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 91.0% (51 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 59.6% (313 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Japanese)
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Portuguese)
Currently translated at 67.6% (355 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Arabic)
Currently translated at 51.1% (22 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ 
* Added translation using Weblate (Galician)
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ 
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 24.0% (126 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Added translation using Weblate (Portuguese)
* Translated using Weblate (Arabic)
Currently translated at 55.2% (290 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Galician)
Currently translated at 42.6% (224 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Portuguese)
Currently translated at 80.9% (425 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 62.7% (27 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 81.3% (427 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Portuguese)
Currently translated at 93.7% (492 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 95.4% (501 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Portuguese)
Currently translated at 96.0% (504 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 69.7% (30 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 97.9% (514 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back simple_forms removed by weblate
Weblate for some reason removed this files, add back to their previous
versions
* Remove linebreak on doorkeeper.pt.yml
PR review 
							
						 
						
							2018-01-09 20:30:28 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a0b246e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-09 05:17:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nightpool 
								
							 
						 
						
							
							
							
							
								
							
							
								eac9039a63 
								
							 
						 
						
							
							
								
								Refactor /api/web APIs to use the centralized axios instance ( #6223 )  
							
							... 
							
							
							
							Also adds the ability to decouple the centralized axios logic from the
state dispatcher 
							
						 
						
							2018-01-08 20:01:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								f10ce3f003 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-08 04:17:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b9375d92b3 
								
							 
						 
						
							
							
								
								Do not display elephant friend in single-column layout ( #6222 )  
							
							
							
						 
						
							2018-01-08 03:50:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								8704a190c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-07 15:17:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SerCom_KC 
								
							 
						 
						
							
							
							
							
								
							
							
								154bd8db56 
								
							 
						 
						
							
							
								
								Update Simplified Chinese translations ( #6215 )  
							
							... 
							
							
							
							* i18n: (zh-CN) Add translations of #6125 
* i18n: (zh-CN) Add translations of #6132 
* i18n: (zh-CN) Add translations of #6099 
* i18n: (zh-CN) Add translations of #6071 
* i18n: (zh-CN) Improve translations 
							
						 
						
							2018-01-07 17:32:50 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								17a472d50d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-07 02:17:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								f8cd218003 
								
							 
						 
						
							
							
								
								Translate Korean ( #6212 )  
							
							
							
						 
						
							2018-01-07 11:13:42 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								86007e913d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-05 22:17:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								5b35777793 
								
							 
						 
						
							
							
								
								Styling fixes  
							
							
							
						 
						
							2018-01-05 12:41:15 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								0fa691d2a9 
								
							 
						 
						
							
							
								
								Fix RFC 5646 Regular Expression ( #6190 )  
							
							
							
						 
						
							2018-01-05 04:43:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								796a39a283 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-04 23:17:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Branko Kokanovic 
								
							 
						 
						
							
							
							
							
								
							
							
								fb3a2ddd24 
								
							 
						 
						
							
							
								
								Small translation fixes for Serbian (and sr@Latn too) ( #6188 )  
							
							
							
						 
						
							2018-01-05 00:16:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Darilek 
								
							 
						 
						
							
							
							
							
								
							
							
								575804021d 
								
							 
						 
						
							
							
								
								Fix accessibility of column headers  
							
							... 
							
							
							
							As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed:
 * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling.
 * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks.
 * I didn't even realize there was a Settings toggle until I made this change.
Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands.
Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks! 
							
						 
						
							2018-01-04 10:25:26 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									muan 
								
							 
						 
						
							
							
							
							
								
							
							
								22e3acfd56 
								
							 
						 
						
							
							
								
								Improve Traditional Chinese translation ( #6166 )  
							
							... 
							
							
							
							* Improve Traditional Chinese translations
* Sort alphabetically 
							
						 
						
							2018-01-04 05:00:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								b080a07550 
								
							 
						 
						
							
							
								
								Rearrange items in Getting Started navigation ( #6126 )  
							
							... 
							
							
							
							Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)
This fixes the issue by rearranging. 
							
						 
						
							2018-01-04 10:56:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								a7b8cb9493 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-03 20:17:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Quenty31 
								
							 
						 
						
							
							
							
							
								
							
							
								bd82de325e 
								
							 
						 
						
							
							
								
								l10n OC language ( #6169 )  
							
							... 
							
							
							
							* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs 
							
						 
						
							2018-01-03 21:05:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								b83fb8b107 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6168 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-01-03 22:45:24 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								d50d61a90c 
								
							 
						 
						
							
							
								
								Add Japanese translations  #5997 ,  #6003 ,  #6004 ,  #6071 ,  #6099 ,  #6125  and  #6132  ( #6167 )  
							
							... 
							
							
							
							* yarn manage:translations
* Add Japanese translation for #5997 
* Add Japanese translation for #6003 
* Add Japanese translation for #6004 
* Add Japanese translation for #6071 
* Add Japanese translation for #6099 
* Add Japanese translation for #6125 
* Add Japanese translation for #6132  
							
						 
						
							2018-01-03 21:00:39 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								b42e6973a1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-03 04:17:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Noiob 
								
							 
						 
						
							
							
							
							
								
							
							
								653d9b1721 
								
							 
						 
						
							
							
								
								Fix newlines-to-spaces functionality ( #6158 )  
							
							... 
							
							
							
							yay for regexes, amirite 
							
						 
						
							2018-01-02 19:35:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								b42cdedfc3 
								
							 
						 
						
							
							
								
								Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )  
							
							
							
						 
						
							2018-01-02 14:24:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								5d02615063 
								
							 
						 
						
							
							
								
								Rename key to path in actions and reducers for settings ( #6105 )  
							
							
							
						 
						
							2018-01-02 13:50:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Branko Kokanovic 
								
							 
						 
						
							
							
							
							
								
							
							
								1c4142da5b 
								
							 
						 
						
							
							
								
								Adding Serbian latin translations ( #6146 )  
							
							... 
							
							
							
							Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation. 
							
						 
						
							2018-01-02 20:39:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								ed572490c1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss 
							
						 
						
							2018-01-02 00:11:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								7549f264e6 
								
							 
						 
						
							
							
								
								Use const instead of let for constant ( #6106 )  
							
							
							
						 
						
							2018-01-02 13:28:49 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								5975446002 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-31 09:17:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Branko Kokanovic 
								
							 
						 
						
							
							
							
							
								
							
							
								34a90dc266 
								
							 
						 
						
							
							
								
								Adding Serbian translation ( #6133 )  
							
							... 
							
							
							
							* Adding Serbian translation
* i18n-tasks normalize 
							
						 
						
							2017-12-31 17:28:20 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								01f91695f5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/controllers/auth/confirmations_controller.rb 
							
						 
						
							2017-12-30 17:20:07 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								fc8c2c9b4a 
								
							 
						 
						
							
							
								
								Translate Korean ( #6131 )  
							
							... 
							
							
							
							Relates to #6125 , #6099  
							
						 
						
							2017-12-30 02:44:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MitarashiDango 
								
							 
						 
						
							
							
							
							
								
							
							
								a52820a7fd 
								
							 
						 
						
							
							
								
								bug fix (WebPush does not work) ( #6120 )  
							
							
							
						 
						
							2017-12-28 16:20:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								f722fcb5a6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss 
							
						 
						
							2017-12-26 22:24:19 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								093af89c43 
								
							 
						 
						
							
							
								
								Move the mastodon on Getting Started column to drawer column ( #6109 )  
							
							... 
							
							
							
							Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space. 
							
						 
						
							2017-12-27 03:31:30 +01:00