Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1b33b18f98 
								
							 
						 
						
							
							
								
								Refactor resizeImage method ( #7236 )  
							
							... 
							
							
							
							- Use URL.createObjectURL (replace from FileReader)
- Use HTMLCanvasElement.prototype.toBlob
  (replace from HTMLCanvasElement.prototype.toDataURL)
- Use Promise (replace callback interface) 
							
						 
						
							2018-04-23 09:15:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								07e5dcb65f 
								
							 
						 
						
							
							
								
								Improve relative timestamps in web UI ( #7233 )  
							
							... 
							
							
							
							Use short instead of numeric month, display year when different year
E.g.: "Apr 4" instead of "4/4", "Apr 4, 2017" if different year 
							
						 
						
							2018-04-23 00:43:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2bcfaa8d83 
								
							 
						 
						
							
							
								
								Resize images before upload in web UI to reduce bandwidth ( #7223 )  
							
							... 
							
							
							
							* Resize images before upload in web UI to reduce bandwidth
Fix  #7218 
* Fix issues
* Do not resize GIFs in JS 
							
						 
						
							2018-04-23 00:43:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bc3be9ac5b 
								
							 
						 
						
							
							
								
								[Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.  
							
							... 
							
							
							
							Port 23106844a1 
							
						 
						
							2018-04-22 23:11:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7315d4f3e7 
								
							 
						 
						
							
							
								
								[Glitch] Do not set emoji as inline-block  
							
							... 
							
							
							
							Port 597948fb13 
							
						 
						
							2018-04-22 22:10:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								599aa39aca 
								
							 
						 
						
							
							
								
								Remove "nsfw" category for sensitive statuses in OStatus serializer ( #7048 )  
							
							... 
							
							
							
							Fix  #7011  
						
							2018-04-22 22:09:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								deb6517638 
								
							 
						 
						
							
							
								
								[Glitch] Do not overwrite some status attributes in reducer  
							
							... 
							
							
							
							Backport 59b769ff06 
							
						 
						
							2018-04-22 19:19:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4e4a5fc1ad 
								
							 
						 
						
							
							
								
								Add show more/less toggle for entire threads in web UI  
							
							... 
							
							
							
							Inspired from b9b01bf14a 
							
						 
						
							2018-04-22 19:19:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5ab80ffadd 
								
							 
						 
						
							
							
								
								Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic  
							
							
							
						 
						
							2018-04-22 19:18:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								270d5e9b72 
								
							 
						 
						
							
							
								
								[Glitch] Fix style of legacy column headers  
							
							... 
							
							
							
							Backports 6661ae14b0 
							
						 
						
							2018-04-22 19:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a51aa91caf 
								
							 
						 
						
							
							
								
								[Glitch] Fix button hiding when header title is too long  
							
							... 
							
							
							
							Port 95da1b3351 
							
						 
						
							2018-04-22 19:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8c190e6235 
								
							 
						 
						
							
							
								
								[Glitch] Fix column headers accessibility  
							
							... 
							
							
							
							Port c6d5ea86954cf5144099 
							
						 
						
							2018-04-22 19:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								64f74da493 
								
							 
						 
						
							
							
								
								Merge pull request  #432  from ThibG/glitch-soc/features/reblog-private  
							
							... 
							
							
							
							Glitchsoc-specific changes to allow boosting own private toots 
							
						 
						
							2018-04-22 12:32:58 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								4f6a459984 
								
							 
						 
						
							
							
								
								Merge pull request  #421  from ThibG/glitch-soc/features/custom-emoji-api  
							
							... 
							
							
							
							[Glitch] retrieve custom emoji list via API instead of before page load 
							
						 
						
							2018-04-22 12:10:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								69710cf17b 
								
							 
						 
						
							
							
								
								Merge pull request  #427  from ThibG/glitch-soc/fixes/scroll-behavior  
							
							... 
							
							
							
							Improve ScrollableList behavior 
							
						 
						
							2018-04-22 12:09:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								dd13a0461b 
								
							 
						 
						
							
							
								
								Merge pull request  #436  from unascribed/glitchsoc-pr-better-collapsed-statuses  
							
							... 
							
							
							
							Add fade and margin to collapsed statuses 
							
						 
						
							2018-04-22 12:06:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Una Thompson 
								
							 
						 
						
							
							
							
							
								
							
							
								880db71121 
								
							 
						 
						
							
							
								
								Add fade and margin to collapsed statuses  
							
							
							
						 
						
							2018-04-22 11:34:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad5e05e4a 
								
							 
						 
						
							
							
								
								Rescue Mastodon::LengthValidationError in Remoteable ( #7228 )  
							
							... 
							
							
							
							Fix  #7198  by allowing records with optional attachments to save 
						
							2018-04-22 15:42:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									jumoru 
								
							 
						 
						
							
							
							
							
								
							
							
								915ec9c988 
								
							 
						 
						
							
							
								
								Fix: Use "exportierten" instead of "exportieren" in translation ( #7186 )  
							
							... 
							
							
							
							Spotted when looking at https://metalhead.club/@thomas/99881521526619858  
							
						 
						
							2018-04-22 14:46:19 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Baucum 
								
							 
						 
						
							
							
							
							
								
							
							
								259e3aa7bf 
								
							 
						 
						
							
							
								
								Ability to specify Redis passwd on mastodon:setup ( #7222 )  
							
							... 
							
							
							
							Closes  #7221  
						
							2018-04-22 11:49:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								32b71c8a25 
								
							 
						 
						
							
							
								
								Fix randomly fail (similar  #7219 ) ( #7225 )  
							
							
							
						 
						
							2018-04-22 11:41:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias Beyer 
								
							 
						 
						
							
							
							
							
								
							
							
								b56a55352a 
								
							 
						 
						
							
							
								
								Fix: Use "welches" instead of "dass" in translation ( #7185 )  
							
							
							
						 
						
							2018-04-22 12:28:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								3637c4983b 
								
							 
						 
						
							
							
								
								Reset locale on registration tests ( #7219 )  
							
							
							
						 
						
							2018-04-21 23:37:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								308be04040 
								
							 
						 
						
							
							
								
								Replace badge to CircleCI ( #7216 )  
							
							
							
						 
						
							2018-04-21 21:56:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								c461895933 
								
							 
						 
						
							
							
								
								Add parallel test processors ( #7215 )  
							
							
							
						 
						
							2018-04-21 21:36:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								670b5bcc6a 
								
							 
						 
						
							
							
								
								Separate high contrast theme ( #7213 )  
							
							
							
						 
						
							2018-04-21 21:35:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7da649efb4 
								
							 
						 
						
							
							
								
								Use raw status code on have_http_status ( #7214 )  
							
							
							
						 
						
							2018-04-21 21:35:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								85c3f7eb1b 
								
							 
						 
						
							
							
								
								Force convert to JPG for preview card thumbnails to avoid animations ( #7109 )  
							
							... 
							
							
							
							* Force convert to JPG for preview card thumbnails to avoid animations
Fix  #7093 
* Conditionally convert to JPG only if original is GIF
Coalesce and strip on all formats to ensure no animated APNGs 
							
						 
						
							2018-04-21 21:34:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									goofy-bz 
								
							 
						 
						
							
							
							
							
								
							
							
								86c2ceb21f 
								
							 
						 
						
							
							
								
								one grammar fix ( #7212 )  
							
							
							
						 
						
							2018-04-22 03:07:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								0d4342e146 
								
							 
						 
						
							
							
								
								Introduce rspec-retry ( #7206 )  
							
							
							
						 
						
							2018-04-20 19:31:30 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								0939d9ede6 
								
							 
						 
						
							
							
								
								Fix spec for sr-Latn ( #7203 )  
							
							
							
						 
						
							2018-04-20 18:14:31 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								efa4eb4d13 
								
							 
						 
						
							
							
								
								Replace Travis to CircleCI ( #7196 )  
							
							
							
						 
						
							2018-04-20 13:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								3aee1034e5 
								
							 
						 
						
							
							
								
								Add extract_foreign_key_action to Mastodon::MigrationHelpers ( #7195 )  
							
							
							
						 
						
							2018-04-20 12:21:28 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7a8c526709 
								
							 
						 
						
							
							
								
								Replace preload link tag to Rails helper ( #7192 )  
							
							
							
						 
						
							2018-04-20 02:06:53 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								589974dd9f 
								
							 
						 
						
							
							
								
								Merge pull request  #426  from ThibG/glitch-soc/features/display-focal-points  
							
							... 
							
							
							
							Honor focal points when displaying media 
							
						 
						
							2018-04-19 10:03:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f15ee5fdb9 
								
							 
						 
						
							
							
								
								[Glitch] Fix status filtering in contexts reducer  
							
							... 
							
							
							
							Port 899cca061b 
							
						 
						
							2018-04-19 16:43:02 +02:00