Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								067e4e2404 
								
							 
						 
						
							
							
								
								Compose buttons bar redesign + generalize dropdown ( #194 )  
							
							... 
							
							
							
							* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ... 
							
						 
						
							2017-10-21 20:24:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								8b8eeb0fbf 
								
							 
						 
						
							
							
								
								Make the compose area optionally scrollable.  
							
							... 
							
							
							
							On desktop, the compose text box grows to accommodate the content.  On
mobile, the text box does not grow to accommodate text context, but does
grow to accommodate images.  It is possible in both cases to overflow
the available area, which makes accessing other UI elements (e.g.
visibility setttings) difficult.
This commit makes the compose area optionally scrollable, which allows
those UI elements to remain available even if they go off-screen. 
							
						 
						
							2017-10-19 10:59:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								0a9b3b1415 
								
							 
						 
						
							
							
								
								formatting fix for eslint  
							
							
							
						 
						
							2017-10-18 23:44:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								722fe5fda8 
								
							 
						 
						
							
							
								
								Remove unused filesAttached property.  
							
							
							
						 
						
							2017-10-18 13:20:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								dd4f9f18cb 
								
							 
						 
						
							
							
								
								Merge tag 'v2.0.0' into gs-master  
							
							
							
						 
						
							2017-10-18 11:52:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sho Kusano 
								
							 
						 
						
							
							
							
							
								
							
							
								85e47a4423 
								
							 
						 
						
							
							
								
								Suppress type error(not a function) on calling fastSeek ( #5452 )  
							
							
							
						 
						
							2017-10-18 17:13:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								a761e02bd1 
								
							 
						 
						
							
							
								
								Fix pt-BR translation strings related to advanced search. ( #5449 )  
							
							
							
						 
						
							2017-10-18 13:53:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Technowix 
								
							 
						 
						
							
							
							
							
								
							
							
								8eea3bd6d8 
								
							 
						 
						
							
							
								
								Revert  #5438  for FR ( #5450 )  
							
							... 
							
							
							
							As said here https://github.com/tootsuite/mastodon/pull/5438  the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades. 
							
						 
						
							2017-10-18 13:51:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Håkan Eriksson 
								
							 
						 
						
							
							
							
							
								
							
							
								ecef91e5ca 
								
							 
						 
						
							
							
								
								Some typos and supplementation in sentence structures ( #5441 )  
							
							... 
							
							
							
							* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
* Swedish - Typos and supplementation in sentence structure
* Update simple_form.sv.yml
* Update sv.yml
* Update sv.yml
Rearranged the alphabetical order. 
							
						 
						
							2017-10-18 13:50:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JohnD28 
								
							 
						 
						
							
							
							
							
								
							
							
								8e386ca547 
								
							 
						 
						
							
							
								
								fr.json typo (realtive time) ( #5447 )  
							
							... 
							
							
							
							Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie  
							
						 
						
							2017-10-18 16:47:14 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8eee4b3d35 
								
							 
						 
						
							
							
								
								When unreblog arrives over streaming API, just delete in UI ( #5439 )  
							
							
							
						 
						
							2017-10-17 22:17:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								a18201f690 
								
							 
						 
						
							
							
								
								i18n better wording (OC/CA/FR) + string added in FR ( #5438 )  
							
							... 
							
							
							
							* Update oc.json
* Update fr.json
* Update ca.json
* Update fr.json
* Update simple_form.fr.yml
* Update ca.json
* Update fr.json
* Update oc.json
* Update oc.json
* Update fr.json 
							
						 
						
							2017-10-17 21:49:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								24155c5890 
								
							 
						 
						
							
							
								
								Fix unwanted content warning gap in CSS ( #5436 )  
							
							... 
							
							
							
							Fix  #5356  
						
							2017-10-17 20:07:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								e1efabf979 
								
							 
						 
						
							
							
								
								i18n update ( #5427 ) in OC/CA/FR/ES ( #5431 )  
							
							... 
							
							
							
							* Update oc.json
* Update ca.json
* Update fr.json
* Update es.json 
							
						 
						
							2017-10-17 13:03:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								90fb04f1bb 
								
							 
						 
						
							
							
								
								Fix React warning about tabIndex on status with CW ( #5432 )  
							
							
							
						 
						
							2017-10-17 13:03:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakob Kramer 
								
							 
						 
						
							
							
							
							
								
							
							
								15ae7fe6b2 
								
							 
						 
						
							
							
								
								Update German translation ( #5425 )  
							
							
							
						 
						
							2017-10-17 12:02:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								d7063885bc 
								
							 
						 
						
							
							
								
								Add Japanese translations ( #5427 )  
							
							... 
							
							
							
							* yarn manage:translations
* Add Japanese translation for #5410 
* Add Japanese translation for #5393  
							
						 
						
							2017-10-17 11:47:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Håkan Eriksson 
								
							 
						 
						
							
							
							
							
								
							
							
								c06052b7cf 
								
							 
						 
						
							
							
								
								Swedish translation ( #5406 )  
							
							... 
							
							
							
							* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete 
							
						 
						
							2017-10-17 13:41:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeroen 
								
							 
						 
						
							
							
							
							
								
							
							
								289723dd1c 
								
							 
						 
						
							
							
								
								Small update Dutch (nl) strings ( #5424 )  
							
							... 
							
							
							
							* Update Dutch strings
* Update Dutch 
							
						 
						
							2017-10-17 01:00:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								26b5013865 
								
							 
						 
						
							
							
								
								Fix dual toot button wrong behavior after compose re-design  
							
							
							
						 
						
							2017-10-16 23:32:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								cda8575ae3 
								
							 
						 
						
							
							
								
								Merge pull request  #184  from tootsuite/master  
							
							... 
							
							
							
							Fix reduced motion breaking public galleries (#5423 ) 
							
						 
						
							2017-10-16 17:05:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								02887e0953 
								
							 
						 
						
							
							
								
								Merge pull request  #182  from glitch-soc/wide-tootbox-panel  
							
							... 
							
							
							
							Full-width tootbox panel to make room for buttons 
							
						 
						
							2017-10-16 15:49:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								adec2b6716 
								
							 
						 
						
							
							
								
								satisfy eslint and jest  
							
							
							
						 
						
							2017-10-16 22:24:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								f1d386a3ad 
								
							 
						 
						
							
							
								
								double-decker tootbox  
							
							
							
						 
						
							2017-10-16 22:10:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								26e7e5f0ef 
								
							 
						 
						
							
							
								
								fix some lint errors  
							
							
							
						 
						
							2017-10-16 21:13:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								d7b8208a37 
								
							 
						 
						
							
							
								
								Fix reduced motion breaking public galleries ( #5423 )  
							
							
							
						 
						
							2017-10-16 21:08:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								e19bc7835a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into gs-master  
							
							
							
						 
						
							2017-10-16 09:23:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								55642feb4b 
								
							 
						 
						
							
							
								
								Filter out duplicate IDs in timelines reducer ( #5417 )  
							
							... 
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 15:59:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									voidSatisfaction 
								
							 
						 
						
							
							
							
							
								
							
							
								7ae6d55b8a 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								e1357265ed 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								8953c2a918 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #5416 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-10-16 14:09:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JeanGauthier 
								
							 
						 
						
							
							
							
							
								
							
							
								c102025e2c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								dd505c5d8c 
								
							 
						 
						
							
							
								
								Enable ESLint rules import/* ( #5414 )  
							
							... 
							
							
							
							* Enable ESLint rules import/*
* fix 
							
						 
						
							2017-10-16 11:12:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								a54c272a1f 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								a5d60195fc 
								
							 
						 
						
							
							
								
								Fix offline-plugin warning in dev mode ( #5411 )  
							
							
							
						 
						
							2017-10-16 09:33:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								ec18363c3b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-16 01:29:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								b015ab4e94 
								
							 
						 
						
							
							
								
								Merge pull request  #173  from glitch-soc/zerowidthmoji  
							
							... 
							
							
							
							use zerowidth spaces with emojis 
							
						 
						
							2017-10-15 20:04:19 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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