scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 17:45:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6547 commits 216 branches 1 tag 475 MiB
Commit graph

6547 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
picklesrus
0470e0e56b Convert timestamp to always show in minutes. 
This is minor step towards correct time formatting. More coming later.
 2020-11-13 15:03:49 -05:00
picklesrus
bfc4202d11 Use singular units so the library handles plurals. 2020-11-13 14:14:42 -05:00
Benjamin Wheeler
79d3d07dcc
Merge pull request #4284 from doc-han/patch-1 
update translation URL
 2020-11-13 14:13:16 -05:00
Ben Wheeler
f2111eb5a3 updated number of languages 2020-11-13 14:11:25 -05:00
picklesrus
13369c3809 add spaces 2020-11-13 08:37:18 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days. 
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
 2020-11-13 08:26:54 -05:00
Benjamin Wheeler
061c46ad6a
Merge pull request #4286 from R4356th/patch-10 
Delete all Community Blocks Interview related files
 2020-11-12 13:53:51 -05:00
Ben Wheeler
ccf0e92e98 removed communityblocks-interviews from routeAlias entries 2020-11-12 13:43:33 -05:00
Radman Siddiki
89c5ea324b Remove Community Blocks Interviews Route 2020-11-12 13:43:33 -05:00
Radman Siddiki
0bd36c9543 Delete consent_for_parent.pdf 2020-11-12 13:43:33 -05:00
Radman Siddiki
4b33de8934 Delete assent_form.pdf 2020-11-12 13:43:33 -05:00
Radman Siddiki
b74d857ad9 Delete communityblocks-interviews.jsx 2020-11-12 13:43:33 -05:00
Radman Siddiki
534d8b9be5 Delete consent_for_over_18.pdf 2020-11-12 13:43:33 -05:00
picklesrus
87d3d7845b
Merge pull request #4630 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201112102118 
Bump scratch-gui from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118
 2020-11-12 06:58:27 -05:00
dependabot-preview[bot]
94d7e9cc93
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201105040602...0.1.0-prerelease.20201112102118)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-12 10:45:47 +00:00
Karishma Chadha
e14b6d52f3 Add spinner while video is still loading 2020-11-10 14:37:18 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior 
Skeleton of code to show mute modal and comment status.
 2020-11-10 10:24:04 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates 
A few small upates to the muting modal
 2020-11-10 09:52:41 -05:00
Ray Schamp
5b80590b8b
Merge pull request #3913 from LLK/dependabot/npm_and_yarn/lodash.defaultsdeep-4.6.1 
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1
 2020-11-09 14:13:23 -05:00
dependabot-preview[bot]
3a36d27c08
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1 
Bumps [lodash.defaultsdeep](https://github.com/lodash/lodash) from 3.10.0 to 4.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/3.10.0...4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-09 19:13:07 +00:00
Ray Schamp
efa75e8412
Merge pull request #3914 from LLK/dependabot/npm_and_yarn/lodash.mergewith-4.6.2 
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2
 2020-11-09 14:11:07 -05:00
dependabot-preview[bot]
170359db61
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-09 19:10:07 +00:00
dependabot-preview[bot]
a3497fda2e
Merge pull request #3915 from LLK/dependabot/npm_and_yarn/react-dom-16.2.1 2020-11-09 19:09:30 +00:00
dependabot-preview[bot]
339524ecb7
Merge pull request #3945 from LLK/dependabot/npm_and_yarn/lodash.merge-4.6.2 2020-11-09 19:08:07 +00:00