Commit graph

8339 commits

Author SHA1 Message Date
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute 2021-01-14 07:47:47 -05:00
picklesrus
55d69b0e7b merge 2021-01-14 07:43:53 -05:00
picklesrus
47d63cb529 Reset more of the state when a mute expires.
This allows the comment box to show up again in a normal state with no 
errors.
2021-01-14 07:42:53 -05:00
dependabot-preview[bot]
bbef2eefac
Merge pull request #4852 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210114042314 2021-01-14 10:58:17 +00:00
dependabot-preview[bot]
7a535a9bd0
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210112040114 to 0.1.0-prerelease.20210114042314.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210112040114...0.1.0-prerelease.20210114042314)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-14 10:43:50 +00:00
dependabot-preview[bot]
a594df2603
Merge pull request #4850 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210114031436 2021-01-14 03:39:42 +00:00
dependabot-preview[bot]
30fac77ae8
Bump scratch-l10n from 3.10.20210112031449 to 3.10.20210114031436
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210112031449 to 3.10.20210114031436.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210112031449...3.10.20210114031436)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-14 03:24:52 +00:00
Paul Kaplan
d27f301b91
Merge pull request #4848 from LLK/develop
Update relase branch with SEC update that went into develop
2021-01-13 10:20:28 -05:00
Paul Kaplan
8e87f82f92
Merge pull request #4843 from paulkaplan/sec-update
Update SEC page content
2021-01-13 10:18:56 -05:00
Paul Kaplan
e1d0329633 Fix lint issues again 2021-01-13 09:39:36 -05:00
Eric Rosenbaum
bbac7357ae
Merge pull request #4845 from LLK/develop
merge from develop to release branch
2021-01-13 09:30:37 -05:00
Paul Kaplan
4ca6e52233 Fix formatting 2021-01-13 09:29:40 -05:00
Paul Kaplan
2a0aa3b03e Add the FAQ 2021-01-13 08:55:22 -05:00
Paul Kaplan
5883070647 Update SEC page content 2021-01-12 15:59:59 -05:00
Benjamin Wheeler
596343048a
Merge pull request #4748 from mxmou/fix-search-loadmore
Fix "Load more" scrolling on search results
2021-01-12 14:51:35 -05:00
picklesrus
19ef91d3d0
Merge pull request #4827 from picklesrus/mute-modal-vertical
Update vertical spacing on mute modal
2021-01-12 10:31:28 -05:00
dependabot-preview[bot]
8a14c0d109
Merge pull request #4841 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210112040114 2021-01-12 11:03:13 +00:00
dependabot-preview[bot]
05c343ad71
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210111042441 to 0.1.0-prerelease.20210112040114.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210111042441...0.1.0-prerelease.20210112040114)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-12 10:48:40 +00:00
dependabot-preview[bot]
491084153b
Merge pull request #4840 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210112031449 2021-01-12 03:54:30 +00:00
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
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