Commit graph

6761 commits

Author SHA1 Message Date
dependabot-preview[bot]
19f7b33824
Bump scratch-l10n from 3.10.20210111031613 to 3.10.20210112031449
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210111031613 to 3.10.20210112031449.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210111031613...3.10.20210112031449)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-12 03:40:15 +00:00
Benjamin Wheeler
ee88ac28b6
Merge pull request #4078 from apple502j/patch-20
Add noscript tag
2021-01-11 14:08:30 -05:00
Ben Wheeler
07f6639ef3 changed wording of no javascript message per design team input 2021-01-11 14:04:55 -05:00
apple502j
62d4db7796 Add noscript tag 2021-01-11 14:04:55 -05:00
dependabot-preview[bot]
5e94bcb8f9
Merge pull request #4838 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210111042441 2021-01-11 12:11:21 +00:00
dependabot-preview[bot]
88c8482dfc
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210108041915 to 0.1.0-prerelease.20210111042441.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210108041915...0.1.0-prerelease.20210111042441)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-11 11:57:03 +00:00
dependabot-preview[bot]
3c8512e6ca
Merge pull request #4837 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210111031613 2021-01-11 03:59:58 +00:00
dependabot-preview[bot]
6861176ec8
Bump scratch-l10n from 3.10.20210110031544 to 3.10.20210111031613
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210110031544 to 3.10.20210111031613.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210110031544...3.10.20210111031613)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-11 03:44:45 +00:00
dependabot-preview[bot]
7d0b9b5ba2
Merge pull request #4836 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210110031544 2021-01-10 03:39:58 +00:00
dependabot-preview[bot]
5834358fc9
Bump scratch-l10n from 3.10.20210109031718 to 3.10.20210110031544
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210109031718 to 3.10.20210110031544.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210109031718...3.10.20210110031544)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-10 03:25:20 +00:00
dependabot-preview[bot]
07deef92ef
Merge pull request #4834 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210109031718 2021-01-09 03:37:06 +00:00
dependabot-preview[bot]
0893091271
Bump scratch-l10n from 3.10.20210108031703 to 3.10.20210109031718
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210108031703 to 3.10.20210109031718.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210108031703...3.10.20210109031718)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-09 03:23:02 +00:00
Sarah Otts
14de951497
Merge pull request #4832 from seotts/annual-report-formattedmessage
Remove use of FormattedHTMLMessage in Annual Report
2021-01-08 15:27:53 -05:00
seotts
1aa59edaa3 Remove use of FormattedHTMLMessage 2021-01-08 14:03:29 -05:00
Sarah Otts
eaaee5db5f
Merge pull request #4828 from seotts/fix-automod-messaging
Add back new automod messaging
2021-01-08 10:06:00 -05:00
dependabot-preview[bot]
ed4103ce47
Merge pull request #4830 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210108041915 2021-01-08 11:19:17 +00:00
dependabot-preview[bot]
8459550483
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210107150818 to 0.1.0-prerelease.20210108041915.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210107150818...0.1.0-prerelease.20210108041915)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-08 10:59:30 +00:00
dependabot-preview[bot]
224046800e
Merge pull request #4829 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210108031703 2021-01-08 03:50:17 +00:00
dependabot-preview[bot]
497e9dd212
Bump scratch-l10n from 3.10.20210107031515 to 3.10.20210108031703
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210107031515 to 3.10.20210108031703.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210107031515...3.10.20210108031703)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-08 03:36:28 +00:00
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
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