scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-03 12:27:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6795 commits 216 branches 1 tag 484 MiB
Commit graph

6795 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
17837af4fd
Merge pull request #4728 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201205031454 2020-12-05 03:31:31 +00:00
dependabot-preview[bot]
5ba480c038
Bump scratch-l10n from 3.10.20201204031520 to 3.10.20201205031454 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201204031520 to 3.10.20201205031454.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201204031520...3.10.20201205031454)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-05 03:20:29 +00:00
Paul Kaplan
02d4a6c9bf
Merge pull request #4725 from LLK/hotfix/sec-google-nolink 
[hotfix/master] Include funding support on Education Collaborative intro
 2020-12-04 10:11:17 -05:00
Karishma Chadha
7a7b8035ae
Merge pull request #4716 from LLK/release/2020-12-02 
[Develop] Release/2020 12 02
 2020-12-04 09:43:29 -05:00
Karishma Chadha
878965d00d
Merge branch 'develop' into release/2020-12-02 2020-12-04 09:32:10 -05:00
Paul Kaplan
591b3ce6a2 Add Google.org to intro paragraph on SEC 2020-12-04 09:13:02 -05:00
dependabot-preview[bot]
a18096d9ac
Merge pull request #4724 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201204090129 2020-12-04 10:53:47 +00:00
dependabot-preview[bot]
c0c03391b9
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201203084644 to 0.1.0-prerelease.20201204090129.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201203084644...0.1.0-prerelease.20201204090129)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-04 10:42:35 +00:00
dependabot-preview[bot]
05950fe1a4
Merge pull request #4723 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201204031520 2020-12-04 03:47:40 +00:00
dependabot-preview[bot]
3bf3572d36
Bump scratch-l10n from 3.10.20201203031604 to 3.10.20201204031520 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201203031604 to 3.10.20201204031520.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201203031604...3.10.20201204031520)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-04 03:37:40 +00:00
BryceLTaylor
ba7e3804be circleci config remove comment 2020-12-03 11:07:31 -05:00
Karishma Chadha
bf1ab7b68a
Merge pull request #4715 from LLK/release/2020-12-02 
[Master] Release 2020 12 02
 2020-12-03 10:32:02 -05:00
Karishma Chadha
0b6d7b605a Revert version of gui to what's on production 2020-12-03 10:11:47 -05:00
BryceLTaylor
eb515205ce circleci config fix release filter for integration job 2020-12-03 10:10:44 -05:00
BryceLTaylor
a5a641863f circleci config clean up for release 2020-12-03 09:38:04 -05:00
dependabot-preview[bot]
53a5ea096a
Merge pull request #4720 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201203084644 2020-12-03 10:49:55 +00:00
dependabot-preview[bot]
089777d93b
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201202090933 to 0.1.0-prerelease.20201203084644.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201202090933...0.1.0-prerelease.20201203084644)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-03 10:39:20 +00:00
dependabot-preview[bot]
590f454058
Merge pull request #4719 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201203031604 2020-12-03 03:42:10 +00:00
dependabot-preview[bot]
0c6b5ae218
Bump scratch-l10n from 3.10.20201202031459 to 3.10.20201203031604 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201202031459 to 3.10.20201203031604.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201202031459...3.10.20201203031604)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-03 03:30:07 +00:00
BryceLTaylor
6f9d98a3c2 circleci config turn off cron job 2020-12-02 17:00:31 -05:00
BryceLTaylor
e0355ed275 circleci config test full deploy 2020-12-02 16:03:03 -05:00
Colby Gutierrez-Kraybill
6dc8d5ec74
Update routes.json 2020-12-02 14:18:47 -05:00
Colby Gutierrez-Kraybill
c92f161fa1
Merge pull request #4717 from LLK/hotfix/gh-4708 
[release] gh-4708
 2020-12-02 13:50:22 -05:00
Colby Gutierrez-Kraybill
f151f8dfeb Missing end optional parameter regex in annual-report 2020-12-02 13:30:15 -05:00
Colby Gutierrez-Kraybill
4973ff4a5d Follow the pattern of other routes, like contact-us for parameter ignoring in annual-report route 2020-12-02 12:16:44 -05:00
Colby Gutierrez-Kraybill
fd6018a92f Allow extra parameters to match annual-report route 2020-12-02 12:07:12 -05:00
Paul Kaplan
191c881406
Merge pull request #4714 from LLK/develop 
Merge develop into release branch
 2020-12-02 09:42:23 -05:00
dependabot-preview[bot]
d73579c629
Merge pull request #4713 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201202090933 2020-12-02 11:07:04 +00:00
dependabot-preview[bot]
3e697caaf9
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201130040734 to 0.1.0-prerelease.20201202090933.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201130040734...0.1.0-prerelease.20201202090933)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 10:55:44 +00:00
dependabot-preview[bot]
68caea68d2
Merge pull request #4712 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201202031459 2020-12-02 03:33:57 +00:00
dependabot-preview[bot]
fbf9199c7b
Bump scratch-l10n from 3.10.20201201031116 to 3.10.20201202031459 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201201031116 to 3.10.20201202031459.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201201031116...3.10.20201202031459)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 03:23:44 +00:00
Paul Kaplan
7a44511591
Merge pull request #4709 from LLK/sec-language-update 
Update the SeC page wording
 2020-12-01 14:05:07 -05:00
Paul Kaplan
f315ea2f15
Update the SeC page wording 
Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.”

Change requested from KO.
 2020-12-01 13:32:36 -05:00
BryceLTaylor
2b881eb307 circleci config use install instead of ci 2020-12-01 10:11:56 -05:00
dependabot-preview[bot]
ee5495cf7c
Merge pull request #4706 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201201031116 2020-12-01 03:27:44 +00:00
dependabot-preview[bot]
3f547a8826
Bump scratch-l10n from 3.10.20201130031158 to 3.10.20201201031116 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201130031158 to 3.10.20201201031116.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201130031158...3.10.20201201031116)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-01 03:16:43 +00:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
BryceLTaylor
1943adca5f circleci config reactivate cron job without newrelic 2020-11-30 14:33:33 -05:00
BryceLTaylor
73206a2d2a remove newrelic to fix circleci build 2020-11-30 14:32:16 -05:00
dependabot-preview[bot]
af3d250bdf
Merge pull request #4705 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201130040734 2020-11-30 11:43:53 +00:00
dependabot-preview[bot]
e881a4371a
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201126215853 to 0.1.0-prerelease.20201130040734.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201126215853...0.1.0-prerelease.20201130040734)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 11:34:16 +00:00
dependabot-preview[bot]
6549d60943
Merge pull request #4704 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201130031158 2020-11-30 03:49:22 +00:00
dependabot-preview[bot]
67bba07a6f
Bump scratch-l10n from 3.10.20201129031117 to 3.10.20201130031158 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201129031117 to 3.10.20201130031158.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201129031117...3.10.20201130031158)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-30 03:39:58 +00:00
dependabot-preview[bot]
88926c1859
Merge pull request #4703 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201129031117 2020-11-29 03:26:42 +00:00
dependabot-preview[bot]
517851a24c
Bump scratch-l10n from 3.10.20201127031123 to 3.10.20201129031117 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201127031123 to 3.10.20201129031117.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201127031123...3.10.20201129031117)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-29 03:16:51 +00:00
dependabot-preview[bot]
d3b6142ddf
Merge pull request #4700 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201126215853 2020-11-27 10:55:37 +00:00
dependabot-preview[bot]
14687ddaca
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201126064348 to 0.1.0-prerelease.20201126215853.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201126064348...0.1.0-prerelease.20201126215853)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-27 10:45:54 +00:00
dependabot-preview[bot]
5867c1795f
Merge pull request #4699 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201127031123 2020-11-27 03:34:26 +00:00
dependabot-preview[bot]
7e1c3b8c51
Bump scratch-l10n from 3.10.20201126030901 to 3.10.20201127031123 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201126030901 to 3.10.20201127031123.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201126030901...3.10.20201127031123)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-27 03:24:01 +00:00
dependabot-preview[bot]
ecd0814dee
Merge pull request #4697 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201126064348 2020-11-26 10:55:56 +00:00