scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 00:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6663 commits 221 branches 1 tag 506 MiB
Commit graph

6663 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
a55f43d1a1
Merge pull request #4663 from LLK/release/2020-11-19 
Release/2020 11 19
 2020-11-20 09:15:24 -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
seotts
f75337dafd preload spinner image 2020-11-19 10:27:01 -05: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
BryceLTaylor
3419a328e3 circleCI config turn test cron job back on 2020-11-17 15:09:43 -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
BryceLTaylor
f682d20200 circleCI config increase container size 2020-11-17 15:01:44 -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
BryceLTaylor
a335988be9 circleCI config remove cron job testing build 2020-11-17 10:37:05 -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
Paul Kaplan
2799bc97f6 Fix lint error 2020-11-16 14:39:37 -05:00
seotts
cf9cbdf392 Hide iframe & show spinner until it begins playing 2020-11-16 14:33:46 -05:00
Paul Kaplan
ee645b250a Add culturally sustaining link 2020-11-16 14:31:31 -05:00
Christopher Willis-Ford
35839ada12 remove version number from micro:bit firmware URL 
This new URL will be a redirect to the actual file, including the
version number. This way we'll be able to deploy firmware updates
without needing to change any content in this repository.
 2020-11-16 11:04:36 -08:00
seotts
cb01cb9321 use Wistia api to do callback 2020-11-16 12:36:07 -05:00
picklesrus
21494d9291
Merge pull request #4641 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201116035822 
Bump scratch-gui from 0.1.0-prerelease.20201112102118 to 0.1.0-prerelease.20201116035822
 2020-11-16 11:38:41 -05:00
picklesrus
46d94c118e
Merge pull request #4640 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201116030849 
Bump scratch-l10n from 3.10.20201026030842 to 3.10.20201116030849
 2020-11-16 11:37:59 -05:00
BryceLTaylor
c3d756b8cc circleCI config fix cron job 2020-11-16 11:30:05 -05:00
BryceLTaylor
295a7daa6f circleCI config add chron job to test the build job every 15 minutes 2020-11-16 11:28:31 -05:00
Paul Kaplan
550a661687 Add SEC page 2020-11-16 10:35:40 -05:00
picklesrus
b1f7a2be10
Merge pull request #4637 from picklesrus/use-minutes 
Convert mute timestamp to always show in minutes.
 2020-11-16 10:28:55 -05:00
Karishma Chadha
760e303d30
Merge pull request #4617 from kchadha/annual-report-data-cleanup 
Annual Report - Break out supporters list into separate JSON
 2020-11-16 10:15:28 -05:00
Karishma Chadha
4728e3f50e
Merge pull request #4615 from kchadha/annual-report-link 
Add link to annual report from about page
 2020-11-16 10:15:02 -05:00
dependabot-preview[bot]
a212318b4d
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201112102118 to 0.1.0-prerelease.20201116035822.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201112102118...0.1.0-prerelease.20201116035822)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-16 11:21:31 +00:00
dependabot-preview[bot]
d9c6be6f74
Bump scratch-l10n from 3.10.20201026030842 to 3.10.20201116030849 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201026030842 to 3.10.20201116030849.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201026030842...3.10.20201116030849)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-16 03:15:41 +00:00