David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								5ec2d25ef6 
								
							 
						 
						
							
							
								
								Merge pull request  #528  from glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge with tootsuite/master 
							
						 
						
							2018-06-03 03:01:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								330a234d1f 
								
							 
						 
						
							
							
								
								Whoops, forgot to clean up a conflict.  
							
							
							
						 
						
							2018-06-03 02:35:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								1a0491b3cf 
								
							 
						 
						
							
							
								
								Merge pull request  #519  from ThibG/glitch-soc/fixes/status-node-null  
							
							... 
							
							
							
							Prevent a rare crash when a status' root node is undefined 
							
						 
						
							2018-06-02 16:19:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								827d1ea864 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours. 
							
						 
						
							2018-06-02 16:15:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								3dc8af0016 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-06-02 16:08:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ca2a6b2071 
								
							 
						 
						
							
							
								
								Weblate translations (2018-06-02) ( #7705 )  
							
							... 
							
							
							
							* Translated using Weblate (Korean)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (302 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ 
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.1% (616 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ 
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant_HK/ 
* Translated using Weblate (Slovenian)
Currently translated at 14.4% (90 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
to check if with O or U
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Korean)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (302 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* i18n-tasks normalize && yarn manage:translations 
							
						 
						
							2018-06-02 03:03:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								57ad751230 
								
							 
						 
						
							
							
								
								Fix margin between compose warning, reply indicator and textarea ( #7701 )  
							
							
							
						 
						
							2018-06-01 19:19:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aa54c65ee2 
								
							 
						 
						
							
							
								
								Improve trends layout ( #7700 )  
							
							... 
							
							
							
							* Allow collapsing trends, responsively hide trends
* Add trends column 
							
						 
						
							2018-06-01 19:18:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f64f9860c7 
								
							 
						 
						
							
							
								
								Add loading indicator for trending tags ( #7693 )  
							
							
							
						 
						
							2018-06-01 14:22:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								fe98e276e1 
								
							 
						 
						
							
							
								
								Update ESLint for Code Climate ( #7696 )  
							
							... 
							
							
							
							* Update babel-eslint to version 8.2.3
* Update eslint to version 4.19.1
* Update eslint-plugin-promise to version 3.8.0
* Update eslint-plugin-react to version 7.8.2
* Upgrade eslint-plugin-jsx-a11y to version 6.0.3
* yarn test:lint --fix 
							
						 
						
							2018-06-01 14:03:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								a87927437d 
								
							 
						 
						
							
							
								
								Fix duplicate key attributes ( #7694 )  
							
							
							
						 
						
							2018-06-01 14:02:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								c10df6cf00 
								
							 
						 
						
							
							
								
								Merge pull request  #501  from ThibG/glitch-soc/features/red-bookmarks  
							
							... 
							
							
							
							Make active bookmarks red (fixes  #493 ) 
							
						 
						
							2018-06-01 00:36:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Spencer Alves 
								
							 
						 
						
							
							
							
							
								
							
							
								559ce5c098 
								
							 
						 
						
							
							
								
								Adjust spacing between status icons  
							
							
							
						 
						
							2018-05-31 21:55:44 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Spencer Alves 
								
							 
						 
						
							
							
							
							
								
							
							
								c86cd2041d 
								
							 
						 
						
							
							
								
								Merge branch 'glitch' into thread-icon  
							
							
							
						 
						
							2018-05-31 21:33:16 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aa1f74cba6 
								
							 
						 
						
							
							
								
								Make the refresh trends button refresh trends ( #7685 )  
							
							
							
						 
						
							2018-05-31 16:46:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								a6ddd1aba2 
								
							 
						 
						
							
							
								
								Put the CW field between the toot we are replying to and the toot field ( #7508 )  
							
							... 
							
							
							
							* Remove Collapsable and use CSS instead
* Put the CW field between the toot we are replying to and the toot field
* Use same spacing between all fields in the composing column 
							
						 
						
							2018-05-31 15:16:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								93e6984be8 
								
							 
						 
						
							
							
								
								Make active bookmarks red ( fixes   #493 )  
							
							
							
						 
						
							2018-05-31 14:39:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0174ca8679 
								
							 
						 
						
							
							
								
								Prevent a rare crash when a status' root node is undefined  
							
							
							
						 
						
							2018-05-31 14:38:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								663c9dcf36 
								
							 
						 
						
							
							
								
								Fix direct timeline  
							
							
							
						 
						
							2018-05-31 14:37:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								4c11c429ce 
								
							 
						 
						
							
							
								
								Weblate translations (2018-05-31) ( #7681 )  
							
							... 
							
							
							
							* Translated using Weblate (Basque)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Basque)
Currently translated at 99.3% (297 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 55.2% (42 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Basque)
Currently translated at 8.5% (53 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 9.0% (56 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 98.9% (296 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ 
* Translated using Weblate (Corsican)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Basque)
Currently translated at 41.3% (257 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ 
* Translated using Weblate (Basque)
Currently translated at 56.5% (43 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (German)
Currently translated at 96.9% (64 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (German)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (Basque)
Currently translated at 42.9% (267 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ 
* Translated using Weblate (Basque)
Currently translated at 71.0% (54 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Slovak)
Currently translated at 95.3% (592 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Basque)
Currently translated at 43.8% (272 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 95.3% (592 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese)
Currently translated at 83.7% (520 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 91.9% (571 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* yarn manage:translations && i18n-tasks noramlize && i18n-tasks remove-unused
* remove body_html: ''
* Translated using Weblate (Galician)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* yarn manage:translations 
							
						 
						
							2018-05-31 13:00:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								069bb3eeeb 
								
							 
						 
						
							
							
								
								🌍 :  🇵🇱 ⬆️  ( #7679 )  
							
							... 
							
							
							
							* 🌍 : 🇵🇱 ⬆️ 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* yarn manage:translations 
							
						 
						
							2018-05-31 11:15:38 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								a76f40890e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-05-31 01:17:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d60a87d3d2 
								
							 
						 
						
							
							
								
								Redirect / to home on mobile layout, to getting started on desktop ( #7677 )  
							
							
							
						 
						
							2018-05-30 18:42:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								931c88b0aa 
								
							 
						 
						
							
							
								
								Improve getting started column ( #7676 )  
							
							... 
							
							
							
							* Adjust footer of getting started column
- Improved style
- Moved hotkeys, about this instance and logout to footer
- Removed FAQ, User Guide, Apps links
- Use hamburger icon for the column
* Add edit profile action button to profile and more to dropdown
* Add "Trending now" to getting started column
* Add preferences/security links on mobile layout 
							
						 
						
							2018-05-30 18:41:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								06a6f1759e 
								
							 
						 
						
							
							
								
								[Glitch] Fix low-contrasted cancel button of reply indicator  
							
							... 
							
							
							
							Port 63f6da9a9d 
							
						 
						
							2018-05-29 21:25:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								febaae28f4 
								
							 
						 
						
							
							
								
								[Glitch] Improve load gap styling in web UI  
							
							... 
							
							
							
							Port 93a1afb66c 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								14961cc8ee 
								
							 
						 
						
							
							
								
								[Glitch] Use randomized setTimeout when fallback-polling and re-add since_id  
							
							... 
							
							
							
							Port 4b5cde3f2d 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								44e534c1a5 
								
							 
						 
						
							
							
								
								[Glitch] Do not crash in getStatusIds when there is a gap in the timeline  
							
							... 
							
							
							
							Port 8ccc863ae8 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d73c0e14b0 
								
							 
						 
						
							
							
								
								[Glitch] Fix gap insertion for timeline disconnection  
							
							... 
							
							
							
							Port 575c5753e4 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d7aac92316 
								
							 
						 
						
							
							
								
								[Glitch] Fix ID duplication in timelines  
							
							... 
							
							
							
							Port 33a8c3ab6c 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								27cf820859 
								
							 
						 
						
							
							
								
								[Glitch] Fix comparing id  
							
							... 
							
							
							
							Port 9dff61a5ba 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								54c32199af 
								
							 
						 
						
							
							
								
								[Glitch] Fix LoadMore on account media gallery  
							
							... 
							
							
							
							Port 2111defbbf 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f4a929a74a 
								
							 
						 
						
							
							
								
								[Glitch] Add missing null handling in notification reducer  
							
							... 
							
							
							
							Port 9487e8a4c0 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7096611df6 
								
							 
						 
						
							
							
								
								[Glitch] Allow clients to fetch notifications made while they were offline  
							
							... 
							
							
							
							Port 9eaa47845c 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7a953db0b6 
								
							 
						 
						
							
							
								
								[Glitch] Allow clients to fetch statuses made while they were offline  
							
							... 
							
							
							
							Port 34cb1a5461 
							
						 
						
							2018-05-29 21:25:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								a5c740ba41 
								
							 
						 
						
							
							
								
								Fix context building in the reducer ( #7671 )  
							
							... 
							
							
							
							This fixes below bugs:
* addReply() had used native compare operator for string ids
  => descendants may appears at wrong position
* CONTEXT_FETCH_SUCCESS had added the focused status as the reply of the *first* status in ancestors, not last status.
  => descendants may also appears wrong position as well as correct position
* TIMELINE_UPDATE had added the status to replies of *itself* instead of replied status
  => browser will hangs if you open the status due to a circular reference 
							
						 
						
							2018-05-29 17:42:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6a0f32b359 
								
							 
						 
						
							
							
								
								Fix error when unmuting a domain without listing muted domains first  
							
							
							
						 
						
							2018-05-29 16:26:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a7415de00d 
								
							 
						 
						
							
							
								
								Fix error when unmuting a domain without listing muted domains first ( #7670 )  
							
							
							
						 
						
							2018-05-29 16:25:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c822ecfa01 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-05-29 13:52:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								744d47dee2 
								
							 
						 
						
							
							
								
								Add GET /api/v2/search which returns rich tag objects, adjust web UI ( #7661 )  
							
							
							
						 
						
							2018-05-29 02:01:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bc464619f3 
								
							 
						 
						
							
							
								
								Always display tab navigation on local/federated timeline even when empty ( #7663 )  
							
							... 
							
							
							
							Fix  #7659  
						
							2018-05-29 02:01:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb1524dc1 
								
							 
						 
						
							
							
								
								Cache attachments on external host with service worker ( #7493 )  
							
							
							
						 
						
							2018-05-29 00:43:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								49ee254971 
								
							 
						 
						
							
							
								
								Fix embed, error and onboarding modals in light theme ( #7656 )  
							
							
							
						 
						
							2018-05-28 19:13:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bc64ef560e 
								
							 
						 
						
							
							
								
								Fix incomplete flex style on trends items ( #7655 )  
							
							
							
						 
						
							2018-05-28 19:12:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								20a23c7d08 
								
							 
						 
						
							
							
								
								Replace recursion in status mapStateToProps ( #7645 )  
							
							
							
						 
						
							2018-05-28 02:42:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8a3b9d26fb 
								
							 
						 
						
							
							
								
								Track trending tags ( #7638 )  
							
							... 
							
							
							
							* Track trending tags
- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends
Fix  #271 
* Add trends to web UI
* Don't render compose form on search route, adjust search results header
* Disqualify tag from trends if it's in disallowed hashtags setting
* Count distinct accounts using tag, ignore silenced accounts 
							
						 
						
							2018-05-27 21:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5ad747727f 
								
							 
						 
						
							
							
								
								[Glitch] Replace onScrollToBottom with onLoadMore  
							
							... 
							
							
							
							Port 01d10b0bd8 
							
						 
						
							2018-05-27 20:40:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c7e5a0af57 
								
							 
						 
						
							
							
								
								Do not needlessly refresh pinned toots  
							
							... 
							
							
							
							Port missing part of b29feb5c67 
							
						 
						
							2018-05-27 20:40:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4f2bf28a86 
								
							 
						 
						
							
							
								
								[Glitch] Change icon for domain blocks  
							
							... 
							
							
							
							Port 3774cbce91 
							
						 
						
							2018-05-27 20:40:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								89f4e0298c 
								
							 
						 
						
							
							
								
								[Glitch] Add option to show only local toots in timeline preview  
							
							... 
							
							
							
							Port missing changes from 6528c0c101 
							
						 
						
							2018-05-27 20:39:25 +02:00