scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-28 00:12:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8602 commits 224 branches 1 tag 533 MiB
Commit graph

8602 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
c097658b5d
Merge pull request #5101 from picklesrus/remove-unused-deps 
Removed unused dependencies
 2021-03-08 17:33:52 -05:00
picklesrus
b7ff04fb22 fix merge conflicts. Again. 2021-03-08 17:23:53 -05:00
picklesrus
80b243ec0c bring back webpack 2021-03-08 17:22:05 -05:00
picklesrus
3dfcfa1e9d Remove unused tests 2021-03-08 17:22:05 -05:00
picklesrus
613a494bac resolve conflicts 2021-03-08 17:22:05 -05:00
dependabot-preview[bot]
cc3bd510fa
Merge pull request #5105 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308220417 2021-03-08 22:19:40 +00:00
dependabot-preview[bot]
5bc88ead4f
Bump scratch-l10n from 3.11.20210301031451 to 3.11.20210308220417 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210301031451 to 3.11.20210308220417.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210301031451...3.11.20210308220417)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-08 22:10:06 +00:00
Benjamin Wheeler
cadcbbc7c8
Merge pull request #5104 from benjiwheeler/update-chromedriver-second-try 
Bump chromedriver version to 88, increase jest integration timeouts
 2021-03-08 15:47:57 -05:00
Ben Wheeler
466684cea3 updated chromedriver using npm install --save 2021-03-08 15:44:55 -05:00
Benjamin Wheeler
b45001158c
Merge pull request #5103 from LLK/revert-5077-update-chromedriver-88 
Revert "Bump chromedriver version to 88, increase jest integration timeouts"
 2021-03-08 15:23:21 -05:00
Benjamin Wheeler
4c880895fa
Revert "Bump chromedriver version to 88, increase jest integration timeouts" 2021-03-08 15:22:39 -05:00
Paul Kaplan
49e62afa8b Fix typo in mapStateToProps 2021-03-08 12:27:32 -05:00
Paul Kaplan
8b2bb5fe92 Include legacy unit tests when running test:unit 2021-03-08 12:15:23 -05:00
Paul Kaplan
27dafac7f0 Move comments out of project reducer 2021-03-08 12:01:22 -05:00
Bryce Taylor
3d47d394b7
Merge pull request #5077 from BryceLTaylor/update-chromedriver-88 
Bump chromedriver version to 88, increase jest integration timeouts
 2021-03-08 11:57:03 -05:00
Ben Wheeler
1989e0be8b updated chromedriver version and package-lock after rebasing 2021-03-08 10:55:43 -05:00
BryceLTaylor
2933fbce94 Bump chromedriver version to 88, increase jest integration timeouts 2021-03-08 10:23:03 -05:00
dependabot-preview[bot]
97a6869843
Merge pull request #5096 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210308031514 2021-03-08 03:54:43 +00:00
dependabot-preview[bot]
edb4e7f54c
Bump scratch-l10n from 3.11.20210307031517 to 3.11.20210308031514 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210307031517 to 3.11.20210308031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210307031517...3.11.20210308031514)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-08 03:44:53 +00:00
dependabot-preview[bot]
33f43f7b8d
Merge pull request #5093 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210307031517 2021-03-07 03:30:16 +00:00
dependabot-preview[bot]
071fd09085
Bump scratch-l10n from 3.11.20210306031505 to 3.11.20210307031517 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210306031505 to 3.11.20210307031517.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210306031505...3.11.20210307031517)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-07 03:21:07 +00:00
dependabot-preview[bot]
e8a7b27e3c
Merge pull request #5092 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210306031505 2021-03-06 03:30:44 +00:00
dependabot-preview[bot]
78a6fd8e3d
Bump scratch-l10n from 3.11.20210305031531 to 3.11.20210306031505 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210305031531 to 3.11.20210306031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210305031531...3.11.20210306031505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-06 03:21:05 +00:00
dependabot-preview[bot]
c9f2710d33
Merge pull request #5090 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210305031531 2021-03-05 03:42:10 +00:00
dependabot-preview[bot]
874b36fd54
Bump scratch-l10n from 3.11.20210304031526 to 3.11.20210305031531 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210304031526 to 3.11.20210305031531.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210304031526...3.11.20210305031531)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-05 03:32:32 +00:00
Sarah Otts
6d96c7f265
Merge pull request #5088 from seotts/chainmail-message 
Add spam mute message
 2021-03-04 16:47:14 -05:00
Sarah Otts
cfb0a00414
Copy update on spam header 2021-03-04 16:19:39 -05:00
seotts
2cb9189b44 Add spam mute message 2021-03-04 13:49:38 -05:00
Paul Kaplan
35b3c8d6f6
Merge pull request #5084 from LLK/release/2021-03-03 
[develop] Release/2021 03 03
 2021-03-04 12:11:12 -05:00
Paul Kaplan
f51ece2576
Merge pull request #5083 from LLK/release/2021-03-03 
[master] Release 2021-03-03
 2021-03-04 11:17:50 -05:00
dependabot-preview[bot]
28b4340d5a
Merge pull request #5087 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210304031526 2021-03-04 03:35:13 +00:00
dependabot-preview[bot]
0633ef908d
Bump scratch-l10n from 3.11.20210303031534 to 3.11.20210304031526 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210303031534 to 3.11.20210304031526.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210303031534...3.11.20210304031526)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-04 03:26:00 +00:00
Sarah Otts
c43d68c5f2
Merge pull request #5085 from LLK/revert-5078-content-updates-jan-2021 
Revert "Content updates march 2021"
 2021-03-03 15:40:02 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021" 2021-03-03 15:39:25 -05:00
Paul Kaplan
c65f180182
Merge pull request #5082 from LLK/develop 
Merge develop into release branch 2021-03-03
 2021-03-03 08:49:24 -05:00
picklesrus
4a9b0a1c04
Merge pull request #5079 from LLK/dependabot/npm_and_yarn/google-libphonenumber-3.2.18 
Bump google-libphonenumber from 3.2.6 to 3.2.18
 2021-03-03 06:39:20 -05:00
dependabot-preview[bot]
7f4efc3583
Merge pull request #5081 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210302213127 2021-03-03 11:00:39 +00:00
dependabot-preview[bot]
8e5a5dc3cc
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210302023702 to 0.1.0-prerelease.20210302213127.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210302023702...0.1.0-prerelease.20210302213127)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-03 10:51:01 +00:00
dependabot-preview[bot]
11a7e173e0
Merge pull request #5080 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210303031534 2021-03-03 03:46:12 +00:00
dependabot-preview[bot]
92ddce84e1
Bump scratch-l10n from 3.11.20210301031451 to 3.11.20210303031534 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210301031451 to 3.11.20210303031534.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210301031451...3.11.20210303031534)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-03 03:36:49 +00:00
dependabot-preview[bot]
5df527a92e
Bump google-libphonenumber from 3.2.6 to 3.2.18 
Bumps [google-libphonenumber](https://github.com/ruimarinho/google-libphonenumber) from 3.2.6 to 3.2.18.
- [Release notes](https://github.com/ruimarinho/google-libphonenumber/releases)
- [Commits](https://github.com/ruimarinho/google-libphonenumber/compare/v3.2.6...v3.2.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-03 00:05:05 +00:00
Sarah Otts
4a625a634a
Merge pull request #5078 from zoebentley/content-updates-jan-2021 
Content updates march 2021
 2021-03-02 16:57:26 -05:00
Zoë Bentley
e2c98762fa Updated people.json 2021-03-02 15:02:23 -05:00
zoebentley
e756d751c6
Update src/views/credits/credits.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:40:57 -05:00
zoebentley
43e2eb22dd
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:31:46 -05:00
zoebentley
695efb77c0
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:28:38 -05:00
zoebentley
eb93e2dd9a
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:28:12 -05:00
zoebentley
d2ec8e804e
Update src/views/credits/credits.scss 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:19:29 -05:00
Zoë Bentley
d41a230e83 Added newline at end of file and changed languages count to be rounded down to 60 2021-03-02 14:09:52 -05:00
Zoë Bentley
7eb8406b8c Reverted to current about page images 2021-03-02 14:00:03 -05:00