JeanGauthier 
							
						 
					 
					
						
						
						
						
							
						
						
							a02de9e012 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							2d395324e1 
							
						 
					 
					
						
						
							
							Fix React warning about tabIndex on status with CW ( #5432 )  
						
						
						
						
					 
					
						2017-10-17 13:03:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jakob Kramer 
							
						 
					 
					
						
						
						
						
							
						
						
							e6c9756fa9 
							
						 
					 
					
						
						
							
							Update German translation ( #5425 )  
						
						
						
						
					 
					
						2017-10-17 12:02:47 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							5050719fac 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							a2b600428c 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							df1a9c5ab5 
							
						 
					 
					
						
						
							
							Small update Dutch (nl) strings ( #5424 )  
						
						... 
						
						
						
						* Update Dutch strings
* Update Dutch 
						
						
					 
					
						2017-10-17 01:00:23 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4421f6598f 
							
						 
					 
					
						
						
							
							Fix dual toot button wrong behavior after compose re-design  
						
						
						
						
					 
					
						2017-10-16 23:32:13 +02:00 
						 
				 
			
				
					
						
							
							
								beatrix 
							
						 
					 
					
						
						
						
						
							
						
						
							7364b26e4b 
							
						 
					 
					
						
						
							
							Merge pull request  #184  from tootsuite/master  
						
						... 
						
						
						
						Fix reduced motion breaking public galleries (#5423 ) 
						
						
					 
					
						2017-10-16 17:05:42 -04:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							313ba202ef 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							37ff061d9b 
							
						 
					 
					
						
						
							
							satisfy eslint and jest  
						
						
						
						
					 
					
						2017-10-16 22:24:44 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							26f08f0791 
							
						 
					 
					
						
						
							
							double-decker tootbox  
						
						
						
						
					 
					
						2017-10-16 22:10:14 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4b397adb5b 
							
						 
					 
					
						
						
							
							fix some lint errors  
						
						
						
						
					 
					
						2017-10-16 21:13:34 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							8980aa804f 
							
						 
					 
					
						
						
							
							Fix reduced motion breaking public galleries ( #5423 )  
						
						
						
						
					 
					
						2017-10-16 21:08:01 +02:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							dbb1fce94d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into gs-master  
						
						
						
						
					 
					
						2017-10-16 09:23:59 -05: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 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd5b3bbe5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into gs-master  
						
						
						
						
					 
					
						2017-10-16 01:29:02 -05:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							22df18e902 
							
						 
					 
					
						
						
							
							Merge pull request  #173  from glitch-soc/zerowidthmoji  
						
						... 
						
						
						
						use zerowidth spaces with emojis 
						
						
					 
					
						2017-10-15 20:04:19 -05: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc22d23b9 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							eb96aa86a4 
							
						 
					 
					
						
						
							
							Update German translation ( #5389 )  
						
						
						
						
					 
					
						2017-10-14 19:00:23 +09:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
						
						
							
						
						
							531dadad86 
							
						 
					 
					
						
						
							
							Doodle palette, options, fill tool ( #172 )  
						
						
						
						
					 
					
						2017-10-14 00:58:38 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							723890b6fa 
							
						 
					 
					
						
						
							
							use zerowidth spaces for emojis  
						
						
						
						
					 
					
						2017-10-14 00:48:53 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2af964ef20 
							
						 
					 
					
						
						
							
							Fixed a bug where the canvas would get transparent bg upon erase  
						
						
						
						
					 
					
						2017-10-13 18:13:00 +02:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							33e806217f 
							
						 
					 
					
						
						
							
							Initial doodle support  
						
						
						
						
					 
					
						2017-10-13 18:07:01 +02: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 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							df626fdd43 
							
						 
					 
					
						
						
							
							Fix the notification bug with newlines  
						
						
						
						
					 
					
						2017-10-12 21:28:17 +02:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							6a2b1ba91e 
							
						 
					 
					
						
						
							
							Another tabs-vs-spaces fix, but with ~feeling~  
						
						
						
						
					 
					
						2017-10-12 09:36:26 -05: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 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							fe1c20cfb9 
							
						 
					 
					
						
						
							
							Fix tabs-vs-spaces issue pointed out by eslint.  
						
						
						
						
					 
					
						2017-10-12 09:23:06 -05:00 
						 
				 
			
				
					
						
							
							
								JeanGauthier 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7ba23cd8 
							
						 
					 
					
						
						
							
							Update oc.json ( #5343 )  
						
						
						
						
					 
					
						2017-10-12 15:40:45 +02:00