beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								d53630b9ed 
								
							 
						 
						
							
							
								
								Merge pull request  #434  from ThibG/glitch-soc/fixes/public-inline-video  
							
							... 
							
							
							
							Fix video player on toot public views 
							
						 
						
							2018-04-22 12:09:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								2273eb43e7 
								
							 
						 
						
							
							
								
								Merge pull request  #433  from ThibG/glitch-soc/fixes/status-filtering  
							
							... 
							
							
							
							Status filtering fixes from upstream 
							
						 
						
							2018-04-22 12:08:12 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								1b58c44557 
								
							 
						 
						
							
							
								
								Merge pull request  #435  from ThibG/glitch-soc/features/public-modals  
							
							... 
							
							
							
							[Glitch] Show media modal on public pages 
							
						 
						
							2018-04-22 12:07:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Una Thompson 
								
							 
						 
						
							
							
							
							
								
							
							
								880db71121 
								
							 
						 
						
							
							
								
								Add fade and margin to collapsed statuses  
							
							
							
						 
						
							2018-04-22 11:34:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								e0c3d950d1 
								
							 
						 
						
							
							
								
								Fix text colors ( #7227 )  
							
							
							
						 
						
							2018-04-22 14:29:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f57fc4ca51 
								
							 
						 
						
							
							
								
								Do not set emoji as inline-block ( fixes   #5743 ) ( #7207 )  
							
							
							
						 
						
							2018-04-22 12:10:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								670b5bcc6a 
								
							 
						 
						
							
							
								
								Separate high contrast theme ( #7213 )  
							
							
							
						 
						
							2018-04-21 21:35:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									goofy-bz 
								
							 
						 
						
							
							
							
							
								
							
							
								86c2ceb21f 
								
							 
						 
						
							
							
								
								one grammar fix ( #7212 )  
							
							
							
						 
						
							2018-04-22 03:07:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								456fff2bba 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									TakesxiSximada 
								
							 
						 
						
							
							
							
							
								
							
							
								937c93e8d9 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e4b0a92c0f 
								
							 
						 
						
							
							
								
								Fix video player on toot public views  
							
							
							
						 
						
							2018-04-20 16:08:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d6693f3ae3 
								
							 
						 
						
							
							
								
								[Glitch] Show media modal on public pages  
							
							... 
							
							
							
							Port 47d2277ef1 
							
						 
						
							2018-04-20 15:58:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								1b881b585d 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								42d7307565 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								354a6e4026 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								c9265e97cc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-19 22:17:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								172ce95cd4 
								
							 
						 
						
							
							
								
								Fix webkit scrollbars ( #7191 )  
							
							... 
							
							
							
							* Revert "Make scroll bars wider (#7060 )"
This reverts commit c0ad48c683 
							
						 
						
							2018-04-19 23:35:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f15ee5fdb9 
								
							 
						 
						
							
							
								
								[Glitch] Fix status filtering in contexts reducer  
							
							... 
							
							
							
							Port 899cca061b 
							
						 
						
							2018-04-19 16:43:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f7ec78e220 
								
							 
						 
						
							
							
								
								[Glitch] Do not filter the status collection after muting and blocking  
							
							... 
							
							
							
							Port ce0d30feb7 
							
						 
						
							2018-04-19 16:42:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								74bfb1e579 
								
							 
						 
						
							
							
								
								Fix auto-collapsed toots making the TL jump ( fixes   #417 )  
							
							
							
						 
						
							2018-04-19 11:30:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f63da992fc 
								
							 
						 
						
							
							
								
								Clean up dead code  
							
							
							
						 
						
							2018-04-19 11:30:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								fe20ada59a 
								
							 
						 
						
							
							
								
								Use React's new lifecycles for scrollable lists  
							
							
							
						 
						
							2018-04-19 11:29:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f83dc9507f 
								
							 
						 
						
							
							
								
								Glitchsoc-specific changes to allow boosting own private toots  
							
							
							
						 
						
							2018-04-19 11:24:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9b72f23fdd 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								46b36c44ce 
								
							 
						 
						
							
							
								
								[Glitch] Make detailed status' media gallery standalone  
							
							
							
						 
						
							2018-04-19 11:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e0bffe8856 
								
							 
						 
						
							
							
								
								[Glitch] Center thumbnails on focus point  
							
							... 
							
							
							
							Port the display part of the following commits to glitch-soc:
* 865c7e717862d18a3f9b15ec9431bec1d44284ca 
							
						 
						
							2018-04-19 11:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c4209e12f6 
								
							 
						 
						
							
							
								
								Use javascript to set MediaGallery height automatically  
							
							
							
						 
						
							2018-04-19 11:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b283f463c9 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5cd64fd6c6 
								
							 
						 
						
							
							
								
								[Glitch] retrieve custom emoji list via API instead of before page load  
							
							... 
							
							
							
							Port f3db0d6ecc 
							
						 
						
							2018-04-19 11:12:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								a359d69b09 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-19 01:17:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b5d0bf338c 
								
							 
						 
						
							
							
								
								Fix text color in "show more" link inside boost confirmation modal ( #7183 )  
							
							
							
						 
						
							2018-04-19 02:36:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								337662fa0c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'glitchsoc/master' into gs-master  
							
							
							
						 
						
							2018-04-18 19:31:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								bae5435010 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								7bca0f1cda 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7181 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-19 00:14:21 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								e5ad96390e 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								9dff61a5ba 
								
							 
						 
						
							
							
								
								Fix comparing id ( #7180 )  
							
							
							
						 
						
							2018-04-18 16:50:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								8564d2767f 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaito Sinclaire 
								
							 
						 
						
							
							
							
							
								
							
							
								447741e456 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									luzi82 
								
							 
						 
						
							
							
							
							
								
							
							
								9b80aede7a 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Neil Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								e0853e52d8 
								
							 
						 
						
							
							
								
								Adds keyboard hotkey for revealing/hiding statuses ( #7173 )  
							
							... 
							
							
							
							Resolves  #5550  
						
							2018-04-18 03:33:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8cd19d3eec 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sam Schlinkert 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ad48c683 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								5384e1e913 
								
							 
						 
						
							
							
								
								Improve web api protect ( #6343 )  
							
							
							
						 
						
							2018-04-17 15:23:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								e6138441b7 
								
							 
						 
						
							
							
								
								Fix caret position after inserting emoji ( #7167 )  
							
							
							
						 
						
							2018-04-17 13:50:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ccb708e614 
								
							 
						 
						
							
							
								
								Merge pull request  #430  from ThibG/glitch-soc/features/bookmarks  
							
							... 
							
							
							
							Fix the bookmark column pinning fix… 
							
						 
						
							2018-04-17 11:46:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								42e4225e03 
								
							 
						 
						
							
							
								
								Fix the bookmark column pinning fix…  
							
							
							
						 
						
							2018-04-17 11:24:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Remi Rampin 
								
							 
						 
						
							
							
							
							
								
							
							
								ced4d99f46 
								
							 
						 
						
							
							
								
								Update French javascript locale file ( #7165 )  
							
							... 
							
							
							
							Match config/locales/fr.yml: "private" was changed to "followers-only"
by f89e26bdd5 
							
						 
						
							2018-04-17 11:37:51 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								83e2740b44 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2b30d057b6 
								
							 
						 
						
							
							
								
								Fix pinning the bookmarks column ( fixes   #428 )  
							
							
							
						 
						
							2018-04-16 22:52:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								e502d066ef 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ec135f2603 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								899cca061b 
								
							 
						 
						
							
							
								
								Fix status filtering in contexts reducer ( #7149 )  
							
							
							
						 
						
							2018-04-16 11:34:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								da5142618f 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									YMHuang 
								
							 
						 
						
							
							
							
							
								
							
							
								a2f21215b0 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								3774cbce91 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								1921384e08 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7131 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-15 14:12:41 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								aac3d4b481 
								
							 
						 
						
							
							
								
								Fix extended video player (gifv) modal size  
							
							... 
							
							
							
							It was currently full-size 
							
						 
						
							2018-04-14 21:47:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9a3fd77c72 
								
							 
						 
						
							
							
								
								[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI  
							
							... 
							
							
							
							Port the video-player part of 8c85fd26bbfixes  #423  
							
						 
						
							2018-04-14 17:35:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								9697c6d9f0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	db/schema.rb 
							
						 
						
							2018-04-14 09:12:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								466442b764 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6153d6a6dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix media button type  
							
							... 
							
							
							
							Port 6cb5d71e5f 
							
						 
						
							2018-04-14 12:30:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4b1909612a 
								
							 
						 
						
							
							
								
								[Glitch] Handle preference to always display sensitive media  
							
							... 
							
							
							
							Port the UI part of 219b28e172 
							
						 
						
							2018-04-14 12:27:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								a1894cbc13 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-14 09:17:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								fe3a9f5ea4 
								
							 
						 
						
							
							
								
								Add missing Japanese translation  
							
							
							
						 
						
							2018-04-14 07:53:56 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								605016368d 
								
							 
						 
						
							
							
								
								Merge pull request  #419  from ThibG/glitch-soc/features/bookmarks  
							
							... 
							
							
							
							Bookmarks 
							
						 
						
							2018-04-13 16:38:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								a35aeefe0a 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4923646361 
								
							 
						 
						
							
							
								
								When notification type filtered, ignore live updates for it ( #7101 )  
							
							... 
							
							
							
							Fix  #5625  
						
							2018-04-13 01:20:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								ac1ac20ee9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master'  
							
							... 
							
							
							
							Conflicts:
 	app/controllers/statuses_controller.rb 
							
						 
						
							2018-04-12 03:30:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								f42e335e19 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								ef678ae350 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8b3d03067b 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								47cb9587b7 
								
							 
						 
						
							
							
								
								Place privacy dropdown menu top if it is closer to the bottom of the viewport ( #7106 )  
							
							
							
						 
						
							2018-04-11 20:42:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9b6e579c76 
								
							 
						 
						
							
							
								
								Update glitch-soc style to match changes to reports UI  
							
							... 
							
							
							
							Port style changes from 5a166a19a7 
							
						 
						
							2018-04-11 19:15:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								6c2344d4dd 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								e4e0aa5d21 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-11 00:50:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d1bfe4cdad 
								
							 
						 
						
							
							
								
								Place composer dropdown menus top if they are closer to the bottom of the viewport  
							
							
							
						 
						
							2018-04-10 20:52:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								5a166a19a7 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								93a1afb66c 
								
							 
						 
						
							
							
								
								Improve load gap styling in web UI ( #7100 )  
							
							
							
						 
						
							2018-04-10 17:12:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								7a06bd7085 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								33671bcc50 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #7085 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-09 17:28:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								337fc136fd 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d8dea31e0c 
								
							 
						 
						
							
							
								
								[Glitch] Fix video player height  
							
							... 
							
							
							
							Port 5eea3f9877 
							
						 
						
							2018-04-09 01:08:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b7080a6e 
								
							 
						 
						
							
							
								
								[Glitch] Refactor scss  
							
							... 
							
							
							
							Port 480131a376 
							
						 
						
							2018-04-09 01:08:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								27ad9247a3 
								
							 
						 
						
							
							
								
								Fix video modal  
							
							
							
						 
						
							2018-04-09 00:11:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9a5a49f17c 
								
							 
						 
						
							
							
								
								[Glitch] Avoid using JS to set height in MediaModal  
							
							... 
							
							
							
							Port 010c71f19c 
							
						 
						
							2018-04-08 23:18:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								89f5ae00a5 
								
							 
						 
						
							
							
								
								[Glitch] Improved media modal  
							
							... 
							
							
							
							Port d6e88e29e2 
							
						 
						
							2018-04-08 23:15:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a5a305feb5 
								
							 
						 
						
							
							
								
								[Glitch] Allow to open a modal for embedded photo  
							
							... 
							
							
							
							Port 16a49799cf 
							
						 
						
							2018-04-08 23:06:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								f48902e6e6 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								0e5e60a84b 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								fb8768a469 
								
							 
						 
						
							
							
								
								Free stroage if it is exceeding disk quota ( #7061 )  
							
							
							
						 
						
							2018-04-08 13:32:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4785a250 
								
							 
						 
						
							
							
								
								Fix video playback in glitch-soc detailed statuses  
							
							
							
						 
						
							2018-04-08 12:22:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hisham Muhammad 
								
							 
						 
						
							
							
							
							
								
							
							
								835a974a2a 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Harmon 
								
							 
						 
						
							
							
							
							
								
							
							
								f7c306596f 
								
							 
						 
						
							
							
								
								Remove duplicate frequently used emojis ( #7064 )  
							
							
							
						 
						
							2018-04-07 14:53:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Isatis 
								
							 
						 
						
							
							
							
							
								
							
							
								f3db0d6ecc 
								
							 
						 
						
							
							
								
								retrieve custom emoji list via API instead of before page load ( #7047 )  
							
							
							
						 
						
							2018-04-04 22:25:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e54b79a777 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								a60a600a10 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								19001dd3dd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-04-04 13:55:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								f5dfd3fae5 
								
							 
						 
						
							
							
								
								Merge pull request  #412  from ThibG/glitch-soc/cleanup  
							
							... 
							
							
							
							Remove duplicate message entries (minor code cleanup) 
							
						 
						
							2018-04-04 11:36:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e57ed1cb27 
								
							 
						 
						
							
							
								
								Update accounts SCSS for public pages  
							
							
							
						 
						
							2018-04-04 15:40:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7518a4b9d7 
								
							 
						 
						
							
							
								
								Remove duplicate message entries  
							
							
							
						 
						
							2018-04-04 12:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								07ffc4fa11 
								
							 
						 
						
							
							
								
								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 7551951094 
							
						 
						
							2018-04-04 11:58:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7f1e924fa9 
								
							 
						 
						
							
							
								
								Add contact account to landing page ("Administered by") ( #6984 )  
							
							
							
						 
						
							2018-04-04 01:11:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								62ce70f28c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-03 19:17:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								b505eec7e5 
								
							 
						 
						
							
							
								
								i18n: Add Japanese translations for  #7000  ( #7022 )  
							
							... 
							
							
							
							* run yarn manage:translations.
* run i18n-tasks add-missing ja.
* Update Japanese translations. 
							
						 
						
							2018-04-03 18:21:33 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e4a53496 
								
							 
						 
						
							
							
								
								[Glitch] Fix: Prevent submission using same logic as submit button disabling.  
							
							... 
							
							
							
							Port 7d791f494b 
							
						 
						
							2018-04-02 20:04:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								d88504ec84 
								
							 
						 
						
							
							
								
								Add missing rejection handling for Promises ( #7008 )  
							
							... 
							
							
							
							* Add eslint-plugin-promise to detect uncaught rejections
* Move alert generation for errors to actions/alert
* Add missing rejection handling for Promises
* Use catch() instead of onReject on then()
Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though. 
							
						 
						
							2018-04-02 14:51:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								4be5383b91 
								
							 
						 
						
							
							
								
								Fix issues with sending direct messages from user profile ( #6999 )  
							
							... 
							
							
							
							* Clear compose textarea when starting a new direct message
Previous behaviour resulted in potentially misdirected direct messages.
* Hide search when starting to compose a direct message 
							
						 
						
							2018-04-02 13:44:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								21fa7b6520 
								
							 
						 
						
							
							
								
								Weblate translations (2018-04-02) ( #7007 )  
							
							... 
							
							
							
							* 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/ 
* bundle exec i18n-tasks normalize && yarn manage:translations
* revert 
							
						 
						
							2018-04-02 13:43:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evgeny Petrov 
								
							 
						 
						
							
							
							
							
								
							
							
								2964c7a7b8 
								
							 
						 
						
							
							
								
								Russian language updated ( #7005 )  
							
							... 
							
							
							
							* Russian language updated
* Small fixes for RU language
* bundle exec i18n-tasks normalize 
							
						 
						
							2018-04-02 19:49:06 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									luzi82 
								
							 
						 
						
							
							
							
							
								
							
							
								89d3bc36a3 
								
							 
						 
						
							
							
								
								i18n: update zh-HK translation ( #7004 )  
							
							... 
							
							
							
							* i18n: update zh-HK translation
* i18n: update zh-HK translation
* i18n-tasks normalize 
							
						 
						
							2018-04-02 19:11:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								21394c5462 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml 
							
						 
						
							2018-04-01 20:24:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								7d791f494b 
								
							 
						 
						
							
							
								
								Fix: Prevent submission using same logic as submit button disabling. ( #6993 )  
							
							... 
							
							
							
							This prevents submission through ctrl/cmd+enter when the submit button is disabled. 
							
						 
						
							2018-04-01 22:19:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								9458e263d5 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6985 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-01 10:31:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								e0046b2c13 
								
							 
						 
						
							
							
								
								i18n: Add Japanese translations for domain blocks ( #6979 )  
							
							... 
							
							
							
							* run yarn manage:translations
* Update Japanese translations for domain blocks. 
							
						 
						
							2018-03-31 21:09:39 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								11fb748041 
								
							 
						 
						
							
							
								
								Ignore AbortError when cancelled sharing ( #6978 )  
							
							... 
							
							
							
							`navigator.share()` rejects Promise if user cancelled sharing, and it may
print it as an error on JavaScript console.
This patch ignores it and prints other errors on the console. 
							
						 
						
							2018-03-31 13:16:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								658440838b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-30 19:17:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								766a008931 
								
							 
						 
						
							
							
								
								Merge pull request  #380  from ThibG/glitch-soc/features/domain-block-ui  
							
							... 
							
							
							
							Port #6628  to glitch-soc flavour 
							
						 
						
							2018-03-30 14:50:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								769c536db4 
								
							 
						 
						
							
							
								
								[Glitch] Remove pointer events on the entire UI when a dropdown menu is open  
							
							... 
							
							
							
							Port 95fce1bca0 
							
						 
						
							2018-03-30 12:45:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								aa4a16c94f 
								
							 
						 
						
							
							
								
								Add some UI for user-defined domain blocks ( #6628 )  
							
							... 
							
							
							
							* Keep list of blocked domains
Might be overkill, but I'm trying to follow the same logic as for blocked users
* Add basic domain block UI
* Add the domain blocks UI to Getting Started
* Fix undefined URL in `fetchDomainBlocks`
* Update all known users' domain_blocking relationship instead of just one's 
							
						 
						
							2018-03-30 12:38:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								caa6611877 
								
							 
						 
						
							
							
								
								[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport  
							
							... 
							
							
							
							Port 27b532cc98 
							
						 
						
							2018-03-30 12:31:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								957d5c36c7 
								
							 
						 
						
							
							
								
								Add the domain blocks UI to Getting Started Misc  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d2b9747a50 
								
							 
						 
						
							
							
								
								Add basic domain block UI  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								38feef43ad 
								
							 
						 
						
							
							
								
								Keep list of blocked domains  
							
							... 
							
							
							
							Might be overkill, but I'm trying to follow the same logic as for blocked users 
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e47593cac8 
								
							 
						 
						
							
							
								
								Update all known users' domain_blocking relationship instead of just one's  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								876cc5c02b 
								
							 
						 
						
							
							
								
								Fix undefined URL in fetchDomainBlocks  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								43ab4a3985 
								
							 
						 
						
							
							
								
								update ja locale ( #6965 )  
							
							... 
							
							
							
							related https://github.com/tootsuite/mastodon/pull/6956  
							
						 
						
							2018-03-30 10:04:04 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								df62fc20bf 
								
							 
						 
						
							
							
								
								Feature: Direct message from menu ( #6956 )  
							
							... 
							
							
							
							* Implement ability to send direct messages from the user menu
* Implement message warning users that direct messages are visible to all mentioned users
* Update locales 
							
						 
						
							2018-03-29 19:08:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								32ede640af 
								
							 
						 
						
							
							
								
								[Glitch] Display unfollow button even if account moved  
							
							... 
							
							
							
							Backport 1a90ef9c25 
							
						 
						
							2018-03-29 14:59:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f63450c7ec 
								
							 
						 
						
							
							
								
								[Glitch] Profile redirect notes  
							
							... 
							
							
							
							Port WebUI changes from b89f614bd7 
							
						 
						
							2018-03-29 14:59:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								2974df3c2f 
								
							 
						 
						
							
							
								
								Fix ReferenceError when Cache API is missing ( #6953 )  
							
							... 
							
							
							
							Cache API is not supported on Safari 11.0 / iOS 11.
Since those caching is optional, this patch simply ignores it. 
							
						 
						
							2018-03-29 14:57:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								5a9c8aeb42 
								
							 
						 
						
							
							
								
								Fix TypeError on follow notification ( #6950 )  
							
							... 
							
							
							
							`notification.status` may not be present, e.g. follow notification. 
							
						 
						
							2018-03-29 12:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								299cfa4bc7 
								
							 
						 
						
							
							
								
								Merge pull request  #402  from ThibG/glitch-soc/fixes/accept-empty-toot-contents  
							
							... 
							
							
							
							Render toots with empty contents 
							
						 
						
							2018-03-28 16:39:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								166fe6e6dd 
								
							 
						 
						
							
							
								
								Fix attachment lists  
							
							
							
						 
						
							2018-03-28 22:19:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4975cee02f 
								
							 
						 
						
							
							
								
								Render toots with empty contents  
							
							... 
							
							
							
							This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon. 
							
						 
						
							2018-03-28 21:13:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								7551951094 
								
							 
						 
						
							
							
								
								Add double-tap zoom functionary to ZoomableImage ( #6944 )  
							
							... 
							
							
							
							add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs' 
							
						 
						
							2018-03-28 20:40:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								2567d0a704 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2018-03-27 10:44:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								7cdf2b05b6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb 
							
						 
						
							2018-03-27 10:26:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								2111defbbf 
								
							 
						 
						
							
							
								
								Fix LoadMore on account media gallery ( #6933 )  
							
							... 
							
							
							
							max_id in the fetch request should be a status id, but media attachment id was used. 
							
						 
						
							2018-03-27 16:53:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8fc7f85356 
								
							 
						 
						
							
							
								
								[Glitch] Display AttachmentList in notifications  
							
							... 
							
							
							
							Port 2cb19bf443 
							
						 
						
							2018-03-27 16:09:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9454cfc0ad 
								
							 
						 
						
							
							
								
								[Glitch] Display AttachmentList in timelines in compact style when media missing  
							
							... 
							
							
							
							Port 5079c1e322 
							
						 
						
							2018-03-27 16:09:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								cfd1fe74c9 
								
							 
						 
						
							
							
								
								Clone response before put it to the cache ( #6932 )  
							
							... 
							
							
							
							`Response.prototype.clone()` must be called before the response used.
This fixes an error from ServiceWorker and failing to load image when the
image is not cached. 
							
						 
						
							2018-03-27 15:18:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								9487e8a4c0 
								
							 
						 
						
							
							
								
								Add missing null handling in notification reducer ( #6930 )  
							
							... 
							
							
							
							This patch adds null item (i.e. gap) handling on below functions to avoid TypeError.
* `filterNotifications` called on user mute/block
* `deleteByStatus` called on status deletion 
							
						 
						
							2018-03-27 13:05:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								e829c21cc6 
								
							 
						 
						
							
							
								
								Cache media ( #6902 )  
							
							
							
						 
						
							2018-03-27 12:32:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								5eea3f9877 
								
							 
						 
						
							
							
								
								fix   #6846  ( #6914 )  
							
							
							
						 
						
							2018-03-27 12:30:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Burgess 
								
							 
						 
						
							
							
							
							
								
							
							
								f9e88856e3 
								
							 
						 
						
							
							
								
								feat(ShowMore): Add classname to show more/show less button ( #6904 )  
							
							
							
						 
						
							2018-03-26 13:59:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								480131a376 
								
							 
						 
						
							
							
								
								Refactor scss ( #6913 )  
							
							... 
							
							
							
							* Refactoring scss
introduce scss variables for the media modal
fix css block structure corresponding to react components
fix flex layouts
remove background image of the loaded image on the media modal
* Fix typo 
							
						 
						
							2018-03-26 13:59:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								351203118c 
								
							 
						 
						
							
							
								
								Fix moved account handling in IndexedDB feature ( #6915 )  
							
							... 
							
							
							
							* Fix stack overflow on importFetchedAccounts
  When the account has moved property, it should process destination
  account instead of source account itself.
* Set account id instead of account object for moved property
  This restores "foo has moved to" indication on account view, and
  fixes `reblog` index on `accounts` object store. 
							
						 
						
							2018-03-26 12:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								ae55717f50 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-25 15:17:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								29dfe740f6 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6903 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-03-25 23:33:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9eaa47845c 
								
							 
						 
						
							
							
								
								Allow clients to fetch notifications made while they were offline ( #6886 )  
							
							
							
						 
						
							2018-03-24 22:07:23 +01:00