Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								14b5505c68 
								
							 
						 
						
							
							
								
								Fix the Open handler for PreviewCard ( #15305 )  
							
							 
							
							
							
						 
						
							2020-12-08 12:07:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								58a3eaccba 
								
							 
						 
						
							
							
								
								Fix column swiping animation logic ( #15301 )  
							
							 
							
							... 
							
							
							
							From the start, swiping columns was highly unreliable because the logic
could change `ReactSwipeableViews`'s `animateTransitions` property
mid-swipe.
PR #11200  partially fixed this, but at the unintended cost of disabling the
swipe animation altogether.
This PR changes the logic behind `shouldAnimate` to only disable the swiping
animation at the end of a column change not initiated by `ReactSwipeableViews`.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-07 20:07:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7e7f69dfed 
								
							 
						 
						
							
							
								
								Fix unnecessary re-rendering of various components when typing in web UI ( #15286 )  
							
							 
							
							
							
						 
						
							2020-12-07 19:36:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								48534762cf 
								
							 
						 
						
							
							
								
								Fix slow distinct queries where grouped queries are faster ( #15287 )  
							
							 
							
							... 
							
							
							
							About 2x speed-up on inboxes query 
							
						 
						
							2020-12-07 12:08:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								de8c539b7b 
								
							 
						 
						
							
							
								
								Fix not being able to open audio modal in web UI ( #15283 )  
							
							 
							
							... 
							
							
							
							Fix  #15280 
Also adds the new action bar and blurhash-based background
color to audio and video modals 
							
						 
						
							2020-12-07 04:29:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								905032d903 
								
							 
						 
						
							
							
								
								Fix alert when failing to save timeline markers in web UI ( #15285 )  
							
							 
							
							... 
							
							
							
							Fix  #15267  
							
						 
						
							2020-12-07 03:23:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9d12bbf0e2 
								
							 
						 
						
							
							
								
								Fix too low contrast on new media modal background in web UI ( #15284 )  
							
							 
							
							... 
							
							
							
							Fix  #15258  
							
						 
						
							2020-12-07 02:32:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								c229a3aab7 
								
							 
						 
						
							
							
								
								Fix remove number sign from account_featured_tags ( #15277 )  
							
							 
							
							
							
						 
						
							2020-12-06 05:55:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0390eca435 
								
							 
						 
						
							
							
								
								Merge pull request  #1470  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-12-05 22:03:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								41428823de 
								
							 
						 
						
							
							
								
								[Glitch] Fix character count not ignoring hidden CW field  
							
							 
							
							... 
							
							
							
							Port 413526a7b8  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-05 21:15:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ec5783c59c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes. 
							
						 
						
							2020-12-05 17:33:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Starfall 
								
							 
						 
						
							
							
							
							
								
							
							
								5b87387e19 
								
							 
						 
						
							
							
								
								Add favourite modal to light theme CSS  
							
							 
							
							
							
						 
						
							2020-12-05 13:23:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								fabb864526 
								
							 
						 
						
							
							
								
								Fix incorrect conditions for suspended accounts in Get API for account featured tags ( #15270 )  
							
							 
							
							
							
						 
						
							2020-12-04 04:22:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1fce69291f 
								
							 
						 
						
							
							
								
								Fix account merging in maintenance script ( #15264 )  
							
							 
							
							... 
							
							
							
							Also include AccountNote and AccountDeletionRequest to the list of classes
needing to be reassigned the merged account. 
							
						 
						
							2020-12-04 02:23:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								b62b44a0e1 
								
							 
						 
						
							
							
								
								Change public thread view to hide "Show thread" link ( #15266 )  
							
							 
							
							... 
							
							
							
							Fixes  #15262  
							
						 
						
							2020-12-02 21:21:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								39824d29f1 
								
							 
						 
						
							
							
								
								Fix followers hash cache not being invalidated on account merge ( #15256 )  
							
							 
							
							... 
							
							
							
							Also clear relationships cache. 
							
						 
						
							2020-12-02 21:20:00 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								27a1419a65 
								
							 
						 
						
							
							
								
								Fix tootctl ip_blocks add failing if not given a comment ( #15263 )  
							
							 
							
							... 
							
							
							
							Fixes  #15261  
							
						 
						
							2020-12-02 21:19:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								879f86f323 
								
							 
						 
						
							
							
								
								Fix Gemfile.lock breaking CI ( #15257 )  
							
							 
							
							... 
							
							
							
							Unnecessary Ruby and Bundler version constraints got included in #15230  
							
						 
						
							2020-12-01 12:34:33 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3f7dc86890 
								
							 
						 
						
							
							
								
								Fix changelog containing items from 3.2.1 twice ( #15255 )  
							
							 
							
							
							
						 
						
							2020-12-01 06:45:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2207431f39 
								
							 
						 
						
							
							
								
								Bump version to 3.3.0rc1 ( #15230 )  
							
							 
							
							
							
						 
						
							2020-12-01 06:38:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9c670a0e7f 
								
							 
						 
						
							
							
								
								Fix ku locale not being right-to-left ( #15252 )  
							
							 
							
							
							
						 
						
							2020-11-30 23:02:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								413526a7b8 
								
							 
						 
						
							
							
								
								Fix character count not ignoring hidden CW field ( #15236 )  
							
							 
							
							
							
						 
						
							2020-11-30 12:09:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Shlee 
								
							 
						 
						
							
							
							
							
								
							
							
								5630db1dab 
								
							 
						 
						
							
							
								
								Update Dockerfile ( #15232 )  
							
							 
							
							
							
						 
						
							2020-11-29 09:20:02 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a217a14b58 
								
							 
						 
						
							
							
								
								Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection ( #15228 )  
							
							 
							
							
							
						 
						
							2020-11-28 05:17:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c3d62dcf8a 
								
							 
						 
						
							
							
								
								Fix media modal crashing when media has no blurhash ( #15229 )  
							
							 
							
							
							
						 
						
							2020-11-28 03:37:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								77aba785e9 
								
							 
						 
						
							
							
								
								Bump version to 3.2.1 ( #15227 )  
							
							 
							
							
							
						 
						
							2020-11-27 18:29:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								715c8eac80 
								
							 
						 
						
							
							
								
								Fix deletes not reaching every server that interacted with status ( #15200 )  
							
							 
							
							... 
							
							
							
							Extract logic for determining ActivityPub inboxes to send deletes
to to its own class and explicitly include the person the status
replied to (even if not mentioned), people who favourited it, and
people who replied to it (though that one is still not recursive) 
							
						 
						
							2020-11-27 15:48:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								841c0c9a28 
								
							 
						 
						
							
							
								
								Fix media modal regression on public pages ( #15221 )  
							
							 
							
							
							
						 
						
							2020-11-27 15:41:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6a7221587b 
								
							 
						 
						
							
							
								
								Fix post-migration warning about index corruption being too scary ( #15223 )  
							
							 
							
							
							
						 
						
							2020-11-27 15:41:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af1fa584e9 
								
							 
						 
						
							
							
								
								Change media modals look in web UI ( #15217 )  
							
							 
							
							... 
							
							
							
							- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar 
							
						 
						
							2020-11-27 03:24:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5de6f37c4d 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15137 )  
							
							 
							
							... 
							
							
							
							* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Sanskrit)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations simple_form.en.yml (Kazakh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations devise.en.yml (Galician)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]
* Ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-26 22:42:12 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9f065b7df9 
								
							 
						 
						
							
							
								
								Merge pull request  #1468  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-11-25 19:01:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								b36187b56a 
								
							 
						 
						
							
							
								
								[Glitch] Fixed ESLint error  
							
							 
							
							... 
							
							
							
							Port 144e606ec9  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-11-25 15:56:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								11e0328fc7 
								
							 
						 
						
							
							
								
								[Glitch] Remove fade-in animation from modals in web UI  
							
							 
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-11-25 15:50:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								42630afabb 
								
							 
						 
						
							
							
								
								Default to 25 fps for frame seeking if framerate information isn't known  
							
							 
							
							
							
						 
						
							2020-11-25 15:47:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3a6cae746e 
								
							 
						 
						
							
							
								
								[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI  
							
							 
							
							... 
							
							
							
							Port bcb3a91c0c  to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-11-25 15:46:09 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								060df6c5c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies. 
							
						 
						
							2020-11-25 15:31:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d1fc484c 
								
							 
						 
						
							
							
								
								Revert "Bump webpack-cli from 3.3.12 to 4.2.0 ( #15123 )" ( #15213 )  
							
							 
							
							... 
							
							
							
							This reverts commit 2d83da3bc5 . 
							
						 
						
							2020-11-24 21:06:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								876df5bb18 
								
							 
						 
						
							
							
								
								Add tootctl accounts merge ( #15201 )  
							
							 
							
							... 
							
							
							
							* Add `tootctl accounts merge`
* Update lib/mastodon/accounts_cli.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-23 17:50:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								144e606ec9 
								
							 
						 
						
							
							
								
								Fixed ESLint error ( #15214 )  
							
							 
							
							... 
							
							
							
							* eslint --fix
* fix consistent-return
* fix promise/catch-or-return
* ignore import rule 
							
						 
						
							2020-11-23 17:35:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								6afc4a7846 
								
							 
						 
						
							
							
								
								Bump @babel/preset-env from 7.12.1 to 7.12.7 ( #15209 )  
							
							 
							
							... 
							
							
							
							Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.1 to 7.12.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.7/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 21:03:44 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								f307883e2f 
								
							 
						 
						
							
							
								
								Bump parallel from 1.20.0 to 1.20.1 ( #15204 )  
							
							 
							
							... 
							
							
							
							Bumps [parallel](https://github.com/grosser/parallel ) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.20.0...v1.20.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 21:02:47 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								3e042e4ff7 
								
							 
						 
						
							
							
								
								Bump eslint from 7.13.0 to 7.14.0 ( #15210 )  
							
							 
							
							... 
							
							
							
							Bumps [eslint](https://github.com/eslint/eslint ) from 7.13.0 to 7.14.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.13.0...v7.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:07:56 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								2d9c22de6c 
								
							 
						 
						
							
							
								
								Bump @babel/preset-react from 7.12.5 to 7.12.7 ( #15208 )  
							
							 
							
							... 
							
							
							
							Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.12.5 to 7.12.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.7/packages/babel-preset-react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:05:04 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								96fae5c28a 
								
							 
						 
						
							
							
								
								Bump @babel/core from 7.12.3 to 7.12.7 ( #15205 )  
							
							 
							
							... 
							
							
							
							Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.3 to 7.12.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.7/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:04:47 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								d1db8452e8 
								
							 
						 
						
							
							
								
								Bump @testing-library/react from 11.2.0 to 11.2.2 ( #15211 )  
							
							 
							
							... 
							
							
							
							Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.2.0 to 11.2.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.2.0...v11.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:03:37 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								65f5857b19 
								
							 
						 
						
							
							
								
								Bump parallel_tests from 3.3.0 to 3.4.0 ( #15203 )  
							
							 
							
							... 
							
							
							
							Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.3.0...v3.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:02:30 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								a0aff403eb 
								
							 
						 
						
							
							
								
								Bump redis from 4.2.2 to 4.2.5 ( #15202 )  
							
							 
							
							... 
							
							
							
							Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.2 to 4.2.5.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.2.2...v4.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:00:55 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								86807b918f 
								
							 
						 
						
							
							
								
								Bump rubocop from 1.3.0 to 1.3.1 ( #15212 )  
							
							 
							
							... 
							
							
							
							Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.3.0...v1.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 17:00:23 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								2813d4014d 
								
							 
						 
						
							
							
								
								Bump aws-sdk-s3 from 1.84.1 to 1.85.0 ( #15207 )  
							
							 
							
							... 
							
							
							
							Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.84.1 to 1.85.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-11-23 16:59:45 +09:00