Commit graph

9251 commits

Author SHA1 Message Date
seotts
31016df1f5 Don’t fail if mute_status isn’t available 2021-01-07 14:05:02 -05:00
seotts
c8373ab888 Revert "Revert "Add new mute message types""
This reverts commit 1575ed06cf.
2021-01-07 14:04:48 -05:00
Karishma Chadha
8fb6984383
Merge pull request #4820 from LLK/release/2021-01-07
[Develop] Release 2021-01-07
2021-01-07 13:57:23 -05:00
Karishma Chadha
c918b753bc
Merge branch 'develop' into release/2021-01-07 2021-01-07 13:55:28 -05:00
Karishma Chadha
a2d89c2a67
Merge pull request #4819 from LLK/release/2021-01-07
[Master] Release 2021-01-07
2021-01-07 11:30:07 -05:00
picklesrus
4879570561 Update vertical spacing on mute modal
This reduces the vertical padding in the mute modal to better fit on shorter screens.
2021-01-07 11:07:39 -05:00
Ben Wheeler
ab05b4e9d5 update gui version per revert of renderer pick change 2021-01-07 10:20:01 -05:00
dependabot-preview[bot]
57e6078231
Merge pull request #4826 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210107040151 2021-01-07 10:57:53 +00:00
dependabot-preview[bot]
ec30504dcc
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210106041113 to 0.1.0-prerelease.20210107040151.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210106041113...0.1.0-prerelease.20210107040151)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-07 10:43:58 +00:00
dependabot-preview[bot]
cb3171822e
Merge pull request #4825 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210107031515 2021-01-07 03:46:57 +00:00
dependabot-preview[bot]
4dd0f071ee
Bump scratch-l10n from 3.10.20210106031511 to 3.10.20210107031515
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210106031511 to 3.10.20210107031515.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210106031511...3.10.20210107031515)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-07 03:33:12 +00:00
Sarah Otts
b1f5781ca8
Merge pull request #4824 from LLK/revert-4779-automod-new-messaging
Revert "Add new mute message types"
2021-01-06 17:14:14 -05:00
Sarah Otts
1575ed06cf
Revert "Add new mute message types" 2021-01-06 16:51:03 -05:00
Karishma Chadha
0420c0def8
Merge pull request #4818 from LLK/develop
Prepare release branch
2021-01-06 11:02:15 -05:00
Karishma Chadha
6d8cac4239
Merge pull request #4817 from LLK/hotfix/sec-google-nolink
[Develop] Hotfix sec google nolink
2021-01-06 10:56:41 -05:00
Karishma Chadha
3bdb5abdd5
Merge pull request #4814 from kchadha/annual-report-credits
Add Tracy to credits page and Annual Report team section.
2021-01-06 10:44:06 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix
World map fixes - Border thickness, Eswatini, remove unused css
2021-01-06 10:43:50 -05:00
dependabot-preview[bot]
ea4317f5d2
Merge pull request #4816 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210106041113 2021-01-06 12:53:34 +00:00
dependabot-preview[bot]
318016f87b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210105042543 to 0.1.0-prerelease.20210106041113.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210105042543...0.1.0-prerelease.20210106041113)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-06 12:39:07 +00:00
dependabot-preview[bot]
8a4822c2dd
Merge pull request #4815 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210106031511 2021-01-06 04:08:27 +00:00
dependabot-preview[bot]
40458a941c
Bump scratch-l10n from 3.10.20210105031532 to 3.10.20210106031511
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210105031532 to 3.10.20210106031511.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210105031532...3.10.20210106031511)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-06 03:53:34 +00:00
Karishma Chadha
edca23f6ce Add Tracy to credits page and Annual Report team section. 2021-01-05 15:51:38 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs
In the Annual Report Team section, open link to Scratch Team members in new tab
2021-01-05 14:38:03 -05:00
Sarah Otts
69375d52a4
Merge pull request #4779 from seotts/automod-new-messaging
Add new mute message types
2021-01-05 10:28:07 -05:00
dependabot-preview[bot]
a693adbdbb
Merge pull request #4813 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210105042543 2021-01-05 11:04:27 +00:00
dependabot-preview[bot]
b746a38ed4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210101040933 to 0.1.0-prerelease.20210105042543.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210101040933...0.1.0-prerelease.20210105042543)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 10:50:32 +00:00
dependabot-preview[bot]
d6dca1dc84
Merge pull request #4812 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210105031532 2021-01-05 04:00:58 +00:00
dependabot-preview[bot]
357a1e119d
Bump scratch-l10n from 3.10.20210101031524 to 3.10.20210105031532
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210101031524 to 3.10.20210105031532.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210101031524...3.10.20210105031532)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 03:45:52 +00:00
Sarah Otts
f3dbe23c5e
Fix syntax error from merge 2021-01-04 11:20:16 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
dependabot-preview[bot]
80174a4b1a
Merge pull request #4809 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210101040933 2021-01-01 11:01:55 +00:00
dependabot-preview[bot]
fdeef2a13d
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201231040136 to 0.1.0-prerelease.20210101040933.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201231040136...0.1.0-prerelease.20210101040933)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 10:47:59 +00:00
dependabot-preview[bot]
04452313cf
Merge pull request #4808 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210101031524 2021-01-01 04:02:21 +00:00
dependabot-preview[bot]
481b05156e
Bump scratch-l10n from 3.10.20201231031527 to 3.10.20210101031524
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201231031527 to 3.10.20210101031524.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201231031527...3.10.20210101031524)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 03:48:08 +00:00
dependabot-preview[bot]
f05ffb814a
Merge pull request #4807 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201231040136 2020-12-31 11:04:19 +00:00
dependabot-preview[bot]
67f3838edd
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201229035216 to 0.1.0-prerelease.20201231040136.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201229035216...0.1.0-prerelease.20201231040136)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-31 10:50:35 +00:00
dependabot-preview[bot]
5017297b9b
Merge pull request #4805 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201231031527 2020-12-31 03:51:07 +00:00
dependabot-preview[bot]
db62ae5988
Bump scratch-l10n from 3.10.20201230031512 to 3.10.20201231031527
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201230031512 to 3.10.20201231031527.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201230031512...3.10.20201231031527)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-31 03:37:06 +00:00
dependabot-preview[bot]
b9ae836a99
Merge pull request #4802 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201230031512 2020-12-30 03:44:38 +00:00
dependabot-preview[bot]
fac2077e44
Bump scratch-l10n from 3.10.20201229031520 to 3.10.20201230031512
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201229031520 to 3.10.20201230031512.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201229031520...3.10.20201230031512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-30 03:31:25 +00:00
dependabot-preview[bot]
3a93744f89
Merge pull request #4801 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201229035216 2020-12-29 10:59:15 +00:00
dependabot-preview[bot]
9de79cdb10
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201227033512 to 0.1.0-prerelease.20201229035216.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201227033512...0.1.0-prerelease.20201229035216)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-29 10:44:40 +00:00
dependabot-preview[bot]
f65698c7a5
Merge pull request #4800 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201229031520 2020-12-29 03:52:19 +00:00
dependabot-preview[bot]
b44c661f3b
Bump scratch-l10n from 3.10.20201227031524 to 3.10.20201229031520
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201227031524 to 3.10.20201229031520.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201227031524...3.10.20201229031520)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-29 03:39:12 +00:00
dependabot-preview[bot]
242bb0db32
Merge pull request #4799 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201227033512 2020-12-28 11:00:21 +00:00
dependabot-preview[bot]
a818f5e1d3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201225035427 to 0.1.0-prerelease.20201227033512.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201225035427...0.1.0-prerelease.20201227033512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-28 10:46:46 +00:00
dependabot-preview[bot]
3390be7e83
Merge pull request #4798 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201227031524 2020-12-27 03:34:19 +00:00
dependabot-preview[bot]
a5e70ee345
Bump scratch-l10n from 3.10.20201226031447 to 3.10.20201227031524
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201226031447 to 3.10.20201227031524.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201226031447...3.10.20201227031524)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-27 03:20:58 +00:00
dependabot-preview[bot]
9e11e88f64
Merge pull request #4797 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201226031447 2020-12-26 03:38:43 +00:00
dependabot-preview[bot]
d02d534f05
Bump scratch-l10n from 3.10.20201225031621 to 3.10.20201226031447
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201225031621 to 3.10.20201226031447.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201225031621...3.10.20201226031447)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-26 03:24:23 +00:00