Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9110db41c5 
							
						 
					 
					
						
						
							
							Federate pinned statuses over ActivityPub ( #6610 )  
						
						... 
						
						
						
						* Federate pinned statuses over ActivityPub
* Display pinned toots in web UI
Fix  #6117 
* Fix migration
* Fix tests
* Update outbox_serializer.rb
* Update remove_serializer.rb
* Update add_serializer.rb
* Update fetch_featured_collection_service.rb 
						
						
					 
					
						2018-03-04 09:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							45feb439bd 
							
						 
					 
					
						
						
							
							Finalize location on scrollable notifications when unmounting ( #6614 )  
						
						... 
						
						
						
						The top of the scrollable notifications will be invisible after unmounting.
The Redux state should be updated accordingly in such a case so that the
unread notification counter will be updated later. 
						
						
					 
					
						2018-03-04 08:55:15 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							65e2a4645e 
							
						 
					 
					
						
						
							
							Use glitchsoc TimelineComponent's margin/padding on about page.  
						
						
						
						
					 
					
						2018-03-03 11:16:10 -06:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6176e278f4 
							
						 
					 
					
						
						
							
							Copy in new CSS for about page.  
						
						
						
						
					 
					
						2018-03-03 11:01:24 -06:00 
						 
				 
			
				
					
						
							
							
								Jeong Arm 
							
						 
					 
					
						
						
						
						
							
						
						
							c82a2358bd 
							
						 
					 
					
						
						
							
							Translate Korean ( #6608 )  
						
						
						
						
					 
					
						2018-03-04 01:53:55 +09:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1b8fcd4df5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge-upstream  
						
						... 
						
						
						
						Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml 
						
						
					 
					
						2018-03-02 21:46:44 -06:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e72db6d9dd 
							
						 
					 
					
						
						
							
							Move "compose" on mobile to floating action button ( #6594 )  
						
						... 
						
						
						
						* Move "compose" on mobile to floating action button
* Fix contrast on floating action button 
						
						
					 
					
						2018-03-02 07:12:40 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							036dd98abb 
							
						 
					 
					
						
						
							
							Responsively enforce 16:9 ratio on all media thumbnails in web UI ( #6590 )  
						
						... 
						
						
						
						* Responsively enforce 16:9 ratio on all media thumbnails in web UI
Also change video player behaviour to "contain" rather than
"cover" videos that don't fit the ratio, unlike images and GIFs,
it's expected that a video is shown fully.
* Fix spacing issues and remove floor
* Remove floor 
						
						
					 
					
						2018-03-02 07:00:04 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7901f9f63e 
							
						 
					 
					
						
						
							
							When search enabled, display hint in search popout ( #6593 )  
						
						... 
						
						
						
						* When advanced search is enabled, show different hint in search popout
* Change "getting started" icon in tabs bar from asterisk to hamburger 
						
						
					 
					
						2018-03-02 06:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							0963b6fd22 
							
						 
					 
					
						
						
							
							Weblate translations (2018-03-02) ( #6588 )  
						
						... 
						
						
						
						* Translated using Weblate (Galician)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/hu/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (559 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 61.1% (342 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ 
* Translated using Weblate (Portuguese)
Currently translated at 96.4% (54 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 99.8% (558 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 79.0% (49 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 52.9% (296 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 61.1% (342 of 559 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (57 of 57 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (561 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 60.5% (342 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Polish)
Currently translated at 99.1% (560 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 62.4% (353 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (561 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Catalan)
Currently translated at 99.1% (560 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Finnish)
Currently translated at 99.6% (263 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Slovak)
Currently translated at 62.6% (354 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (French)
Currently translated at 99.1% (560 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Japanese)
Currently translated at 93.1% (54 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Polish)
Currently translated at 99.2% (561 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (564 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 72.5% (45 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ 
* Translated using Weblate (Finnish)
Currently translated at 99.6% (263 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 99.8% (564 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 62.8% (355 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 99.6% (263 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ 
* Translated using Weblate (Arabic)
Currently translated at 96.0% (72 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 93.5% (58 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 98.2% (57 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (German)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (Catalan)
Currently translated at 99.8% (564 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (German)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ 
* Translated using Weblate (French)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 63.7% (360 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 64.9% (367 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 98.6% (74 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ 
* Translated using Weblate (Catalan)
Currently translated at 99.8% (564 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Slovak)
Currently translated at 69.5% (393 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (561 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Arabic)
Currently translated at 88.7% (55 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 92.0% (69 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 70.6% (399 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Slovak)
Currently translated at 74.1% (419 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 67.6% (382 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (French)
Currently translated at 99.4% (562 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Portuguese)
Currently translated at 95.3% (539 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Slovak)
Currently translated at 75.3% (426 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Croatian)
Currently translated at 58.0% (36 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hr/ 
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ 
* Translated using Weblate (Esperanto)
Currently translated at 58.6% (34 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Occitan)
Currently translated at 96.8% (547 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Slovak)
Currently translated at 76.2% (431 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (French)
Currently translated at 99.6% (263 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Arabic)
Currently translated at 93.5% (58 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 77.8% (440 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (565 of 565 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (264 of 264 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/  
						
						
					 
					
						2018-03-02 04:36:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							379cdfaac5 
							
						 
					 
					
						
						
							
							Fix   #6586 : Add close modal icon to report dialog ( #6591 )  
						
						
						
						
					 
					
						2018-03-02 04:36:00 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							38b9af76a2 
							
						 
					 
					
						
						
							
							Improve style of web UI account tabs ( #6589 )  
						
						
						
						
					 
					
						2018-03-02 04:35:49 +01:00 
						 
				 
			
				
					
						
							
							
								mayaeh 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d741ece3 
							
						 
					 
					
						
						
							
							i18n: Update Japanese translations ( #6581 )  
						
						... 
						
						
						
						* yarn manage:translations
* Update Japanese translations. 
						
						
					 
					
						2018-03-02 07:48:17 +09:00 
						 
				 
			
				
					
						
							
							
								Marcin Mikołajczak 
							
						 
					 
					
						
						
						
						
							
						
						
							51b7a22ea7 
							
						 
					 
					
						
						
							
							i18n: Update Polish translation ( #6578 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
						
						
					 
					
						2018-03-01 18:26:51 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5131012505 
							
						 
					 
					
						
						
							
							Add "Toots/Toots with replies/Media" tab below profile header ( #6572 )  
						
						... 
						
						
						
						* Add "Toots/Toots with replies/Media" tab below profile header
* Add focal point display to account gallery timeline
* Fix visual glitch of standalone GIFV 
						
						
					 
					
						2018-03-01 02:48:44 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							473a69ab18 
							
						 
					 
					
						
						
							
							Fix margin on top action button, fix width of counters on frontpage ( #6573 )  
						
						
						
						
					 
					
						2018-03-01 02:48:08 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							41a01bec23 
							
						 
					 
					
						
						
							
							Federated reports ( #6570 )  
						
						... 
						
						
						
						* Fix  #2176 : Federated reports
* UI for federated reports
* Add spec for ActivityPub Flag handler
* Add spec for ReportService 
						
						
					 
					
						2018-02-28 06:54:55 +01:00 
						 
				 
			
				
					
						
							
							
								Lynx Kotoura 
							
						 
					 
					
						
						
						
						
							
						
						
							7150f2e9d3 
							
						 
					 
					
						
						
							
							Grid layout for tag pages ( #6545 )  
						
						... 
						
						
						
						* Use grid layout for the landing page
* Use grid layout for tag pages
* Set 2 columns width as explicit percentage for tag pages 
						
						
					 
					
						2018-02-26 17:43:45 +01:00 
						 
				 
			
				
					
						
							
							
								Lynx Kotoura 
							
						 
					 
					
						
						
						
						
							
						
						
							a40167cf4d 
							
						 
					 
					
						
						
							
							Better grid layout for the landing page ( #6543 )  
						
						... 
						
						
						
						* Use grid layout for the landing page
* Fix column settings
Set the ratio explicitly
* Improve information board 
						
						
					 
					
						2018-02-26 16:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							18513a978a 
							
						 
					 
					
						
						
							
							Improve public account cards ( #6559 )  
						
						... 
						
						
						
						- Add follow/unfollow/remote follow buttons
- Format the bio properly
- Always show username@domain, even for local accounts 
						
						
					 
					
						2018-02-26 16:18:41 +01:00 
						 
				 
			
				
					
						
							
							
								Ian McCowan 
							
						 
					 
					
						
						
						
						
							
						
						
							c33931b613 
							
						 
					 
					
						
						
							
							Fix prev/next links on public profile page ( #6497 )  
						
						... 
						
						
						
						* Fix prev/next links on public profile page
* Don't make pagination urls if no available statuses
* Fix empty check method
* Put left chevron before prev page link
* Add scope for pagination "starting at" a given id
* Status pagination try 2:
s/prev/older and s/next/newer
"older" on left, "newer" on right
Use new scope for "newer" link
Extract magic 20 page size to constant
Remove max_id from feed pagination as it's not respected
* Reinstate max_id for accounts atom stream
* normalize 
						
						
					 
					
						2018-02-26 03:31:28 +01:00 
						 
				 
			
				
					
						
							
							
								yuzulabo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							43cc79aaa0 
							
						 
					 
					
						
						
							
							Fix border-radius of owner avatar in /about/more  
						
						
						
						
					 
					
						2018-02-25 23:27:32 +09:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							7cb49eaa3a 
							
						 
					 
					
						
						
							
							Do not use function name to track components ( #6542 )  
						
						... 
						
						
						
						UglifyJS2 is allowed to mangle function names, and function names can also
be duplicate if they are from different scopes. Therefore function names
are not reliable as identifiers.
Functions as keys for Map object is a cheaper and more reliable
alternative. 
						
						
					 
					
						2018-02-24 19:10:57 +01:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f2f19e1f8a 
							
						 
					 
					
						
						
							
							Update SCSS  
						
						
						
						
					 
					
						2018-02-24 03:22:58 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7bff3243ae 
							
						 
					 
					
						
						
							
							Update columns.scss  
						
						
						
						
					 
					
						2018-02-24 01:45:15 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ef1d46948a 
							
						 
					 
					
						
						
							
							Update containers.scss  
						
						
						
						
					 
					
						2018-02-24 01:26:48 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							82408904a1 
							
						 
					 
					
						
						
							
							Update index.scss  
						
						
						
						
					 
					
						2018-02-24 01:25:49 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fa3641df7f 
							
						 
					 
					
						
						
							
							Update about.scss  
						
						
						
						
					 
					
						2018-02-24 00:22:05 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							697f289597 
							
						 
					 
					
						
						
							
							Use absolute URL for focus reticle  
						
						
						
						
					 
					
						2018-02-23 23:50:25 +09:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bb6988a7ac 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tootsuite/mastodon  
						
						... 
						
						
						
						# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb 
						
						
					 
					
						2018-02-23 23:28:31 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c71aa468b5 
							
						 
					 
					
						
						
							
							Redesign landing page (again) ( #6486 )  
						
						... 
						
						
						
						* Redesign landing page (again)
* Move login form in small version to the right column
* Display closed registrations message
* Add site setting for the hero image
* Fix test
* Increase spacing, maximum width, change call to action section 
						
						
					 
					
						2018-02-22 01:03:48 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							90f12f2e5a 
							
						 
					 
					
						
						
							
							Focal points ( #6520 )  
						
						... 
						
						
						
						* Add focus param to media API, center thumbnails on focus point
* Add UI for setting a focal point
* Improve focal point icon on upload item
* Use focal point in upload preview
* Add focalPoint property to ActivityPub
* Don't show focal point button for non-image attachments 
						
						
					 
					
						2018-02-22 00:35:46 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							61ed133fea 
							
						 
					 
					
						
						
							
							Account archive download ( #6460 )  
						
						... 
						
						
						
						* Fix  #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
  somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
  (Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
  (Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
  (Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
  GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue 
						
						
					 
					
						2018-02-21 23:21:32 +01:00 
						 
				 
			
				
					
						
							
							
								りんすき 
							
						 
					 
					
						
						
						
						
							
						
						
							c1e77b56a9 
							
						 
					 
					
						
						
							
							fix   #6523  ( #6524 )  
						
						
						
						
					 
					
						2018-02-21 19:33:23 +01:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							1445ba1703 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-02-19 15:17:14 +00:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cbb69d41f6 
							
						 
					 
					
						
						
							
							Fix media spoiler design ( #6507 )  
						
						... 
						
						
						
						- 4px rounded corners on media attachments
- Better colors/contrast for CW/media spoiler on public pages
- Fix vertical alignment of "Show more" button
- Fix layout jump when unhiding standalone media 
						
						
					 
					
						2018-02-19 02:39:18 +01:00 
						 
				 
			
				
					
						
							
							
								HellPie 
							
						 
					 
					
						
						
						
						
							
						
						
							bc6751ecce 
							
						 
					 
					
						
						
							
							Remove outline from body window ( Fixes   #6501 ) ( #6502 )  
						
						
						
						
					 
					
						2018-02-18 16:32:58 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cba2897108 
							
						 
					 
					
						
						
							
							Cache relationships in API ( #6482 )  
						
						... 
						
						
						
						* Cache relationships in API
* Fetch relationships for search results in UI
* Only save one account's maps in each cache item 
						
						
					 
					
						2018-02-18 03:14:46 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d033a4687 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into merge-upstream  
						
						... 
						
						
						
						Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml 
						
						
					 
					
						2018-02-17 00:02:37 -06:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9dbae6e8a1 
							
						 
					 
					
						
						
							
							Save video metadata and improve video OpenGraph tags ( #6481 )  
						
						... 
						
						
						
						* Save metadata from video attachments, put correct dimensions into OG tags
* Add twitter:player for videos
* Fix code style and test 
						
						
					 
					
						2018-02-16 07:22:20 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							478ca39e5e 
							
						 
					 
					
						
						
							
							After click to embed video, autoplay it ( #6480 )  
						
						
						
						
					 
					
						2018-02-15 23:05:12 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f7765acf9d 
							
						 
					 
					
						
						
							
							Fix   #5173 : Click card to embed external content ( #6471 )  
						
						
						
						
					 
					
						2018-02-15 07:04:28 +01:00 
						 
				 
			
				
					
						
							
							
								abcang 
							
						 
					 
					
						
						
						
						
							
						
						
							ecdac9017e 
							
						 
					 
					
						
						
							
							Fix media button type ( #6478 )  
						
						
						
						
					 
					
						2018-02-15 04:40:42 +01:00 
						 
				 
			
				
					
						
							
							
								Marcin Mikołajczak 
							
						 
					 
					
						
						
						
						
							
						
						
							ba8ec4eed6 
							
						 
					 
					
						
						
							
							i18n: Update Polish translation ( #6470 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
						
						
					 
					
						2018-02-14 07:55:45 +09:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							efc9ffcb80 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-02-11 04:10:16 +00:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b6159bcb0a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/merge-upstream'  
						
						
						
						
					 
					
						2018-02-10 22:08:45 -06:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6f131fa1 
							
						 
					 
					
						
						
							
							Revert 245816ab2721f386184878d71be01143d207abf5 ( fixes   #348 )  
						
						... 
						
						
						
						Since 245816ab2721f386184878d71be01143d207abf5, IntersectionObserverArticle
assumes that its children do not change unless the number of children changes.
This is not the case with the notification overlay, which resulted in the
checkmark of notification cleaning mode not updating unless scrolling to make
notifications appear/disappear.
This change may negatively impact performances. 
						
						
					 
					
						2018-02-10 20:59:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3ebc0ad4d3 
							
						 
					 
					
						
						
							
							Full-text search for authorized statuses ( #6423 )  
						
						... 
						
						
						
						* Add full-text search for authorized statuses
- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index
Fix  #5880 
Fix  #4293 
Fix  #1152 
* Add commented out docker-compose configuration for ES container
* Optimize index import, filter search results
* Add basic normalization to the index
* Add better stemming and normalization to the index
* Skip webfinger request if search query includes both @ and a space
* Fix code style
* Visually separate search result sections
* Fix code style issues 
						
						
					 
					
						2018-02-09 23:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							020b40efdb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge-upstream  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml 
						
						
					 
					
						2018-02-09 09:25:53 -06:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ef9d0e101 
							
						 
					 
					
						
						
							
							Change web UI "posts" to "toots" on profile for consistency ( #6447 )  
						
						
						
						
					 
					
						2018-02-09 00:27:18 +01:00