Commit graph

6478 commits

Author SHA1 Message Date
picklesrus
0f83b0c7c8
Merge pull request #4655 from picklesrus/use-minutes
Disable comment box functionality when you've just been muted.
2020-11-25 10:18:41 -05:00
dependabot-preview[bot]
c8ea8c4cad
Merge pull request #4688 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201125094839 2020-11-25 10:55:20 +00:00
dependabot-preview[bot]
9401936925
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201124034300 to 0.1.0-prerelease.20201125094839.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201124034300...0.1.0-prerelease.20201125094839)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 10:45:53 +00:00
dependabot-preview[bot]
5a759e54d1
Merge pull request #4687 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201125030848 2020-11-25 03:23:50 +00:00
dependabot-preview[bot]
5aca086934
Bump scratch-l10n from 3.10.20201124030911 to 3.10.20201125030848
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201124030911 to 3.10.20201125030848.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201124030911...3.10.20201125030848)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 03:14:22 +00:00
dependabot-preview[bot]
49c8c818e6
Merge pull request #4685 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201124034300 2020-11-24 11:02:23 +00:00
dependabot-preview[bot]
6d31ca0598
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201122034707 to 0.1.0-prerelease.20201124034300.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201122034707...0.1.0-prerelease.20201124034300)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-24 10:52:57 +00:00
dependabot-preview[bot]
1f46fad3de
Merge pull request #4684 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201124030911 2020-11-24 03:24:17 +00:00
dependabot-preview[bot]
7dfbddd6e1
Bump scratch-l10n from 3.10.20201123030801 to 3.10.20201124030911
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201123030801 to 3.10.20201124030911.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201123030801...3.10.20201124030911)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-24 03:15:00 +00:00
Karishma Chadha
d19d4b2814
Merge pull request #4665 from zoebentley/teacher-accounts-guide-link
Change link to Teacher Account Setup Guide on Educators page
2020-11-23 13:30:52 -05:00
dependabot-preview[bot]
a469663bff
Merge pull request #4679 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201122034707 2020-11-23 12:00:26 +00:00
dependabot-preview[bot]
5fa5804ce0
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201120033059 to 0.1.0-prerelease.20201122034707.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201120033059...0.1.0-prerelease.20201122034707)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 11:50:42 +00:00
dependabot-preview[bot]
b99390eccc
Merge pull request #4677 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201123030801 2020-11-23 03:23:11 +00:00
dependabot-preview[bot]
55cb5346a1
Bump scratch-l10n from 3.10.20201122030806 to 3.10.20201123030801
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201122030806 to 3.10.20201123030801.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201122030806...3.10.20201123030801)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 03:13:25 +00:00
dependabot-preview[bot]
2c8c16cc47
Merge pull request #4675 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201122030806 2020-11-22 03:23:11 +00:00
dependabot-preview[bot]
35aec47803
Bump scratch-l10n from 3.10.20201121030841 to 3.10.20201122030806
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201121030841 to 3.10.20201122030806.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201121030841...3.10.20201122030806)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-22 03:14:00 +00:00
dependabot-preview[bot]
f55166f423
Merge pull request #4673 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201121030841 2020-11-21 03:33:40 +00:00
dependabot-preview[bot]
090c02431f
Bump scratch-l10n from 3.10.20201120030852 to 3.10.20201121030841
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201120030852 to 3.10.20201121030841.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201120030852...3.10.20201121030841)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-21 03:14:22 +00:00
picklesrus
b1f47fb7c1
Merge pull request #4662 from LLK/release/2020-11-19
[Develop] Release/2020 11 19
2020-11-20 09:54:29 -05:00
picklesrus
94094abebe
Merge branch 'develop' into release/2020-11-19 2020-11-20 09:20:56 -05:00
picklesrus
207d2798e8 Merge remote-tracking branch 'upstream/master' into release/2020-11-19 2020-11-20 08:50:21 -05:00
dependabot-preview[bot]
357e3af687
Merge pull request #4672 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201120033059 2020-11-20 13:36:58 +00:00
dependabot-preview[bot]
f1a046fbda
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201119053946 to 0.1.0-prerelease.20201120033059.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201119053946...0.1.0-prerelease.20201120033059)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 13:27:52 +00:00
dependabot-preview[bot]
18dbc4cf6b
Merge pull request #4671 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201120030852 2020-11-20 03:23:11 +00:00
dependabot-preview[bot]
73127936d0
Bump scratch-l10n from 3.10.20201119030912 to 3.10.20201120030852
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201119030912 to 3.10.20201120030852.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201119030912...3.10.20201120030852)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 03:14:37 +00:00
chrisgarrity
ac8f940b78
Merge pull request #4669 from chrisgarrity/release/2020-11-19/revert-autofocus
Revert disabling ask block autofocus
2020-11-19 08:55:59 -05:00
Chris Garrity
77eb6b9091 Revert disabling ask block autofocus 2020-11-19 07:46:27 -05:00
dependabot-preview[bot]
45f7f0362d
Merge pull request #4668 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201119053946 2020-11-19 10:56:51 +00:00
dependabot-preview[bot]
2fbe98aa07
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201118041533 to 0.1.0-prerelease.20201119053946.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201118041533...0.1.0-prerelease.20201119053946)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-19 10:47:59 +00:00
dependabot-preview[bot]
838037f1c7
Merge pull request #4667 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201119030912 2020-11-19 03:24:24 +00:00
dependabot-preview[bot]
dcb6583962
Bump scratch-l10n from 3.10.20201118031039 to 3.10.20201119030912
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201118031039 to 3.10.20201119030912.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201118031039...3.10.20201119030912)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-19 03:14:40 +00:00
picklesrus
71521e2aa5 Fix lint and update text. 2020-11-18 14:48:15 -05:00
picklesrus
fe9d9078b2 Fix styling of disabled comment box. 2020-11-18 14:40:11 -05:00
Zoë Bentley
dad5a34fbe Changed Teacher Accounts Setup Guide link to PDF link on resources server 2020-11-18 12:50:22 -05:00
Zoë Bentley
1bfa0f20a3 Changed Teacher Account Setup Guide link from .doc to .PDF 2020-11-18 12:05:33 -05:00
Ray Schamp
433a5c7100
Merge pull request #4664 from LLK/hotfix/hoc-banner-2020
[Develop] HOC banner 2020
2020-11-18 10:23:56 -05:00
Ray Schamp
470620a12a
Merge pull request #4654 from LLK/hotfix/hoc-banner-2020
[Release] HOC banner 2020
2020-11-18 10:20:53 -05:00
Ray Schamp
f71fcf3da4
Merge pull request #4653 from LLK/hotfix/hoc-banner-2020
[Master] HoC banner 2020
2020-11-18 10:19:47 -05:00
picklesrus
783de90743
Merge pull request #4661 from LLK/develop
Pull develop into release
2020-11-18 08:53:30 -05:00
dependabot-preview[bot]
e5b1ec57ab
Merge pull request #4660 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201118041533 2020-11-18 11:02:45 +00:00
dependabot-preview[bot]
4037750802
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201116035822 to 0.1.0-prerelease.20201118041533.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201116035822...0.1.0-prerelease.20201118041533)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-18 10:53:01 +00:00
dependabot-preview[bot]
627193f94e
Merge pull request #4658 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201118031039 2020-11-18 03:27:48 +00:00
dependabot-preview[bot]
ea0afd2ca3
Bump scratch-l10n from 3.10.20201116030849 to 3.10.20201118031039
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201116030849 to 3.10.20201118031039.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201116030849...3.10.20201118031039)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-18 03:18:54 +00:00
picklesrus
aed0f024c0 Disable comment box functionality when you've just been muted.
Also, keep showing the blue comment status box based on when the mute 
expires rather than basing it on the status of the commet box itself.

TODO: css for disabled state.  The grey is there as a placeholder/proof 
of concept.
2020-11-17 17:04:54 -05:00
Ben Wheeler
a4689fc159 Turn off middle banner and set HoC start and end times for 2020 2020-11-17 15:04:29 -05:00
Ben Wheeler
bd3ef208f6 added makeItFly image and text for HoC banner 2020-11-17 15:04:07 -05:00
Paul Kaplan
2292fc039d
Merge pull request #4649 from LLK/hotfix/sec-page
[Hotfix/Develop] SEC page
2020-11-17 11:17:43 -05:00
Paul Kaplan
42edc22468
Merge pull request #4643 from LLK/hotfix/sec-page
[Hotfix/Master] Add the SEC page
2020-11-17 10:35:32 -05:00
Christopher Willis-Ford
3de583ff30
Merge pull request #4644 from cwillisf/remove-microbit-version
remove version number from micro:bit firmware URL
2020-11-16 13:36:51 -08:00
Paul Kaplan
b92b98bd19 Fix hyphens 2020-11-16 15:19:42 -05:00