5f9b85a0cf 
								
							 
						 
						
							
							
								
								Add fade and margin to collapsed statuses  
							
							
							
						 
						
							2018-04-22 11:34:19 -04:00  
				
					
						
							
							
								 
						
							
								3c5006ec7f 
								
							 
						 
						
							
							
								
								Fix text colors ( #7227 )  
							
							
							
						 
						
							2018-04-22 14:29:40 +02:00  
				
					
						
							
							
								 
						
							
								597948fb13 
								
							 
						 
						
							
							
								
								Do not set emoji as inline-block ( fixes   #5743 ) ( #7207 )  
							
							
							
						 
						
							2018-04-22 12:10:37 +02:00  
				
					
						
							
							
								 
						
							
								a4a36d994b 
								
							 
						 
						
							
							
								
								Separate high contrast theme ( #7213 )  
							
							
							
						 
						
							2018-04-21 21:35:55 +02:00  
				
					
						
							
							
								 
						
							
								1a27f9f46f 
								
							 
						 
						
							
							
								
								one grammar fix ( #7212 )  
							
							
							
						 
						
							2018-04-22 03:07:25 +09:00  
				
					
						
							
							
								 
						
							
								84214b864c 
								
							 
						 
						
							
							
								
								Ignore keyevents during text composition ( #7205 )  
							
							... 
							
							
							
							KeyboardEvent.key may be physical key name (Escape, Tab, etc.)
even in text composition and it causes hotkeys or suggestion selection.
So we need to check e.which or e.isComposing.
Checking e.which also allows us to avoid Esc key on compositionend in Safari. 
							
						 
						
							2018-04-20 18:36:52 +02:00  
				
					
						
							
							
								 
						
							
								23106844a1 
								
							 
						 
						
							
							
								
								Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. ( #7202 )  
							
							... 
							
							
							
							* Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.
* Fix typo
* Add custom attribute prefix 
							
						 
						
							2018-04-20 18:14:21 +02:00  
				
					
						
							
							
								 
						
							
								e4dff10934 
								
							 
						 
						
							
							
								
								Fix video player on toot public views  
							
							
							
						 
						
							2018-04-20 16:08:46 +02:00  
				
					
						
							
							
								 
						
							
								7a68079b3f 
								
							 
						 
						
							
							
								
								[Glitch] Show media modal on public pages  
							
							... 
							
							
							
							Port ff7941e652 
							
						 
						
							2018-04-20 15:58:36 +02:00  
				
					
						
							
							
								 
						
							
								ee2e0f694a 
								
							 
						 
						
							
							
								
								Fix   #6157 : boosting own private toots ( #7200 )  
							
							... 
							
							
							
							* Fix boosting own private toots.
* Run yarn manage:translations and update Japanese translations. 
							
						 
						
							2018-04-20 14:58:33 +02:00  
				
					
						
							
							
								 
						
							
								4e35ce8269 
								
							 
						 
						
							
							
								
								Fix Esc hotkey behavior ( #7199 )  
							
							... 
							
							
							
							This fixes following cases which causes hotkey action accidentally:
* hitting Esc key to cancel text composition (mostly in CJK)
  Although events on cancelling composition are still heavily
  browser / input method dependent, but this implementation would
  covers current UI Events spec and some exceptions.
* hitting Esc key to close autocomplete suggestions
This PR changes to use keydown event instead of keyup event as well as other hotkeys. 
							
						 
						
							2018-04-20 14:04:16 +02:00  
				
					
						
							
							
								 
						
							
								a9c440637c 
								
							 
						 
						
							
							
								
								Improve report layout ( #7188 )  
							
							... 
							
							
							
							* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue 
							
						 
						
							2018-04-20 02:28:48 +02:00  
				
					
						
							
							
								 
						
							
								ed17e173d6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-19 22:17:23 +00:00  
				
					
						
							
							
								 
						
							
								ca2cbe8f0f 
								
							 
						 
						
							
							
								
								Fix webkit scrollbars ( #7191 )  
							
							... 
							
							
							
							* Revert "Make scroll bars wider (#7060 )"
This reverts commit 11715454d0 
							
						 
						
							2018-04-19 23:35:47 +02:00  
				
					
						
							
							
								 
						
							
								13fa8ec2c7 
								
							 
						 
						
							
							
								
								[Glitch] Fix status filtering in contexts reducer  
							
							... 
							
							
							
							Port 1a37d7e252 
							
						 
						
							2018-04-19 16:43:02 +02:00  
				
					
						
							
							
								 
						
							
								f84b4d90cb 
								
							 
						 
						
							
							
								
								[Glitch] Do not filter the status collection after muting and blocking  
							
							... 
							
							
							
							Port fd87e5a53b 
							
						 
						
							2018-04-19 16:42:27 +02:00  
				
					
						
							
							
								 
						
							
								694337d9bb 
								
							 
						 
						
							
							
								
								Fix auto-collapsed toots making the TL jump ( fixes   #417 )  
							
							
							
						 
						
							2018-04-19 11:30:42 +02:00  
				
					
						
							
							
								 
						
							
								931a4d1ebf 
								
							 
						 
						
							
							
								
								Clean up dead code  
							
							
							
						 
						
							2018-04-19 11:30:42 +02:00  
				
					
						
							
							
								 
						
							
								8f8b71a278 
								
							 
						 
						
							
							
								
								Use React's new lifecycles for scrollable lists  
							
							
							
						 
						
							2018-04-19 11:29:37 +02:00  
				
					
						
							
							
								 
						
							
								3068384dbc 
								
							 
						 
						
							
							
								
								Glitchsoc-specific changes to allow boosting own private toots  
							
							
							
						 
						
							2018-04-19 11:24:29 +02:00  
				
					
						
							
							
								 
						
							
								779aa707ec 
								
							 
						 
						
							
							
								
								Only compute height dynamically for standalone media  
							
							... 
							
							
							
							This prevents changing the status' height and triggering jumps in the TL 
							
						 
						
							2018-04-19 11:16:18 +02:00  
				
					
						
							
							
								 
						
							
								52229405ed 
								
							 
						 
						
							
							
								
								[Glitch] Make detailed status' media gallery standalone  
							
							
							
						 
						
							2018-04-19 11:16:18 +02:00  
				
					
						
							
							
								 
						
							
								dcc1c10937 
								
							 
						 
						
							
							
								
								[Glitch] Center thumbnails on focus point  
							
							... 
							
							
							
							Port the display part of the following commits to glitch-soc:
* 90f12f2e5ab170627ceb11697d689456eb5c3f34 
							
						 
						
							2018-04-19 11:16:18 +02:00  
				
					
						
							
							
								 
						
							
								f1e25b672a 
								
							 
						 
						
							
							
								
								Use javascript to set MediaGallery height automatically  
							
							
							
						 
						
							2018-04-19 11:16:18 +02:00  
				
					
						
							
							
								 
						
							
								a95f8271be 
								
							 
						 
						
							
							
								
								Revert some glitch-specific refactoring  
							
							... 
							
							
							
							In order to keep my sanity when porting changes between glitch-soc and upstream. 
							
						 
						
							2018-04-19 11:16:18 +02:00  
				
					
						
							
							
								 
						
							
								1822ce89f9 
								
							 
						 
						
							
							
								
								[Glitch] retrieve custom emoji list via API instead of before page load  
							
							... 
							
							
							
							Port b08ab329f4 
							
						 
						
							2018-04-19 11:12:52 +02:00  
				
					
						
							
							
								 
						
							
								d55ab8e3e8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-19 01:17:38 +00:00  
				
					
						
							
							
								 
						
							
								ba917e15f6 
								
							 
						 
						
							
							
								
								Fix text color in "show more" link inside boost confirmation modal ( #7183 )  
							
							
							
						 
						
							2018-04-19 02:36:31 +02:00  
				
					
						
							
							
								 
						
							
								d2b28ea51d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'glitchsoc/master' into gs-master  
							
							
							
						 
						
							2018-04-18 19:31:53 -05:00  
				
					
						
							
							
								 
						
							
								16d5217502 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json 
							
						 
						
							2018-04-18 18:48:12 -05:00  
				
					
						
							
							
								 
						
							
								1957209efd 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7181 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-19 00:14:21 +09:00  
				
					
						
							
							
								 
						
							
								74dae9458d 
								
							 
						 
						
							
							
								
								Add color variables of texts for better accesibility ( #7125 )  
							
							... 
							
							
							
							* Add variables for text colors
* Change variables in sass files
* Apply text color variables for recently added colors
* Fix text colors of emoji mart anchors
* Fix text colors of search__input
* Fix text colors of text area of compose-form
* Fix icon colors of privacy dropdown and modal
* Inverted icon colors by classname
* Change variables in boost.scss
* Change action-button-color
* Fix text colors of pre-header 
							
						 
						
							2018-04-18 16:52:15 +02:00  
				
					
						
							
							
								 
						
							
								0ba49eca8b 
								
							 
						 
						
							
							
								
								Fix comparing id ( #7180 )  
							
							
							
						 
						
							2018-04-18 16:50:19 +02:00  
				
					
						
							
							
								 
						
							
								7162a28c34 
								
							 
						 
						
							
							
								
								Add revealing/hiding statuses button to keyboard shortcuts legend column ( #7178 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-18 13:15:57 +02:00  
				
					
						
							
							
								 
						
							
								156b916caf 
								
							 
						 
						
							
							
								
								Direct messages column ( #4514 )  
							
							... 
							
							
							
							* Added a timeline for Direct statuses
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
* Changes to match other timelines in 2.0 
							
						 
						
							2018-04-18 13:09:06 +02:00  
				
					
						
							
							
								 
						
							
								aedfea3554 
								
							 
						 
						
							
							
								
								zh-HK translation ( #7177 )  
							
							... 
							
							
							
							* zh-HK translation
* zh-HK fix
* zh-HK translation
* add missing zh-HK translate
* fix translate
* i18n-tasks normalize 
							
						 
						
							2018-04-18 14:28:26 +09:00  
				
					
						
							
							
								 
						
							
								fad7b9f5f2 
								
							 
						 
						
							
							
								
								Adds keyboard hotkey for revealing/hiding statuses ( #7173 )  
							
							... 
							
							
							
							Resolves  #5550  
						
							2018-04-18 03:33:59 +02:00  
				
					
						
							
							
								 
						
							
								e5dd385431 
								
							 
						 
						
							
							
								
								Allow boosting own private toots ( #6157 )  
							
							... 
							
							
							
							* Adjust policy to allow boosting own private toots
* Add ability to reblog private toots from dropdown menu 
							
						 
						
							2018-04-17 23:35:45 +02:00  
				
					
						
							
							
								 
						
							
								11715454d0 
								
							 
						 
						
							
							
								
								Make scroll bars wider ( #7060 )  
							
							... 
							
							
							
							* Set scrollbars to 12 px wide rather than 8px
Should overwrite the setting in reset.scss. This is untested at this point.
* removes scrollbar height and width specifications from reset.scss and basics.scss 
							
						 
						
							2018-04-17 23:25:54 +02:00  
				
					
						
							
							
								 
						
							
								897199910f 
								
							 
						 
						
							
							
								
								Improve web api protect ( #6343 )  
							
							
							
						 
						
							2018-04-17 15:23:46 +02:00  
				
					
						
							
							
								 
						
							
								727917e91e 
								
							 
						 
						
							
							
								
								Fix caret position after inserting emoji ( #7167 )  
							
							
							
						 
						
							2018-04-17 13:50:33 +02:00  
				
					
						
							
							
								 
						
							
								21837b291e 
								
							 
						 
						
							
							
								
								Merge pull request  #430  from ThibG/glitch-soc/features/bookmarks  
							
							... 
							
							
							
							Fix the bookmark column pinning fix… 
							
						 
						
							2018-04-17 11:46:31 +02:00  
				
					
						
							
							
								 
						
							
								1aac83ef47 
								
							 
						 
						
							
							
								
								Fix the bookmark column pinning fix…  
							
							
							
						 
						
							2018-04-17 11:24:07 +02:00  
				
					
						
							
							
								 
						
							
								3c722fe687 
								
							 
						 
						
							
							
								
								Update French javascript locale file ( #7165 )  
							
							... 
							
							
							
							Match config/locales/fr.yml: "private" was changed to "followers-only"
by 501514960a 
							
						 
						
							2018-04-17 11:37:51 +09:00  
				
					
						
							
							
								 
						
							
								84d0aa7b26 
								
							 
						 
						
							
							
								
								Merge pull request  #429  from ThibG/glitch-soc/features/bookmarks  
							
							... 
							
							
							
							Fix pinning the bookmarks column (fixes  #428 ) 
							
						 
						
							2018-04-16 23:24:51 +02:00  
				
					
						
							
							
								 
						
							
								54f5170f59 
								
							 
						 
						
							
							
								
								Fix pinning the bookmarks column ( fixes   #428 )  
							
							
							
						 
						
							2018-04-16 22:52:45 +02:00  
				
					
						
							
							
								 
						
							
								f879672554 
								
							 
						 
						
							
							
								
								Merge pull request  #424  from ThibG/glitch-soc/features/video-player-improvements  
							
							... 
							
							
							
							Backport a few MediaGallery/Video changes from upstream (fixes  #423 ) 
							
						 
						
							2018-04-16 14:41:36 -05:00  
				
					
						
							
							
								 
						
							
								7e0aed398f 
								
							 
						 
						
							
							
								
								Fix scrolling behavior ( #7151 )  
							
							... 
							
							
							
							* Update React.JS
* Use React's new lifecycles for scrollable lists
* Clean up dead code
* Make CodeClimate happy 
							
						 
						
							2018-04-16 21:04:24 +02:00  
				
					
						
							
							
								 
						
							
								1a37d7e252 
								
							 
						 
						
							
							
								
								Fix status filtering in contexts reducer ( #7149 )  
							
							
							
						 
						
							2018-04-16 11:34:34 +02:00  
				
					
						
							
							
								 
						
							
								7c43ed04fe 
								
							 
						 
						
							
							
								
								Weblate translations (2018-04-15) ( #7141 )  
							
							... 
							
							
							
							* Translated using Weblate (Galician)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Arabic)
Currently translated at 76.4% (449 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 92.3% (542 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 92.3% (542 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 (Polish)
Currently translated at 98.9% (581 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (French)
Currently translated at 99.6% (585 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (French)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ 
* Translated using Weblate (Arabic)
Currently translated at 76.6% (450 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Slovak)
Currently translated at 92.6% (544 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 82.9% (487 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 (Slovak)
Currently translated at 93.6% (550 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 95.4% (560 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Korean)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Arabic)
Currently translated at 82.9% (487 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 99.2% (278 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 87.3% (513 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 99.6% (279 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/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 (Finnish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ 
* Translated using Weblate (Arabic)
Currently translated at 88.0% (517 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Spanish)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Slovak)
Currently translated at 95.4% (560 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* 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 (Finnish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ 
* 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 (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 (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 25.8% (152 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ 
* Translated using Weblate (Finnish)
Currently translated at 25.8% (152 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Finnish)
Currently translated at 33.0% (194 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Finnish)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ 
* Translated using Weblate (Slovak)
Currently translated at 95.5% (561 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* yarn manage:translations 
							
						 
						
							2018-04-15 16:56:03 +02:00  
				
					
						
							
							
								 
						
							
								9f5ae7c2e8 
								
							 
						 
						
							
							
								
								Add and revise Traditional Chinese (zh-TW) translation for serveral strings ( #7002 )  
							
							... 
							
							
							
							* Translation: add and revise Traditional Chinese translation for serveral strings
* Translation: polish zh-TW locale
* Translation: polish zh-TW locale 
							
						 
						
							2018-04-15 14:00:32 +02:00  
				
					
						
							
							
								 
						
							
								fa04945365 
								
							 
						 
						
							
							
								
								Change icon for domain blocks ( #7139 )  
							
							... 
							
							
							
							* Change icon for domain blocks
Both domain blocks and user blocks uses the same icon…
* Update index.js 
							
						 
						
							2018-04-15 13:58:47 +02:00  
				
					
						
							
							
								 
						
							
								fed0b5ed04 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7131 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-15 14:12:41 +09:00  
				
					
						
							
							
								 
						
							
								5cc7c4b920 
								
							 
						 
						
							
							
								
								Fix extended video player (gifv) modal size  
							
							... 
							
							
							
							It was currently full-size 
							
						 
						
							2018-04-14 21:47:56 +02:00  
				
					
						
							
							
								 
						
							
								5d96c5ac41 
								
							 
						 
						
							
							
								
								[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI  
							
							... 
							
							
							
							Port the video-player part of 036dd98abbfixes  #423  
							
						 
						
							2018-04-14 17:35:45 +02:00  
				
					
						
							
							
								 
						
							
								813da6788e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	db/schema.rb 
							
						 
						
							2018-04-14 09:12:50 -05:00  
				
					
						
							
							
								 
						
							
								78ed4ab75f 
								
							 
						 
						
							
							
								
								Add bio fields ( #6645 )  
							
							... 
							
							
							
							* Add bio fields
- Fix  #3211 
- Fix  #232 
- Fix  #121 
* Display bio fields in web UI
* Fix output of links and missing fields
* Federate bio fields over ActivityPub as PropertyValue
* Improve how the fields are stored, add to Edit profile form
* Add rel=me to links in fields
Fix  #121  
							
						 
						
							2018-04-14 12:41:08 +02:00  
				
					
						
							
							
								 
						
							
								c5dd4ed1d5 
								
							 
						 
						
							
							
								
								[Glitch] Fix media button type  
							
							... 
							
							
							
							Port ecdac9017e 
							
						 
						
							2018-04-14 12:30:55 +02:00  
				
					
						
							
							
								 
						
							
								dfe8abb8cd 
								
							 
						 
						
							
							
								
								[Glitch] Handle preference to always display sensitive media  
							
							... 
							
							
							
							Port the UI part of 76f3d5d16b 
							
						 
						
							2018-04-14 12:27:14 +02:00  
				
					
						
							
							
								 
						
							
								e3d0d72b29 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-14 09:17:23 +00:00  
				
					
						
							
							
								 
						
							
								dd4ad6300b 
								
							 
						 
						
							
							
								
								Add missing Japanese translation  
							
							
							
						 
						
							2018-04-14 07:53:56 +09:00  
				
					
						
							
							
								 
						
							
								b7804028c2 
								
							 
						 
						
							
							
								
								Merge pull request  #419  from ThibG/glitch-soc/features/bookmarks  
							
							... 
							
							
							
							Bookmarks 
							
						 
						
							2018-04-13 16:38:15 -05:00  
				
					
						
							
							
								 
						
							
								85ab30abf7 
								
							 
						 
						
							
							
								
								i18n: Add Japanese translations for privacy policy and more ( #7049 )  
							
							... 
							
							
							
							* Update Japanese translations.
* Update Japanese translations.
* Update Japanese translations.
* Update Japanese translations.
* Add Japanese translations for #6984 , #7040 , #7072 .
Update Japanese translations for privacy policy.
* Add Japanese translations for #7032 , #7074 , #7089 .
* Proofreading Japanese translations for privacy policy. 
							
						 
						
							2018-04-13 20:11:26 +09:00  
				
					
						
							
							
								 
						
							
								9e45b051cf 
								
							 
						 
						
							
							
								
								When notification type filtered, ignore live updates for it ( #7101 )  
							
							... 
							
							
							
							Fix  #5625  
						
							2018-04-13 01:20:04 +02:00  
				
					
						
							
							
								 
						
							
								a817f084ea 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master'  
							
							... 
							
							
							
							Conflicts:
 	app/controllers/statuses_controller.rb 
							
						 
						
							2018-04-12 03:30:57 -05:00  
				
					
						
							
							
								 
						
							
								eb72c3398c 
								
							 
						 
						
							
							
								
								Merge pull request  #418  from ThibG/glitch-soc/fixes/composer-dropdowns  
							
							... 
							
							
							
							Place composer dropdown menus top if they are closer to the bottom of the viewport 
							
						 
						
							2018-04-12 03:28:22 -05:00  
				
					
						
							
							
								 
						
							
								0b326950bf 
								
							 
						 
						
							
							
								
								Merge pull request  #416  from ThibG/glitch-soc/features/media-modal  
							
							... 
							
							
							
							Port various media modal improvements to glitch-soc 
							
						 
						
							2018-04-12 00:20:19 -05:00  
				
					
						
							
							
								 
						
							
								acb434b0c9 
								
							 
						 
						
							
							
								
								Add glitch-soc front-end support for bookmarks  
							
							... 
							
							
							
							Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it. 
							
						 
						
							2018-04-11 21:05:34 +02:00  
				
					
						
							
							
								 
						
							
								12f5f13fab 
								
							 
						 
						
							
							
								
								Place privacy dropdown menu top if it is closer to the bottom of the viewport ( #7106 )  
							
							
							
						 
						
							2018-04-11 20:42:50 +02:00  
				
					
						
							
							
								 
						
							
								043a699990 
								
							 
						 
						
							
							
								
								Update glitch-soc style to match changes to reports UI  
							
							... 
							
							
							
							Port style changes from d9b62e34da 
							
						 
						
							2018-04-11 19:15:42 +02:00  
				
					
						
							
							
								 
						
							
								519119f657 
								
							 
						 
						
							
							
								
								Paginate ancestor statuses in public page ( #7102 )  
							
							... 
							
							
							
							This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them. 
							
						 
						
							2018-04-11 12:35:09 +02:00  
				
					
						
							
							
								 
						
							
								33c2bbdda7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-11 00:50:09 +00:00  
				
					
						
							
							
								 
						
							
								e74e5c7eb9 
								
							 
						 
						
							
							
								
								Place composer dropdown menus top if they are closer to the bottom of the viewport  
							
							
							
						 
						
							2018-04-10 20:52:31 +02:00  
				
					
						
							
							
								 
						
							
								d9b62e34da 
								
							 
						 
						
							
							
								
								Feature: Improve reports ui ( #7032 )  
							
							... 
							
							
							
							* Further improvements to Reports UI
- Clean up notes display
- Clean up add new note form
- Simplify controller
- Allow reopening a report with a note
- Show created at date for reports
- Fix report details table formatting
* Show history of report using Admin::ActionLog beneath the report
* Fix incorrect log message when reopening a report
* Implement fetching of all ActionLog items that could be related to the report
* Ensure adding a report_note updates the report's updated_at
* Limit Report History to actions that happened between the report being created and the report being resolved
* Fix linting issues
* Improve report history builder
Thanks @gargron for the improvements 
							
						 
						
							2018-04-10 20:27:59 +02:00  
				
					
						
							
							
								 
						
							
								45c9f16f71 
								
							 
						 
						
							
							
								
								Improve load gap styling in web UI ( #7100 )  
							
							
							
						 
						
							2018-04-10 17:12:10 +02:00  
				
					
						
							
							
								 
						
							
								904a2479dd 
								
							 
						 
						
							
							
								
								Feature: Direct message from Statuses ( #7089 )  
							
							... 
							
							
							
							* Fix: Switching between composing direct message and mention from menus
Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.
* Fix: Add missing proptype check for onMention in Status component
* Add the ability to send a direct message to a user from the menu on Statuses
* Add space between "Embed" and "Mention" on expanded statuses menu 
							
						 
						
							2018-04-09 17:09:11 +02:00  
				
					
						
							
							
								 
						
							
								07d90b0414 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7085 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-09 17:28:53 +09:00  
				
					
						
							
							
								 
						
							
								67e77f230e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/serializers/initial_state_serializer.rb
The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047 ).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load. 
							
						 
						
							2018-04-08 19:05:02 -05:00  
				
					
						
							
							
								 
						
							
								9073687f66 
								
							 
						 
						
							
							
								
								[Glitch] Fix video player height  
							
							... 
							
							
							
							Port 31e7b73084 
							
						 
						
							2018-04-09 01:08:51 +02:00  
				
					
						
							
							
								 
						
							
								101e6564fd 
								
							 
						 
						
							
							
								
								[Glitch] Refactor scss  
							
							... 
							
							
							
							Port f691afaae9 
							
						 
						
							2018-04-09 01:08:50 +02:00  
				
					
						
							
							
								 
						
							
								0fb5ea5d15 
								
							 
						 
						
							
							
								
								Fix video modal  
							
							
							
						 
						
							2018-04-09 00:11:10 +02:00  
				
					
						
							
							
								 
						
							
								a4fa8c9064 
								
							 
						 
						
							
							
								
								[Glitch] Avoid using JS to set height in MediaModal  
							
							... 
							
							
							
							Port fa5c867e0e 
							
						 
						
							2018-04-08 23:18:24 +02:00  
				
					
						
							
							
								 
						
							
								87071d9e81 
								
							 
						 
						
							
							
								
								[Glitch] Improved media modal  
							
							... 
							
							
							
							Port 4e929b2d17 
							
						 
						
							2018-04-08 23:15:25 +02:00  
				
					
						
							
							
								 
						
							
								0b86ec4e7f 
								
							 
						 
						
							
							
								
								[Glitch] Allow to open a modal for embedded photo  
							
							... 
							
							
							
							Port bf7757cbbc 
							
						 
						
							2018-04-08 23:06:33 +02:00  
				
					
						
							
							
								 
						
							
								0893b16695 
								
							 
						 
						
							
							
								
								Hide search from Compose on mobile devices ( #7077 )  
							
							... 
							
							
							
							* Hide search from Compose on mobile devices
We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile.
* Don't "showSearch" on mobile if we're not currently searching (isSearchPage) 
							
						 
						
							2018-04-08 18:25:08 +02:00  
				
					
						
							
							
								 
						
							
								c9cbb8de70 
								
							 
						 
						
							
							
								
								Add search item to tab bar for mobile devices ( #7072 )  
							
							... 
							
							
							
							* Add search item to tab bar for mobile devices
* Fix missing prop validation 
							
						 
						
							2018-04-08 14:26:58 +02:00  
				
					
						
							
							
								 
						
							
								1ed1014546 
								
							 
						 
						
							
							
								
								Free stroage if it is exceeding disk quota ( #7061 )  
							
							
							
						 
						
							2018-04-08 13:32:39 +02:00  
				
					
						
							
							
								 
						
							
								a896f601fa 
								
							 
						 
						
							
							
								
								Fix video playback in glitch-soc detailed statuses  
							
							
							
						 
						
							2018-04-08 12:22:12 +02:00  
				
					
						
							
							
								 
						
							
								4a9becfca2 
								
							 
						 
						
							
							
								
								i18n: improve "Welcome" translation in Portuguese ( #7068 )  
							
							... 
							
							
							
							* i18n: update gender-neutral language for pt and pt-BR
Instead of using "bem-vindo(a)" (a masculine form of "Welcome"
with a "(a)" in the end to mean "bem-vinda" for the feminine form),
use "boas-vindas", which is a gender-neutral form of "Welcome").
There is already precedent for using "boas-vindas" in the
Brazilian Portuguese localization, in `config/locales/pt-BR.yml`.
European Portuguese dictionary Priberam also registers it as a valid form:
https://www.priberam.pt/dlpo/boas-vindas 
* i18n: pt-BR minor orthography fix
The form "a bordo" does not take an accent.
http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo  
							
						 
						
							2018-04-07 21:36:03 +02:00  
				
					
						
							
							
								 
						
							
								98146281e1 
								
							 
						 
						
							
							
								
								Remove duplicate frequently used emojis ( #7064 )  
							
							
							
						 
						
							2018-04-07 14:53:11 +02:00  
				
					
						
							
							
								 
						
							
								b08ab329f4 
								
							 
						 
						
							
							
								
								retrieve custom emoji list via API instead of before page load ( #7047 )  
							
							
							
						 
						
							2018-04-04 22:25:34 +02:00  
				
					
						
							
							
								 
						
							
								f1867a7388 
								
							 
						 
						
							
							
								
								Adjust privacy policy ( #6666 )  
							
							... 
							
							
							
							* Adjust privacy policy to be more specific to Mastodon
Fix  #6613 
* Change data retention of IP addresses from 5 years to 1 year
* Add even more information
* Remove all (now invalid) translations of the privacy policy
* Add information about archive takeout, remove pointless consent section
* Emphasis on DM privacy
* Improve wording
* Add line about data use for moderation purposes 
							
						 
						
							2018-04-04 21:47:39 +02:00  
				
					
						
							
							
								 
						
							
								3ab6a8b8be 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	spec/views/about/show.html.haml_spec.rb 
							
						 
						
							2018-04-04 13:56:58 -05:00  
				
					
						
							
							
								 
						
							
								bda1782cd8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-04-04 13:55:42 -05:00  
				
					
						
							
							
								 
						
							
								77b650b69c 
								
							 
						 
						
							
							
								
								Merge pull request  #412  from ThibG/glitch-soc/cleanup  
							
							... 
							
							
							
							Remove duplicate message entries (minor code cleanup) 
							
						 
						
							2018-04-04 11:36:54 -04:00  
				
					
						
							
							
								 
						
							
								d0e792e231 
								
							 
						 
						
							
							
								
								Update accounts SCSS for public pages  
							
							
							
						 
						
							2018-04-04 15:40:59 +02:00  
				
					
						
							
							
								 
						
							
								75f2e9fd97 
								
							 
						 
						
							
							
								
								Remove duplicate message entries  
							
							
							
						 
						
							2018-04-04 12:19:00 +02:00  
				
					
						
							
							
								 
						
							
								7a81082704 
								
							 
						 
						
							
							
								
								Revert "Add double-tap zoom functionary to `ZoomableImage` ( #6944 )" ( #7035 )  
							
							... 
							
							
							
							Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944  until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon.
This reverts commit 5021c4e9ca 
							
						 
						
							2018-04-04 11:58:15 +02:00  
				
					
						
							
							
								 
						
							
								07176fed37 
								
							 
						 
						
							
							
								
								Add contact account to landing page ("Administered by") ( #6984 )  
							
							
							
						 
						
							2018-04-04 01:11:26 +02:00  
				
					
						
							
							
								 
						
							
								6611100480 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-03 19:17:20 +00:00