Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								fb5040885c 
								
							 
						 
						
							
							
								
								Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )  
							
							
							
						 
						
							2017-10-16 09:33:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								cb0c479fd4 
								
							 
						 
						
							
							
								
								i18n "More" dropdown title ( #5410 )  
							
							
							
						 
						
							2017-10-16 09:31:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								0e9e72f228 
								
							 
						 
						
							
							
								
								Refactor and simplify icon_button.js ( #5413 )  
							
							
							
						 
						
							2017-10-16 09:30:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4a0367d04a 
								
							 
						 
						
							
							
								
								Clear timer when unmounting RelativeTimestamp components ( #5408 )  
							
							... 
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 03:03:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								2b099f9f2e 
								
							 
						 
						
							
							
								
								l10n Occitan: finishing touches ( #5404 )  
							
							... 
							
							
							
							* Update oc.json
* Update oc.yml 
							
						 
						
							2017-10-15 23:07:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yannick A 
								
							 
						 
						
							
							
							
							
								
							
							
								c03e2d7c51 
								
							 
						 
						
							
							
								
								Update French translation ( #5401 )  
							
							
							
						 
						
							2017-10-15 21:21:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								9aacf21af7 
								
							 
						 
						
							
							
								
								Adjust public hashtag pages ( #5357 )  
							
							
							
						 
						
							2017-10-14 14:48:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								b88cae6c6b 
								
							 
						 
						
							
							
								
								replace newlines in desktop notif with spaces instead of removing them ( #5361 )  
							
							
							
						 
						
							2017-10-14 14:41:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								9fc9d3554d 
								
							 
						 
						
							
							
								
								Updated Catalan strings ( #5323 )  
							
							... 
							
							
							
							* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
* Syncing to master
* Added new Catalan strings
* removed config.secret_key line
* Corrected <sotrong> tag to <strong>
Line 515
* Removed extra line
* Reverted
* yarn.lock reverted
* Updated Catalan strings
* Updated Catalan strings 
							
						 
						
							2017-10-14 14:40:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yannick A 
								
							 
						 
						
							
							
							
							
								
							
							
								7b717319f6 
								
							 
						 
						
							
							
								
								Update French translation ( #5384 )  
							
							... 
							
							
							
							Update French translation 
							
						 
						
							2017-10-14 14:30:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								5c26c3062d 
								
							 
						 
						
							
							
								
								l10n: update Persian translation for 2.0 ( #5391 )  
							
							
							
						 
						
							2017-10-14 14:28:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								2425ba45ae 
								
							 
						 
						
							
							
								
								Update German translation ( #5389 )  
							
							
							
						 
						
							2017-10-14 19:00:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeroen 
								
							 
						 
						
							
							
							
							
								
							
							
								c07034708c 
								
							 
						 
						
							
							
								
								Dutch strings: small change ( #5375 )  
							
							... 
							
							
							
							* Dutch strings: small change
* And this too. 
							
						 
						
							2017-10-13 18:03:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								284b078741 
								
							 
						 
						
							
							
								
								Do not try to guess why home timeline is empty in web UI ( #5370 )  
							
							... 
							
							
							
							* Do not try to guess why home timeline is empty in web UI
* Fix style issue 
							
						 
						
							2017-10-13 16:44:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bfc6479a96 
								
							 
						 
						
							
							
								
								When unfollowing, remove from home in web UI immediately ( #5369 )  
							
							... 
							
							
							
							Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true! 
							
						 
						
							2017-10-13 16:44:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2e88988fce 
								
							 
						 
						
							
							
								
								Reduce discrepancies between server and client-side character count ( #5360 )  
							
							
							
						 
						
							2017-10-12 23:26:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anna e só 
								
							 
						 
						
							
							
							
							
								
							
							
								02d14fd373 
								
							 
						 
						
							
							
								
								l10n: PT-BR translation updated ( #5362 )  
							
							... 
							
							
							
							* PT-BR translation updated
* Testing
* Indentation error fixed
* More indentation errors fixed 
							
						 
						
							2017-10-13 06:16:43 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alda Marteau-Hardi 
								
							 
						 
						
							
							
							
							
								
							
							
								dfde574160 
								
							 
						 
						
							
							
								
								Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )  
							
							
							
						 
						
							2017-10-12 16:31:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								7c06e0af86 
								
							 
						 
						
							
							
								
								Update oc.json ( #5343 )  
							
							
							
						 
						
							2017-10-12 15:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sylvhem 
								
							 
						 
						
							
							
							
							
								
							
							
								ad4d5aaf96 
								
							 
						 
						
							
							
								
								Fixes and updates for the French translation ( #5340 )  
							
							... 
							
							
							
							* Ajout du support des thèmes multiples
Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.
Add translations for the new strings allowing support for multiple themes.
* Mise à jour de la traduction
Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.
Update modified strings and add new translations for the ones who are missing them.
* Remplace « ' » par « ’ »
Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.
Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. 
							
						 
						
							2017-10-12 00:58:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeroen 
								
							 
						 
						
							
							
							
							
								
							
							
								e3717ffadc 
								
							 
						 
						
							
							
								
								Updating Dutch strings for 2.0 ( #5334 )  
							
							
							
						 
						
							2017-10-11 21:21:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alda Marteau-Hardi 
								
							 
						 
						
							
							
							
							
								
							
							
								ae4345e6d4 
								
							 
						 
						
							
							
								
								Use gender neutral language as in the rest of the french translation ( #5331 )  
							
							
							
						 
						
							2017-10-11 21:20:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								75e036b493 
								
							 
						 
						
							
							
								
								Fix styles of error pages ( #5335 )  
							
							... 
							
							
							
							Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link> 
							
						 
						
							2017-10-11 21:18:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								794e015ea2 
								
							 
						 
						
							
							
								
								In thread view, only scroll first update, scroll to replied-to post ( #5322 )  
							
							
							
						 
						
							2017-10-11 19:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6e729f42c3 
								
							 
						 
						
							
							
								
								Fully disable hotkeys when input element is focused ( #5324 )  
							
							... 
							
							
							
							Because alt+n is a way to enter some kinda letter on some keyboard 
							
						 
						
							2017-10-11 16:31:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JohnD28 
								
							 
						 
						
							
							
							
							
								
							
							
								eacf9b9039 
								
							 
						 
						
							
							
								
								Update french translation : mastodon/locales/fr.json ( #5318 )  
							
							... 
							
							
							
							* Update fr.json
* Update fr.json
* Update fr.json 
							
						 
						
							2017-10-11 22:07:09 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ButterflyOfFire 
								
							 
						 
						
							
							
							
							
								
							
							
								ffe158fc96 
								
							 
						 
						
							
							
								
								Update ar.json ( #5316 )  
							
							... 
							
							
							
							Pushing new arabic translated strings for Mastodon web client. 
							
						 
						
							2017-10-11 21:19:04 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								2b29f5b5f1 
								
							 
						 
						
							
							
								
								Fix an error when ancestors get loaded before the status itself ( #5312 )  
							
							... 
							
							
							
							When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly. 
							
						 
						
							2017-10-11 11:25:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6fc71ff7f2 
								
							 
						 
						
							
							
								
								Fix   #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )  
							
							... 
							
							
							
							AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea 
							
						 
						
							2017-10-11 01:01:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af93f234ab 
								
							 
						 
						
							
							
								
								Fix   #5293  - Pre-fill frequently used emojis to avoid bugs ( #5305 )  
							
							
							
						 
						
							2017-10-10 20:47:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4c6adaf4f4 
								
							 
						 
						
							
							
								
								Fix   #5295  - Order custom emoji lexicographically ( #5297 )  
							
							
							
						 
						
							2017-10-10 15:18:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								9c448a0280 
								
							 
						 
						
							
							
								
								Fix an error when video playback buffer is empty ( #5300 )  
							
							
							
						 
						
							2017-10-10 15:17:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4a09a62f98 
								
							 
						 
						
							
							
								
								Center error layout ( #5289 )  
							
							
							
						 
						
							2017-10-09 20:51:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f8ec132261 
								
							 
						 
						
							
							
								
								Track frequently used emojis in web UI ( #5275 )  
							
							... 
							
							
							
							* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix  #5144  - Add tooltips to picker
* Display only 2 lines of frequently used emojis 
							
						 
						
							2017-10-08 21:47:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								5bff1ad44e 
								
							 
						 
						
							
							
								
								i18n update Occitan ( #5263 )  
							
							... 
							
							
							
							* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json 
							
						 
						
							2017-10-08 14:18:27 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								7a66400670 
								
							 
						 
						
							
							
								
								Video preload should be a string ( #5267 )  
							
							
							
						 
						
							2017-10-08 03:06:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								7bde8dcc08 
								
							 
						 
						
							
							
								
								Use ES module build of react-router-dom ( #5264 )  
							
							
							
						 
						
							2017-10-08 02:55:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8279ea2f54 
								
							 
						 
						
							
							
								
								Dynamically calculate card height for embeds instead of padding ( #5265 )  
							
							... 
							
							
							
							The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height 
							
						 
						
							2017-10-08 02:34:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1e7e6413fc 
								
							 
						 
						
							
							
								
								Show buffering in video player ( #5261 )  
							
							
							
						 
						
							2017-10-08 02:33:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b98cd0041b 
								
							 
						 
						
							
							
								
								Redesign public hashtag pages ( #5237 )  
							
							
							
						 
						
							2017-10-07 20:00:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								519c4c446a 
								
							 
						 
						
							
							
								
								Fix custom emoji in emoji picker, persist skin tone ( #5258 )  
							
							
							
						 
						
							2017-10-07 19:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MitarashiDango 
								
							 
						 
						
							
							
							
							
								
							
							
								b5aeaa395a 
								
							 
						 
						
							
							
								
								Japanese translation (relative time) ( #5251 )  
							
							
							
						 
						
							2017-10-08 01:32:03 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								14db4829dc 
								
							 
						 
						
							
							
								
								Update emoji-mart to v2.1.1 ( #5256 )  
							
							
							
						 
						
							2017-10-07 12:17:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b68aa42383 
								
							 
						 
						
							
							
								
								Fix regression from  #5206  - deduplicate descendants ( #5253 )  
							
							
							
						 
						
							2017-10-07 12:16:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								11ceec2756 
								
							 
						 
						
							
							
								
								Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )  
							
							
							
						 
						
							2017-10-07 02:38:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								d33bc0c04f 
								
							 
						 
						
							
							
								
								Fix overflowing in web UI ( #5246 )  
							
							... 
							
							
							
							* Fix overflowing in web UI
* Revert fixing dropdown menu modal 
							
						 
						
							2017-10-06 20:40:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									K.SHIRAKASHI 
								
							 
						 
						
							
							
							
							
								
							
							
								31501f47c5 
								
							 
						 
						
							
							
								
								Fix error on reloading status detail column ( #5248 )  
							
							
							
						 
						
							2017-10-06 20:37:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MIYAGI Hikaru 
								
							 
						 
						
							
							
							
							
								
							
							
								a22adce069 
								
							 
						 
						
							
							
								
								Fix error at emoji_compressed in Firefox ESR ( #5241 )  
							
							
							
						 
						
							2017-10-06 16:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								651aba0e12 
								
							 
						 
						
							
							
								
								Fix thinking_face emoji autocomplete ( #5238 )  
							
							
							
						 
						
							2017-10-06 12:03:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								749a6d2511 
								
							 
						 
						
							
							
								
								Import only Spring/Motion from react-motion ( #5236 )  
							
							
							
						 
						
							2017-10-06 03:46:15 +02:00