Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	8980aa804f  
						 
						
							
							
								
								
								Fix reduced motion breaking public galleries ( #5423 )  
							
							
							
							
						 
						
							2017-10-16 21:08:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	aec70b44fc  
						 
						
							
							
								
								
								Filter out duplicate IDs in timelines reducer ( #5417 )  
							
							... 
							
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 15:59:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									voidSatisfaction 
								
							 
						 
						
							
							
								
							
							
	03975dbde4  
						 
						
							
							
								
								
								Add up-to-date korean translation on client  ( #5402 )  
							
							... 
							
							
							
							
							* chore: add Korean translation for client
* fix: change unlisted and embed Korean words 
							
						 
						
							2017-10-16 14:39:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									KY 
								
							 
						 
						
							
							
								
							
							
	f72936b4e6  
						 
						
							
							
								
								
								Fix   #5082  - disable retweet link for followers only toot ( #5397 )  
							
							... 
							
							
							
							
							* Fix  #5082  - disable retweet link for followers only toot
* Hide reblog count when it is a direct message 
							
						 
						
							2017-10-16 14:10:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
								
							
							
	3c530d95f6  
						 
						
							
							
								
								
								i18n: Update Polish translation ( #5416 )  
							
							... 
							
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-10-16 14:09:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
								
							
							
	1e7b3bf625  
						 
						
							
							
								
								
								i18n ultim hour «More» dropdown title + reduce motion ( #5415 )  
							
							... 
							
							
							
							
							* Correction fem. form
* More dropdown title
* More dropdown title
* More dropdown title
* Add option to reduce motion (#5393 ) 
							
						 
						
							2017-10-16 14:09:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	bf0ee1a25c  
						 
						
							
							
								
								
								Enable ESLint rules import/* ( #5414 )  
							
							... 
							
							
							
							
							* Enable ESLint rules import/*
* fix 
							
						 
						
							2017-10-16 11:12:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	fa0be3f834  
						 
						
							
							
								
								
								Add option to reduce motion ( #5393 )  
							
							... 
							
							
							
							
							* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml 
							
						 
						
							2017-10-16 09:36:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	981e20b03a  
						 
						
							
							
								
								
								Fix offline-plugin warning in dev mode ( #5411 )  
							
							
							
							
						 
						
							2017-10-16 09:33:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	d5b767c374  
						 
						
							
							
								
								
								Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )  
							
							
							
							
						 
						
							2017-10-16 09:33:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	93b54b8d4b  
						 
						
							
							
								
								
								i18n "More" dropdown title ( #5410 )  
							
							
							
							
						 
						
							2017-10-16 09:31:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	e7ab9bf8b4  
						 
						
							
							
								
								
								Refactor and simplify icon_button.js ( #5413 )  
							
							
							
							
						 
						
							2017-10-16 09:30:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	894da3dcca  
						 
						
							
							
								
								
								Clear timer when unmounting RelativeTimestamp components ( #5408 )  
							
							... 
							
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 03:03:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
								
							
							
	8eb7d30a6c  
						 
						
							
							
								
								
								l10n Occitan: finishing touches ( #5404 )  
							
							... 
							
							
							
							
							* Update oc.json
* Update oc.yml 
							
						 
						
							2017-10-15 23:07:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yannick A 
								
							 
						 
						
							
							
								
							
							
	7fe1428cc4  
						 
						
							
							
								
								
								Update French translation ( #5401 )  
							
							
							
							
						 
						
							2017-10-15 21:21:05 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
								
							
							
	b3b4b5a2eb  
						 
						
							
							
								
								
								Adjust public hashtag pages ( #5357 )  
							
							
							
							
						 
						
							2017-10-14 14:48:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
							
							
	ae716a12e1  
						 
						
							
							
								
								
								replace newlines in desktop notif with spaces instead of removing them ( #5361 )  
							
							
							
							
						 
						
							2017-10-14 14:41:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
								
							
							
	f63a40e7c2  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	c6f76db2e1  
						 
						
							
							
								
								
								Update French translation ( #5384 )  
							
							... 
							
							
							
							
							Update French translation 
							
						 
						
							2017-10-14 14:30:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
								
							
							
	2c704ca9c6  
						 
						
							
							
								
								
								l10n: update Persian translation for 2.0 ( #5391 )  
							
							
							
							
						 
						
							2017-10-14 14:28:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
								
							
							
	eb96aa86a4  
						 
						
							
							
								
								
								Update German translation ( #5389 )  
							
							
							
							
						 
						
							2017-10-14 19:00:23 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeroen 
								
							 
						 
						
							
							
								
							
							
	c35132a738  
						 
						
							
							
								
								
								Dutch strings: small change ( #5375 )  
							
							... 
							
							
							
							
							* Dutch strings: small change
* And this too. 
							
						 
						
							2017-10-13 18:03:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	48f7a58799  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	388d093beb  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	d37305c628  
						 
						
							
							
								
								
								Reduce discrepancies between server and client-side character count ( #5360 )  
							
							
							
							
						 
						
							2017-10-12 23:26:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Anna e só 
								
							 
						 
						
							
							
								
							
							
	ad917cda10  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	3cfcc7a50e  
						 
						
							
							
								
								
								Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )  
							
							
							
							
						 
						
							2017-10-12 16:31:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
								
							
							
	cb7ba23cd8  
						 
						
							
							
								
								
								Update oc.json ( #5343 )  
							
							
							
							
						 
						
							2017-10-12 15:40:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sylvhem 
								
							 
						 
						
							
							
								
							
							
	3ebe03b729  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	6bc07d3de3  
						 
						
							
							
								
								
								Updating Dutch strings for 2.0 ( #5334 )  
							
							
							
							
						 
						
							2017-10-11 21:21:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alda Marteau-Hardi 
								
							 
						 
						
							
							
								
							
							
	0352c40e99  
						 
						
							
							
								
								
								Use gender neutral language as in the rest of the french translation ( #5331 )  
							
							
							
							
						 
						
							2017-10-11 21:20:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
								
							
							
	07ea625cb2  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	1823cf435a  
						 
						
							
							
								
								
								In thread view, only scroll first update, scroll to replied-to post ( #5322 )  
							
							
							
							
						 
						
							2017-10-11 19:21:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	476e79b8e3  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	19d3317a69  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	38600b2792  
						 
						
							
							
								
								
								Update ar.json ( #5316 )  
							
							... 
							
							
							
							
							Pushing new arabic translated strings for Mastodon web client. 
							
						 
						
							2017-10-11 21:19:04 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	b0407ece42  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	b3d7ad958f  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	9815be2a44  
						 
						
							
							
								
								
								Fix   #5293  - Pre-fill frequently used emojis to avoid bugs ( #5305 )  
							
							
							
							
						 
						
							2017-10-10 20:47:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	4bb3e4eeba  
						 
						
							
							
								
								
								Fix   #5295  - Order custom emoji lexicographically ( #5297 )  
							
							
							
							
						 
						
							2017-10-10 15:18:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	784c7510d7  
						 
						
							
							
								
								
								Fix an error when video playback buffer is empty ( #5300 )  
							
							
							
							
						 
						
							2017-10-10 15:17:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	1c6fc0e4ce  
						 
						
							
							
								
								
								Center error layout ( #5289 )  
							
							
							
							
						 
						
							2017-10-09 20:51:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	488584bfc1  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	94f15338c3  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	db33a53ee8  
						 
						
							
							
								
								
								Video preload should be a string ( #5267 )  
							
							
							
							
						 
						
							2017-10-08 03:06:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	7de6d269d2  
						 
						
							
							
								
								
								Use ES module build of react-router-dom ( #5264 )  
							
							
							
							
						 
						
							2017-10-08 02:55:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	684001d729  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	292f3cd7e0  
						 
						
							
							
								
								
								Show buffering in video player ( #5261 )  
							
							
							
							
						 
						
							2017-10-08 02:33:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	f486ef2666  
						 
						
							
							
								
								
								Redesign public hashtag pages ( #5237 )  
							
							
							
							
						 
						
							2017-10-07 20:00:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	d2dee6ea43  
						 
						
							
							
								
								
								Fix custom emoji in emoji picker, persist skin tone ( #5258 )  
							
							
							
							
						 
						
							2017-10-07 19:02:30 +02:00