Commits · 14052544bde1a29b4dc8c75435f274569689d3da · xpstem / scratch-www

15 Mar, 2021 2 commits
- Merge pull request #5143 from LLK/hotfix/automod-mar15 · 14052544
  chrisgarrity authored Mar 15, 2021
```
[Master] Hotfix - automod everyone (mar15)
```
  14052544
- Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted · 8271bb62
  chrisgarrity authored Mar 15, 2021
```
Prevent feedback when not just muted
```
  8271bb62
11 Mar, 2021 3 commits
- remove commented-out test · 50f49c28
  seotts authored Mar 11, 2021
  
  50f49c28
- only show feedback link for new mute · 936172d7
  seotts authored Mar 10, 2021
```
Add variable for isBad string
```
  936172d7
- Merge pull request #5126 from LLK/release/2021-03-11 · 03c8ab44
  Karishma Chadha authored Mar 11, 2021
```
[Master] Release 2021-03-11
```
  03c8ab44
10 Mar, 2021 5 commits
- Merge pull request #5123 from seotts/fix-llk-link · 39f39506
  Sarah Otts authored Mar 10, 2021
```
Fix LLK link
```
  39f39506
- Update link to LLK to new Media Lab url · f78a683b
  seotts authored Mar 10, 2021
  
  f78a683b
- Merge pull request #5122 from LLK/develop · 735a7096
  Karishma Chadha authored Mar 10, 2021
```
Pull changes from develop into release branch
```
  735a7096
- Merge pull request #5118 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210310031445 · 64355ac4
  dependabot-preview[bot] authored Mar 10, 2021
  
  64355ac4
- Bump scratch-l10n from 3.11.20210309031504 to 3.11.20210310031445 · d9a45fe4
  dependabot-preview[bot] authored Mar 10, 2021
```
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210309031504 to 3.11.20210310031445.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210309031504...3.11.20210310031445)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
```
  d9a45fe4
09 Mar, 2021 6 commits

Merge pull request #5116 from seotts/revert-revert-zoe-content-update · dc9d079e
Sarah Otts authored Mar 09, 2021
```
Revert "Revert "Content updates march 2021""
```
dc9d079e
Revert "Revert "Content updates march 2021"" · a1759f42
seotts authored Mar 09, 2021
```
This reverts commit 65f69d12.
```
a1759f42
Merge pull request #5112 from LLK/dependabot/npm_and_yarn/debug-2.6.9 · 17f96b49
dependabot-preview[bot] authored Mar 09, 2021

17f96b49

[Security] Bump debug from 2.2.0 to 2.6.9 · bb7f5f5c

dependabot-preview[bot] authored Mar 09, 2021

Bumps [debug](https://github.com/visionmedia/debug) from 2.2.0 to 2.6.9. **This update includes a security fix.**
- [Release notes](https://github.com/visionmedia/debug/releases)
- [Changelog](https://github.com/visionmedia/debug/blob/2.6.9/CHANGELOG.md)
- [Commits](https://github.com/visionmedia/debug/compare/2.2.0...2.6.9)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

bb7f5f5c

Merge pull request #5111 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210309031504 · 9ff0153e
dependabot-preview[bot] authored Mar 09, 2021

9ff0153e

Bump scratch-l10n from 3.11.20210308220417 to 3.11.20210309031504 · cb416831

dependabot-preview[bot] authored Mar 09, 2021

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210308220417 to 3.11.20210309031504.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210308220417...3.11.20210309031504)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

cb416831

08 Mar, 2021 16 commits
- Merge pull request #5101 from picklesrus/remove-unused-deps · c097658b
  picklesrus authored Mar 08, 2021
```
Removed unused dependencies
```
  c097658b
- fix merge conflicts. Again. · b7ff04fb
  picklesrus authored Mar 08, 2021
  
  b7ff04fb
- bring back webpack · 80b243ec
  picklesrus authored Mar 08, 2021
  
  80b243ec
- Remove unused tests · 3dfcfa1e
  picklesrus authored Mar 08, 2021
  
  3dfcfa1e
- resolve conflicts · 613a494b
  picklesrus authored Mar 08, 2021
  
  613a494b
- Merge pull request #5105 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308220417 · cc3bd510
  dependabot-preview[bot] authored Mar 08, 2021
  
  cc3bd510
- Bump scratch-l10n from 3.11.20210301031451 to 3.11.20210308220417 · 5bc88ead
  dependabot-preview[bot] authored Mar 08, 2021
```
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210301031451 to 3.11.20210308220417.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210301031451...3.11.20210308220417)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
```
  5bc88ead
- Merge pull request #5104 from benjiwheeler/update-chromedriver-second-try · cadcbbc7
  Benjamin Wheeler authored Mar 08, 2021
```
Bump chromedriver version to 88, increase jest integration timeouts
```
  cadcbbc7
- updated chromedriver using npm install --save · 466684ce
  Ben Wheeler authored Mar 08, 2021
  
  466684ce
- Merge pull request #5103 from LLK/revert-5077-update-chromedriver-88 · b4500115
  Benjamin Wheeler authored Mar 08, 2021
```
Revert "Bump chromedriver version to 88, increase jest integration timeouts"
```
  b4500115
- Revert "Bump chromedriver version to 88, increase jest integration timeouts" · 4c880895
  Benjamin Wheeler authored Mar 08, 2021
  
  4c880895
- Merge pull request #5077 from BryceLTaylor/update-chromedriver-88 · 3d47d394
  Bryce Taylor authored Mar 08, 2021
```
Bump chromedriver version to 88, increase jest integration timeouts
```
  3d47d394
- updated chromedriver version and package-lock after rebasing · 1989e0be
  Ben Wheeler authored Mar 08, 2021
  
  1989e0be
- Bump chromedriver version to 88, increase jest integration timeouts · 2933fbce
  BryceLTaylor authored Mar 02, 2021
  
  2933fbce
- Merge pull request #5096 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308031514 · 97a68698
  dependabot-preview[bot] authored Mar 08, 2021
  
  97a68698
- Bump scratch-l10n from 3.11.20210307031517 to 3.11.20210308031514 · edb4e7f5
  dependabot-preview[bot] authored Mar 08, 2021
```
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210307031517 to 3.11.20210308031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210307031517...3.11.20210308031514)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
```
  edb4e7f5
07 Mar, 2021 2 commits

Merge pull request #5093 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210307031517 · 33f43f7b
dependabot-preview[bot] authored Mar 07, 2021

33f43f7b

Bump scratch-l10n from 3.11.20210306031505 to 3.11.20210307031517 · 071fd090

dependabot-preview[bot] authored Mar 07, 2021

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210306031505 to 3.11.20210307031517.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210306031505...3.11.20210307031517)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

071fd090

06 Mar, 2021 2 commits

Merge pull request #5092 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210306031505 · e8a7b27e
dependabot-preview[bot] authored Mar 06, 2021

e8a7b27e

Bump scratch-l10n from 3.11.20210305031531 to 3.11.20210306031505 · 78a6fd8e

dependabot-preview[bot] authored Mar 06, 2021

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210305031531 to 3.11.20210306031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210305031531...3.11.20210306031505)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

78a6fd8e

05 Mar, 2021 2 commits

Merge pull request #5090 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210305031531 · c9f2710d
dependabot-preview[bot] authored Mar 05, 2021

c9f2710d

Bump scratch-l10n from 3.11.20210304031526 to 3.11.20210305031531 · 874b36fd

dependabot-preview[bot] authored Mar 05, 2021

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210304031526 to 3.11.20210305031531.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210304031526...3.11.20210305031531)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

874b36fd

04 Mar, 2021 2 commits
- Merge pull request #5088 from seotts/chainmail-message · 6d96c7f2
  Sarah Otts authored Mar 04, 2021
```
Add spam mute message
```
  6d96c7f2
- Copy update on spam header · cfb0a004
  Sarah Otts authored Mar 04, 2021
  
  cfb0a004