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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								f92d0bbda4 
								
							 
						 
						
							
							
								
								Doodle improvements 2 ( #176 )  
							
							... 
							
							
							
							* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option> 
							
						 
						
							2017-10-14 12:24:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								2425ba45ae 
								
							 
						 
						
							
							
								
								Update German translation ( #5389 )  
							
							
							
						 
						
							2017-10-14 19:00:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								a438c1dc83 
								
							 
						 
						
							
							
								
								Doodle palette, options, fill tool ( #172 )  
							
							
							
						 
						
							2017-10-14 00:58:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								4eb270dd19 
								
							 
						 
						
							
							
								
								use zerowidth spaces for emojis  
							
							
							
						 
						
							2017-10-14 00:48:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								0cca5ac567 
								
							 
						 
						
							
							
								
								Fixed a bug where the canvas would get transparent bg upon erase  
							
							
							
						 
						
							2017-10-13 18:13:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f6d8220a 
								
							 
						 
						
							
							
								
								Initial doodle support  
							
							
							
						 
						
							2017-10-13 18:07:01 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								e960e2c1d2 
								
							 
						 
						
							
							
								
								Fix the notification bug with newlines  
							
							
							
						 
						
							2017-10-12 21:28:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								227824429b 
								
							 
						 
						
							
							
								
								Another tabs-vs-spaces fix, but with ~feeling~  
							
							
							
						 
						
							2017-10-12 09:36:26 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								3cc091d374 
								
							 
						 
						
							
							
								
								Fix tabs-vs-spaces issue pointed out by eslint.  
							
							
							
						 
						
							2017-10-12 09:23:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								7c06e0af86 
								
							 
						 
						
							
							
								
								Update oc.json ( #5343 )  
							
							
							
						 
						
							2017-10-12 15:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								7d0cf5a6a1 
								
							 
						 
						
							
							
								
								Merge tag 'v2.0.0rc2' into gs-master  
							
							
							
						 
						
							2017-10-12 04:22:59 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								d08756cfc3 
								
							 
						 
						
							
							
								
								Fix our media gallery not having alt text and tooltips  
							
							
							
						 
						
							2017-10-11 22:02:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								f8749b268c 
								
							 
						 
						
							
							
								
								workaround for scrollIntoView bug ???  
							
							
							
						 
						
							2017-10-11 21:49:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								132a22ace5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2017-10-11 21:27:17 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								037d7478af 
								
							 
						 
						
							
							
								
								Removed length check which now happens in reducer  
							
							
							
						 
						
							2017-10-11 11:50:11 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								215da1a03c 
								
							 
						 
						
							
							
								
								Fixed header emojification  
							
							
							
						 
						
							2017-10-11 11:00:28 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								02827345ae 
								
							 
						 
						
							
							
								
								Merge upstream 2.0ish  #165  
							
							
							
						 
						
							2017-10-11 10:43:10 -07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								2f8dc023a5 
								
							 
						 
						
							
							
								
								improve static page metadata look  
							
							
							
						 
						
							2017-10-08 10:46:59 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								fb05013855 
								
							 
						 
						
							
							
								
								Basic static metadata styling  
							
							
							
						 
						
							2017-10-06 22:22:34 -07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								4bc0a9d1e9 
								
							 
						 
						
							
							
								
								comment out unused stuff with Video  
							
							
							
						 
						
							2017-10-06 09:23:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								749a6d2511 
								
							 
						 
						
							
							
								
								Import only Spring/Motion from react-motion ( #5236 )  
							
							
							
						 
						
							2017-10-06 03:46:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								2b34471d9d 
								
							 
						 
						
							
							
								
								Compress and combine emoji data ( #5229 )  
							
							
							
						 
						
							2017-10-06 03:42:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								ac55d742c2 
								
							 
						 
						
							
							
								
								import only Overlay from react-overlays ( #5235 )  
							
							
							
						 
						
							2017-10-06 03:24:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								32998720eb 
								
							 
						 
						
							
							
								
								Implement hotkeys for web UI ( #5164 )  
							
							... 
							
							
							
							* Fix  #2102  - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea 
							
						 
						
							2017-10-06 01:07:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f37350c08f 
								
							 
						 
						
							
							
								
								When processing custom emoji, ensure a non-animated version exists ( #5230 )  
							
							... 
							
							
							
							Use the non-animated version in web UI, but return both in API 
							
						 
						
							2017-10-05 23:41:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								37f69bb4db 
								
							 
						 
						
							
							
								
								workaround for notif clearing  
							
							
							
						 
						
							2017-10-05 21:55:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								4e822d41b9 
								
							 
						 
						
							
							
								
								adjust public profile pages 2 ( #5223 )  
							
							
							
						 
						
							2017-10-04 22:49:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MitarashiDango 
								
							 
						 
						
							
							
							
							
								
							
							
								dd3f9ec261 
								
							 
						 
						
							
							
								
								fix error (When part of conversation  has already been deleted.) ( #5216 )  
							
							
							
						 
						
							2017-10-04 16:28:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2a9819b8ec 
								
							 
						 
						
							
							
								
								Use own, shorter relative timestamps ( #5171 )  
							
							... 
							
							
							
							* Use own, shorter relative timestamps
* Add acct to title tooltip of display name in statuses
* Improve i18n of the relative times 
							
						 
						
							2017-10-04 01:23:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e702a64f41 
								
							 
						 
						
							
							
								
								When a streaming API status arrives, sort it into conversations ( #5206 )  
							
							
							
						 
						
							2017-10-04 01:01:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9ea85b62 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #5202 )  
							
							
							
						 
						
							2017-10-03 21:15:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								e766862f65 
								
							 
						 
						
							
							
								
								Compress emoji_data_light.js ( #5201 )  
							
							
							
						 
						
							2017-10-03 20:43:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
							
							
								
							
							
								3d8d23515f 
								
							 
						 
						
							
							
								
								Add pagination in media modal ( #4343 )  
							
							... 
							
							
							
							* Add pagination in media modal
* Change array name
* Add an element class
* Avoid nested class
* Pull out the active class
* Use map instead of forEach
* Remove parentheses 
							
						 
						
							2017-10-03 17:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								8d3ff887ab 
								
							 
						 
						
							
							
								
								Add placeholder text color to form of media attachments ( #5196 )  
							
							
							
						 
						
							2017-10-03 13:10:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f7d7a92d57 
								
							 
						 
						
							
							
								
								Add missing Japanese translations ( #5193 )  
							
							... 
							
							
							
							* yarn manage:translations
* Add Japanese translations for #5170 
* Add Japanese translations for #5123 
* Add Japanese translations for #5046 
* Add Japanese translations for #5099 
* Add Japanese translations for #5161 
* "項目" -> "絵文字" 
							
						 
						
							2017-10-03 13:10:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								ba84aed262 
								
							 
						 
						
							
							
								
								Remove aria-label of status content ( #5195 )  
							
							... 
							
							
							
							aria-label contained body of status with content warning, which should be
hidden by default. Remove the label for the case and other cases due to
consistency. 
							
						 
						
							2017-10-03 13:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								902e249cdb 
								
							 
						 
						
							
							
								
								Update German translation ( #5189 )  
							
							
							
						 
						
							2017-10-03 09:53:18 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d4d8808217 
								
							 
						 
						
							
							
								
								When muting, clear web UI like for blocks ( #5172 )  
							
							... 
							
							
							
							* When muting, clear web UI like for blocks
* Fix style issue 
							
						 
						
							2017-10-03 02:01:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								22ea9d28ec 
								
							 
						 
						
							
							
								
								Fix   #5079 ,  fix   #5186  - Emoji picker fixes ( #5187 )  
							
							
							
						 
						
							2017-10-03 01:56:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								17bcb30c82 
								
							 
						 
						
							
							
								
								i18n: Update translation files and Polish translation ( #5180 )  
							
							... 
							
							
							
							* Update translation files
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-10-02 23:38:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								17572438f1 
								
							 
						 
						
							
							
								
								Search popout ( #5170 )  
							
							
							
						 
						
							2017-10-02 18:24:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								7846ec2d4d 
								
							 
						 
						
							
							
								
								Code-split emoji-mart picker and data ( #5175 )  
							
							
							
						 
						
							2017-10-02 07:22:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								8537845323 
								
							 
						 
						
							
							
								
								Toggle contain:strict on fullscreen ( #5159 )  
							
							... 
							
							
							
							* Toggle contain:strict on fullscreen
* Fix scss lint issue
* fix scss whitespace lint issue 
							
						 
						
							2017-10-02 03:01:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a6873742e7 
								
							 
						 
						
							
							
								
								Improve privacy dropdown, remove react-simple-dropdown dependency ( #5140 )  
							
							... 
							
							
							
							* Improve privacy dropdown, remove react-simple-dropdown dependency
* Animate privacy warning
* Fix react-router-scroll 
							
						 
						
							2017-10-01 12:20:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								06ef1b0ac4 
								
							 
						 
						
							
							
								
								Reorganize preferences page ( #5161 )  
							
							
							
						 
						
							2017-10-01 10:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daggertooth 
								
							 
						 
						
							
							
							
							
								
							
							
								43d1281d76 
								
							 
						 
						
							
							
								
								Add image descriptions to title attribute to view on mouse hover/long-press. ( #5137 )  
							
							... 
							
							
							
							* Add image descriptions to `title` attribute to view on mouse hover/long-press.
* Too many title properties may spoil the broth. 
							
						 
						
							2017-10-01 00:35:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								2955141d2e 
								
							 
						 
						
							
							
								
								Merge pull request  #125  from glitch-soc/data-column  
							
							... 
							
							
							
							Add data-column="..." to all columns 
							
						 
						
							2017-09-30 15:02:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MIYAGI Hikaru 
								
							 
						 
						
							
							
							
							
								
							
							
								924c022340 
								
							 
						 
						
							
							
								
								trivial refactoring for emojify() ( #5075 )  
							
							... 
							
							
							
							* unite loop process
* add hint for original emojifier 
							
						 
						
							2017-09-30 15:57:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								1660e53726 
								
							 
						 
						
							
							
								
								Improve IntersectionObserverArticle perf ( #5152 )  
							
							
							
						 
						
							2017-09-30 14:28:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								75207f55a5 
								
							 
						 
						
							
							
								
								Make emoji autosuggestions immediate, usernames appear sooner ( #5149 )  
							
							... 
							
							
							
							* Do not debounce emoji search
* Make autosuggestions appear sooner 
							
						 
						
							2017-09-30 05:11:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2fac5e21c2 
								
							 
						 
						
							
							
								
								Upgrade to React 16 ( #5119 )  
							
							... 
							
							
							
							* Upgrade to React 16.0.0
* Disable some uncritical tests while chai-enzyme remains incompatible 
							
						 
						
							2017-09-30 04:29:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								0b668dc4d3 
								
							 
						 
						
							
							
								
								Remove react-sizeme ( #5143 )  
							
							... 
							
							
							
							* Remove react-sizeme
* Fix aspect ratio in "sensitive" mode 
							
						 
						
							2017-09-29 22:46:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2a885ea3 
								
							 
						 
						
							
							
								
								Updated German translation ( #5151 )  
							
							... 
							
							
							
							Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.
More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.
Some small improvements. 
							
						 
						
							2017-09-29 21:11:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5f137e7ec3 
								
							 
						 
						
							
							
								
								Increase attachment descriptions to 420 characters ( #5139 )  
							
							... 
							
							
							
							Blaze it 
							
						 
						
							2017-09-29 02:30:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								d55a6ae28a 
								
							 
						 
						
							
							
								
								Update German translation ( #5133 )  
							
							... 
							
							
							
							Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%) 
							
						 
						
							2017-09-28 20:45:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								c74512f7af 
								
							 
						 
						
							
							
								
								Improve performance of modal and swipe animations ( #5135 )  
							
							... 
							
							
							
							* Improve performance of modal and swipe animations
* Fix eslint issues 
							
						 
						
							2017-09-28 20:43:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								b295f86753 
								
							 
						 
						
							
							
								
								Updated German translation ( #5132 )  
							
							
							
						 
						
							2017-09-28 17:38:39 +02:00