Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							78fa15d08f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/master  
						
						... 
						
						
						
						Conflicts:
- `streaming/index.js`:
  Upstream entirely refactored it.
  Ported our changes to upstream's refactor. Hopefuly. 
						
						
					 
					
						2020-08-11 19:19:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ef057584fd 
							
						 
					 
					
						
						
							
							Add support for managing multiple stream subscriptions in a single connection ( #14524 )  
						
						
						
						
					 
					
						2020-08-11 18:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							decc5b9a78 
							
						 
					 
					
						
						
							
							Fix tootctl media commands not handling snowflake ids for media_attachments ( #14536 )  
						
						
						
						
					 
					
						2020-08-10 01:51:06 +02:00 
						 
				 
			
				
					
						
							
							
								niwatori24 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1326c57506 
							
						 
					 
					
						
						
							
							Use default :edit routing ( #14535 )  
						
						
						
						
					 
					
						2020-08-10 01:50:43 +02:00 
						 
				 
			
				
					
						
							
							
								niwatori24 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8b61bb1c3e 
							
						 
					 
					
						
						
							
							Cache result of SQL ( #14534 )  
						
						
						
						
					 
					
						2020-08-09 15:23:42 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							03712799e2 
							
						 
					 
					
						
						
							
							Merge pull request  #1397  from ThibG/glitch-soc/merge-upstream  
						
						... 
						
						
						
						Merge upstream changes 
						
						
					 
					
						2020-08-08 19:41:24 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5d5b9e2f62 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-08-08 19:10:40 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bd3420b139 
							
						 
					 
					
						
						
							
							Fix crash when failing to load emoji picker ( #14525 )  
						
						... 
						
						
						
						Fixes  #14523  
					
						2020-08-08 17:57:56 +02:00 
						 
				 
			
				
					
						
							
							
								abcang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a4d08f3a0 
							
						 
					 
					
						
						
							
							Fix eslint error ( #14521 )  
						
						
						
						
					 
					
						2020-08-07 10:40:33 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b61e060501 
							
						 
					 
					
						
						
							
							Bump node-notifier from 7.0.1 to 7.0.2 ( #14499 )  
						
						... 
						
						
						
						Bumps [node-notifier](https://github.com/mikaelbr/node-notifier ) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases )
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v7.0.1...v7.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:41:07 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a37d9b6268 
							
						 
					 
					
						
						
							
							Bump minipass-pipeline from 1.2.3 to 1.2.4 ( #14504 )  
						
						... 
						
						
						
						Bumps minipass-pipeline from 1.2.3 to 1.2.4.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:39:58 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cdb6b5a04b 
							
						 
					 
					
						
						
							
							Bump @testing-library/jest-dom from 5.11.0 to 5.11.2 ( #14497 )  
						
						... 
						
						
						
						Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.0 to 5.11.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.0...v5.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:39:32 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b7295f16ec 
							
						 
					 
					
						
						
							
							Bump dom-accessibility-api from 0.4.6 to 0.4.7 ( #14496 )  
						
						... 
						
						
						
						Bumps [dom-accessibility-api](https://github.com/eps1lon/dom-accessibility-api ) from 0.4.6 to 0.4.7.
- [Release notes](https://github.com/eps1lon/dom-accessibility-api/releases )
- [Changelog](https://github.com/eps1lon/dom-accessibility-api/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eps1lon/dom-accessibility-api/compare/v0.4.6...v0.4.7 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:38:46 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							87799371df 
							
						 
					 
					
						
						
							
							Bump postcss-modules-local-by-default from 3.0.2 to 3.0.3 ( #14505 )  
						
						... 
						
						
						
						Bumps [postcss-modules-local-by-default](https://github.com/css-modules/postcss-modules-local-by-default ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/css-modules/postcss-modules-local-by-default/releases )
- [Changelog](https://github.com/css-modules/postcss-modules-local-by-default/blob/master/CHANGELOG.md )
- [Commits](https://github.com/css-modules/postcss-modules-local-by-default/compare/v3.0.2...v3.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:37:50 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d45a6210d 
							
						 
					 
					
						
						
							
							Bump jest from 26.0.1 to 26.2.2 ( #14495 )  
						
						... 
						
						
						
						Bumps [jest](https://github.com/facebook/jest ) from 26.0.1 to 26.2.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v26.0.1...v26.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:36:47 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5e292236d9 
							
						 
					 
					
						
						
							
							Bump csstype from 2.6.10 to 2.6.13 ( #14503 )  
						
						... 
						
						
						
						Bumps [csstype](https://github.com/frenic/csstype ) from 2.6.10 to 2.6.13.
- [Release notes](https://github.com/frenic/csstype/releases )
- [Commits](https://github.com/frenic/csstype/compare/v2.6.10...v2.6.13 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:36:07 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c1c0a0e3a2 
							
						 
					 
					
						
						
							
							Bump excon from 0.75.0 to 0.76.0 ( #14490 )  
						
						... 
						
						
						
						Bumps [excon](https://github.com/excon/excon ) from 0.75.0 to 0.76.0.
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.75.0...v0.76.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:35:32 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4728286a51 
							
						 
					 
					
						
						
							
							Bump eslint from 7.5.0 to 7.6.0 ( #14508 )  
						
						... 
						
						
						
						Bumps [eslint](https://github.com/eslint/eslint ) from 7.5.0 to 7.6.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.5.0...v7.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:34:48 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a61329199e 
							
						 
					 
					
						
						
							
							Bump pghero from 2.6.0 to 2.7.0 ( #14518 )  
						
						... 
						
						
						
						Bumps [pghero](https://github.com/ankane/pghero ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-07 00:34:12 +09:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a637344e37 
							
						 
					 
					
						
						
							
							Fallback to previous, more approximative hashtag RE on older browsers ( #14513 )  
						
						... 
						
						
						
						Fixes  #14511  
					
						2020-08-05 22:39:14 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							a3806ec6ba 
							
						 
					 
					
						
						
							
							[Glitch] Fallback to previous, more approximative hashtag RE on older browsers  
						
						... 
						
						
						
						Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-08-05 13:43:32 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							63bbe6cab8 
							
						 
					 
					
						
						
							
							Bump rubocop-ast from 0.2.0 to 0.3.0 ( #14498 )  
						
						... 
						
						
						
						Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast ) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.2.0...v0.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-05 05:31:57 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3cd76411d2 
							
						 
					 
					
						
						
							
							Bump elasticsearch from 7.8.0 to 7.8.1 ( #14501 )  
						
						... 
						
						
						
						Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby ) from 7.8.0 to 7.8.1.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.8.0...v7.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-05 05:30:54 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							563ec44aa9 
							
						 
					 
					
						
						
							
							Bump expect from 26.1.0 to 26.2.0 ( #14507 )  
						
						... 
						
						
						
						Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect ) from 26.1.0 to 26.2.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.2.0/packages/expect )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-08-05 05:30:03 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c1df176aa9 
							
						 
					 
					
						
						
							
							Bump @babel/preset-env from 7.10.4 to 7.11.0 ( #14502 )  
						
						... 
						
						
						
						Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.10.4 to 7.11.0.
- [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.11.0/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-08-05 05:28:07 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							97afc88764 
							
						 
					 
					
						
						
							
							Bump aws-partitions from 1.345.0 to 1.349.0 ( #14489 )  
						
						... 
						
						
						
						Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.345.0 to 1.349.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/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-08-05 05:24:03 +09:00 
						 
				 
			
				
					
						
							
							
								Fire Demon 
							
						 
					 
					
						
						
						
						
							
						
						
							13501f7393 
							
						 
					 
					
						
						
							
							Add tests for direct message assertions  
						
						
						
						
					 
					
						2020-08-04 19:43:19 +02:00 
						 
				 
			
				
					
						
							
							
								Fire Demon 
							
						 
					 
					
						
						
						
						
							
						
						
							3d5b3e357c 
							
						 
					 
					
						
						
							
							Add support for direct message assertions  
						
						
						
						
					 
					
						2020-08-04 19:43:19 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b988bc7564 
							
						 
					 
					
						
						
							
							Merge pull request  #1393  from ThibG/glitch-soc/merge-upstream  
						
						... 
						
						
						
						Merge upstream changes 
						
						
					 
					
						2020-08-02 22:46:25 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							8f0e6122a9 
							
						 
					 
					
						
						
							
							[Glitch] Fix audio player on Safari  
						
						... 
						
						
						
						Port 635b6a0f1af21bd4055f950930a681aa0a96535b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-08-02 22:30:51 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b578d70957 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-08-02 22:29:17 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8ce962e148 
							
						 
					 
					
						
						
							
							Fix audio/video player not using CDN_HOST in media paths on public pages ( #14486 )  
						
						
						
						
					 
					
						2020-08-02 19:03:10 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0ebc8d8626 
							
						 
					 
					
						
						
							
							Fix thumbnail color extraction ( #14464 )  
						
						... 
						
						
						
						* Fix contrast calculation for thumbnail color extraction
Luminance calculation was using 0-255 RGB values instead of 0-1 sRGB values,
leading to incorrectly-computed contrast values.
Since we use ColorDiff already, just use its XYZ colorspace conversion code
to get the value.
* Require at least 3:1 contrast for both accent and foreground colors
* Lower required contrast for the accent color 
						
						
					 
					
						2020-08-02 18:47:44 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							635b6a0f1a 
							
						 
					 
					
						
						
							
							Fix audio player on Safari ( #14485 )  
						
						
						
						
					 
					
						2020-08-02 18:47:09 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							141ac8db8b 
							
						 
					 
					
						
						
							
							Merge pull request  #1392  from ThibG/glitch-soc/merge-upstream  
						
						... 
						
						
						
						Merge upstream changes 
						
						
					 
					
						2020-08-02 16:05:01 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							de7ba22c45 
							
						 
					 
					
						
						
							
							[Glitch] Fix new audio player features not working on Safari  
						
						... 
						
						
						
						Port 51b5bb53015df5b360f0e366f7fc67dce75e2d6c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-08-02 14:35:40 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							8f3295f212 
							
						 
					 
					
						
						
							
							[Glitch] Fix wrong proptypes for onEditAccountNote  
						
						... 
						
						
						
						Port 5faf2de93891db822d78c92f2bc2cdc33c3605c1 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-08-02 14:34:56 +02:00 
						 
				 
			
				
					
						
							
							
								kedama 
							
						 
					 
					
						
						
						
						
							
						
						
							1d8e930445 
							
						 
					 
					
						
						
							
							[Glitch] Fix the hashtag judgment of the compose form to be the same as the server side  
						
						... 
						
						
						
						Port cd94854e7d14b2bc755510493944a3e01f758fa2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-08-02 14:33:22 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							23cd5f2c15 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-08-02 14:30:28 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3ade834830 
							
						 
					 
					
						
						
							
							Fix disabled boost icon being replaced by private boost icon on hover ( #14456 )  
						
						... 
						
						
						
						Fixes  #14455  
					
						2020-08-02 11:21:28 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1412491b7 
							
						 
					 
					
						
						
							
							Change content-type to be always computed from file data ( #14452 )  
						
						... 
						
						
						
						* Change content-type to be always computed from file data
Restore previous behavior, detecting the content-type isn't very
expensive, and some instances may serve files as application/octet-stream
regardless of their true type, making fetching media from them fail, while
it used to work pre-3.2.0.
* Add test 
						
						
					 
					
						2020-08-02 11:21:10 +02:00 
						 
				 
			
				
					
						
							
							
								Alex Dunn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9490011226 
							
						 
					 
					
						
						
							
							helm: bump default image tag to v3.2.0 ( #14476 )  
						
						
						
						
					 
					
						2020-08-02 11:20:31 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							51b5bb5301 
							
						 
					 
					
						
						
							
							Fix new audio player features not working on Safari ( #14465 )  
						
						... 
						
						
						
						Fixes  #14462  
					
						2020-08-02 11:20:17 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5faf2de938 
							
						 
					 
					
						
						
							
							Fix wrong proptypes for onEditAccountNote ( #14481 )  
						
						... 
						
						
						
						Also add missing PropTypes to the correct component
Fixes  #14478  
						
						
					 
					
						2020-08-02 11:20:02 +02:00 
						 
				 
			
				
					
						
							
							
								kedama 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd94854e7d 
							
						 
					 
					
						
						
							
							Fix the hashtag judgment of the compose form to be the same as the server side ( #14484 )  
						
						
						
						
					 
					
						2020-08-02 11:19:43 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b12117c4a3 
							
						 
					 
					
						
						
							
							Merge pull request  #1391  from ThibG/glitch-soc/merge-upstream  
						
						... 
						
						
						
						Merge upstream changes 
						
						
					 
					
						2020-08-01 21:42:58 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							2cfa142961 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes. 
						
						
					 
					
						2020-08-01 20:24:23 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bfd5aea206 
							
						 
					 
					
						
						
							
							Fix handling of Reject Follow when a matching follow relationship exists ( #14479 )  
						
						... 
						
						
						
						* Add tests
* Fix handling of Reject Follow when a matching follow relationship exists
Regression from #12199  
						
						
					 
					
						2020-08-01 18:20:37 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7286d5ea48 
							
						 
					 
					
						
						
							
							Bump eslint from 6.8.0 to 7.5.0 ( #14454 )  
						
						... 
						
						
						
						* Bump eslint from 6.8.0 to 7.5.0
Bumps [eslint](https://github.com/eslint/eslint ) from 6.8.0 to 7.5.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/v6.8.0...v7.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix .codeclimate.yml
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
						
						
					 
					
						2020-07-29 04:52:35 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4f2b06b6b5 
							
						 
					 
					
						
						
							
							Bump strong_migrations from 0.6.8 to 0.7.1 ( #14463 )  
						
						... 
						
						
						
						Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.6.8 to 0.7.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.8...v0.7.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-07-29 02:18:59 +09:00