chrisgarrity
|
a5b735f971
|
Merge pull request #5142 from LLK/hotfix/automod-mar15
[Develop] Hotfix - automod everyone (mar 15)
|
2021-03-15 09:31:10 -04:00 |
|
chrisgarrity
|
14052544bd
|
Merge pull request #5143 from LLK/hotfix/automod-mar15
[Master] Hotfix - automod everyone (mar15)
|
2021-03-15 09:30:27 -04:00 |
|
chrisgarrity
|
8271bb62bb
|
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted
Prevent feedback when not just muted
|
2021-03-15 09:10:48 -04:00 |
|
dependabot-preview[bot]
|
266833b35c
|
Merge pull request #5136 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210315031457
|
2021-03-15 03:53:58 +00:00 |
|
dependabot-preview[bot]
|
97f4bb711b
|
Bump scratch-l10n from 3.11.20210314031515 to 3.11.20210315031457
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210314031515 to 3.11.20210315031457.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210314031515...3.11.20210315031457)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-15 03:46:16 +00:00 |
|
dependabot-preview[bot]
|
e6a0a3d57c
|
Merge pull request #5133 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210314031515
|
2021-03-14 03:28:37 +00:00 |
|
dependabot-preview[bot]
|
922b1d46b0
|
Bump scratch-l10n from 3.11.20210313031534 to 3.11.20210314031515
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210313031534 to 3.11.20210314031515.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210313031534...3.11.20210314031515)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-14 03:21:05 +00:00 |
|
dependabot-preview[bot]
|
1fe239b065
|
Merge pull request #5131 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210313031534
|
2021-03-13 03:47:18 +00:00 |
|
dependabot-preview[bot]
|
07d830eae2
|
Bump scratch-l10n from 3.11.20210312031542 to 3.11.20210313031534
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210312031542 to 3.11.20210313031534.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210312031542...3.11.20210313031534)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-13 03:40:13 +00:00 |
|
Sarah Otts
|
da64706b0d
|
Remove unused FlexRow
|
2021-03-12 09:10:25 -05:00 |
|
dependabot-preview[bot]
|
391470beab
|
Merge pull request #5129 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210312031542
|
2021-03-12 03:51:18 +00:00 |
|
dependabot-preview[bot]
|
34bd50a501
|
Bump scratch-l10n from 3.11.20210311031457 to 3.11.20210312031542
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210311031457 to 3.11.20210312031542.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210311031457...3.11.20210312031542)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-12 03:42:24 +00:00 |
|
seotts
|
50f49c28a2
|
remove commented-out test
|
2021-03-11 16:31:59 -05:00 |
|
seotts
|
936172d70b
|
only show feedback link for new mute
Add variable for isBad string
|
2021-03-11 13:06:51 -05:00 |
|
Karishma Chadha
|
65782822a9
|
Merge pull request #5127 from LLK/release/2021-03-11
[Develop] Release 2021-03-11
|
2021-03-11 10:45:38 -05:00 |
|
Karishma Chadha
|
03c8ab448b
|
Merge pull request #5126 from LLK/release/2021-03-11
[Master] Release 2021-03-11
|
2021-03-11 10:45:09 -05:00 |
|
dependabot-preview[bot]
|
2e560afe20
|
Merge pull request #5124 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210311031457
|
2021-03-11 03:51:40 +00:00 |
|
dependabot-preview[bot]
|
5e4780dbe1
|
Bump scratch-l10n from 3.11.20210310031445 to 3.11.20210311031457
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210310031445 to 3.11.20210311031457.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210310031445...3.11.20210311031457)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-11 03:42:09 +00:00 |
|
Sarah Otts
|
39f3950620
|
Merge pull request #5123 from seotts/fix-llk-link
Fix LLK link
|
2021-03-10 16:17:40 -05:00 |
|
seotts
|
f78a683b09
|
Update link to LLK to new Media Lab url
|
2021-03-10 16:16:06 -05:00 |
|
Paul Kaplan
|
fb4370b412
|
Remove dev routes on staging
|
2021-03-10 15:09:07 -05:00 |
|
Karishma Chadha
|
735a70963d
|
Merge pull request #5122 from LLK/develop
Pull changes from develop into release branch
|
2021-03-10 11:19:27 -05:00 |
|
Zoë Bentley
|
eabab89bd5
|
Made changes to conf 2020 page (fixed dependencies)
|
2021-03-10 11:13:46 -05:00 |
|
dependabot-preview[bot]
|
64355ac40d
|
Merge pull request #5118 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210310031445
|
2021-03-10 06:34:30 +00:00 |
|
dependabot-preview[bot]
|
d9a45fe4cc
|
Bump scratch-l10n from 3.11.20210309031504 to 3.11.20210310031445
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>
|
2021-03-10 03:33:55 +00:00 |
|
Paul Kaplan
|
24cdd291ca
|
Add staging route for studio playground
|
2021-03-09 15:32:35 -05:00 |
|
Sarah Otts
|
dc9d079e4b
|
Merge pull request #5116 from seotts/revert-revert-zoe-content-update
Revert "Revert "Content updates march 2021""
|
2021-03-09 15:10:48 -05:00 |
|
seotts
|
a1759f42b3
|
Revert "Revert "Content updates march 2021""
This reverts commit 65f69d1201.
|
2021-03-09 14:38:36 -05:00 |
|
dependabot-preview[bot]
|
17f96b4934
|
Merge pull request #5112 from LLK/dependabot/npm_and_yarn/debug-2.6.9
|
2021-03-09 10:49:04 +00:00 |
|
dependabot-preview[bot]
|
bb7f5f5cb8
|
[Security] Bump debug from 2.2.0 to 2.6.9
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>
|
2021-03-09 10:39:25 +00:00 |
|
dependabot-preview[bot]
|
9ff0153e6f
|
Merge pull request #5111 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210309031504
|
2021-03-09 03:35:13 +00:00 |
|
dependabot-preview[bot]
|
cb416831aa
|
Bump scratch-l10n from 3.11.20210308220417 to 3.11.20210309031504
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>
|
2021-03-09 03:25:56 +00:00 |
|
picklesrus
|
c097658b5d
|
Merge pull request #5101 from picklesrus/remove-unused-deps
Removed unused dependencies
|
2021-03-08 17:33:52 -05:00 |
|
picklesrus
|
b7ff04fb22
|
fix merge conflicts. Again.
|
2021-03-08 17:23:53 -05:00 |
|
picklesrus
|
80b243ec0c
|
bring back webpack
|
2021-03-08 17:22:05 -05:00 |
|
picklesrus
|
3dfcfa1e9d
|
Remove unused tests
|
2021-03-08 17:22:05 -05:00 |
|
picklesrus
|
613a494bac
|
resolve conflicts
|
2021-03-08 17:22:05 -05:00 |
|
dependabot-preview[bot]
|
cc3bd510fa
|
Merge pull request #5105 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308220417
|
2021-03-08 22:19:40 +00:00 |
|
dependabot-preview[bot]
|
5bc88ead4f
|
Bump scratch-l10n from 3.11.20210301031451 to 3.11.20210308220417
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>
|
2021-03-08 22:10:06 +00:00 |
|
Benjamin Wheeler
|
cadcbbc7c8
|
Merge pull request #5104 from benjiwheeler/update-chromedriver-second-try
Bump chromedriver version to 88, increase jest integration timeouts
|
2021-03-08 15:47:57 -05:00 |
|
Ben Wheeler
|
466684cea3
|
updated chromedriver using npm install --save
|
2021-03-08 15:44:55 -05:00 |
|
Benjamin Wheeler
|
b45001158c
|
Merge pull request #5103 from LLK/revert-5077-update-chromedriver-88
Revert "Bump chromedriver version to 88, increase jest integration timeouts"
|
2021-03-08 15:23:21 -05:00 |
|
Benjamin Wheeler
|
4c880895fa
|
Revert "Bump chromedriver version to 88, increase jest integration timeouts"
|
2021-03-08 15:22:39 -05:00 |
|
Paul Kaplan
|
49e62afa8b
|
Fix typo in mapStateToProps
|
2021-03-08 12:27:32 -05:00 |
|
Paul Kaplan
|
8b2bb5fe92
|
Include legacy unit tests when running test:unit
|
2021-03-08 12:15:23 -05:00 |
|
Paul Kaplan
|
27dafac7f0
|
Move comments out of project reducer
|
2021-03-08 12:01:22 -05:00 |
|
Bryce Taylor
|
3d47d394b7
|
Merge pull request #5077 from BryceLTaylor/update-chromedriver-88
Bump chromedriver version to 88, increase jest integration timeouts
|
2021-03-08 11:57:03 -05:00 |
|
Ben Wheeler
|
1989e0be8b
|
updated chromedriver version and package-lock after rebasing
|
2021-03-08 10:55:43 -05:00 |
|
BryceLTaylor
|
2933fbce94
|
Bump chromedriver version to 88, increase jest integration timeouts
|
2021-03-08 10:23:03 -05:00 |
|
dependabot-preview[bot]
|
97a6869843
|
Merge pull request #5096 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308031514
|
2021-03-08 03:54:43 +00:00 |
|