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 4
6152 commits 216 branches 1 tag 475 MiB
Commit graph

6152 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Wheeler
11ad1aeac1
Merge pull request #4474 from JeffaloBob/patch-1 
add missing space to teacher request form
 2020-10-15 13:29:23 -04:00
dependabot-preview[bot]
4c32af9250
Merge pull request #4515 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201014121025 2020-10-14 13:27:52 +00:00
dependabot-preview[bot]
ea737097f2
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201012162052 to 0.1.0-prerelease.20201014121025.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201012162052...0.1.0-prerelease.20201014121025)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-14 13:03:16 +00:00
dependabot-preview[bot]
b5090d8e53
Merge pull request #4511 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201014030746 2020-10-14 11:25:16 +00:00
dependabot-preview[bot]
84e7ed841b
Bump scratch-l10n from 3.10.20201007030856 to 3.10.20201014030746 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201007030856 to 3.10.20201014030746.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201007030856...3.10.20201014030746)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-14 11:17:37 +00:00
Sarah Otts
7323ef06bd
Merge pull request #4477 from LLK/people-grid-component 
Pull out the credit page's grid of people into a separate component
 2020-10-13 11:26:24 -04:00
Bryce Taylor
c24dc24d28
Merge pull request #4496 from BryceLTaylor/skip-failing-project-page-test 
Skip failing project page test
 2020-10-13 11:06:25 -04:00
Benjamin Wheeler
8882840451
Merge pull request #4318 from Nambaseking01/patch-1 
Minor grammar fix in FAQ
 2020-10-13 11:02:08 -04:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status 
Commenting status component.
 2020-10-13 09:03:41 -04:00
picklesrus
966df020f2
Merge pull request #4482 from picklesrus/m-modal-draft 
Initial skeleton of mute modal.
 2020-10-13 09:02:47 -04:00
dependabot-preview[bot]
1521836550
Merge pull request #4507 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201012162052 2020-10-13 02:42:14 +00:00
dependabot-preview[bot]
e34e443341
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201009230915 to 0.1.0-prerelease.20201012162052.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201009230915...0.1.0-prerelease.20201012162052)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-13 02:31:10 +00:00
DD Liu
62df188684
Merge pull request #4497 from LLK/hotfix/remove-onerror 
[Develop] Hotfix/remove onerror
 2020-10-09 19:39:59 -04:00
DD Liu
b95686c7bd Update to hotfix gui version 2020-10-09 19:11:40 -04:00
BryceLTaylor
77280752c0 Update Chromedriver to 86 2020-10-09 11:46:02 -04:00
BryceLTaylor
d504fa3cb3 Skip project page copy link integration test 2020-10-09 11:45:01 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
Bryce Taylor
c3f59957d7
Merge pull request #4465 from BryceLTaylor/Move-project-page-tests 
Move project page tests
 2020-10-08 11:20:03 -04:00
chrisgarrity
8b6a4dd8fa
Merge pull request #4489 from LLK/release/2020-10-07 
[Master] Release Oct 7 2020
 2020-10-08 09:32:02 -04:00
picklesrus
a9e8f8176d
Merge pull request #4492 from LLK/develop 
Re-pull develop into release to get new gui.
 2020-10-07 15:42:07 -04:00
chrisgarrity
b35a72ad97
Merge pull request #4491 from chrisgarrity/updategui 
force update of gui to 20201007191300
 2020-10-07 15:41:08 -04:00
Chris Garrity
7ca8bf1a2c force update of gui to 20201007191300 2020-10-07 15:36:43 -04:00
dependabot-preview[bot]
7d6cadafe7
Merge pull request #4486 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201007030856 2020-10-07 15:21:31 +00:00
dependabot-preview[bot]
4930374d2d
Bump scratch-l10n from 3.10.20200930030848 to 3.10.20201007030856 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200930030848 to 3.10.20201007030856.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200930030848...3.10.20201007030856)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-07 14:53:07 +00:00
Paul Kaplan
657d08fc37
Merge pull request #4485 from LLK/develop 
Merge develop to release/2020-10-07
 2020-10-07 09:37:03 -04:00
dependabot-preview[bot]
a8be76f7ee
Merge pull request #4476 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201001151313 2020-10-07 13:07:20 +00:00
Bryce Taylor
b5e2ae705b
Note logged out tests in test/integration/project-page.test.js 
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
 2020-10-06 16:52:07 -04:00
Bryce Taylor
60c6bb8d2c
Add default project id to test/integration/project-page.test.js 
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
 2020-10-06 16:51:31 -04:00
Bryce Taylor
4072d479c3
Update README.md 
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
 2020-10-06 16:50:44 -04:00
Bryce Taylor
d8306f65ff
Merge pull request #4469 from BryceLTaylor/move-join-tests-to-jest 
Move join integration tests to Jest, add some tests
 2020-10-06 15:43:37 -04:00
picklesrus
abb0140088
Merge pull request #4456 from picklesrus/test-travis-int 
Only run integration/smoke tests on specific branches
 2020-10-06 13:54:31 -04:00
Chris Willis-Ford
5f6315e6a1
Merge pull request #4263 from LLK/hotfix/rename-scratch-desktop-to-scratch 
[Develop] finish renaming 'Scratch Desktop' to 'Scratch'
 2020-10-05 10:29:45 -07:00
picklesrus
eccf6be8d2 Add test for mute modal. 2020-10-05 11:09:54 -04:00
picklesrus
6e72f6b4ee Add mute-step unit test. 2020-10-05 08:49:05 -04:00
picklesrus
405ee52e50 First draft of the mute modal. 2020-10-02 15:59:33 -04:00
seotts
faf5a127d6 remove people grid padding 2020-10-02 15:43:22 -04:00
Karishma Chadha
e2da0b5250 Fix lint issues in people grid component 2020-10-02 15:43:22 -04:00
seotts
b7b3123217 add newline at end of file for linting 2020-10-02 15:43:22 -04:00
seotts
23f6ce281c remove duplicated css from credits page 2020-10-02 15:43:22 -04:00
seotts
204c532c4e connect PeopleGrid to css 2020-10-02 15:43:22 -04:00
seotts
74d18822e6 Make PeopleGrid component 2020-10-02 15:43:22 -04:00
picklesrus
6a6b90ebee
Merge pull request #4471 from LLK/release/2020-10-01 
[Develop]Release/2020 10 01
 2020-10-02 09:21:18 -04:00
dependabot-preview[bot]
8f808aef95
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200929205858 to 0.1.0-prerelease.20201001151313.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200929205858...0.1.0-prerelease.20201001151313)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-02 10:19:09 +00:00
Jeffalo
03c6335fa5
added semicolon sorry 2020-10-02 08:16:04 +02:00
Jeffalo
c7f2f942d7
add non breaking space to real name warning 2020-10-02 07:14:23 +02:00
picklesrus
0288454aa6
Merge pull request #4472 from LLK/release/2020-10-01 
Release/2020 10 01
 2020-10-01 15:23:45 -04:00
Christopher Willis-Ford
4415f4249d update app name to 'Scratch 3', not 'Scratch' 2020-10-01 11:57:44 -07:00
picklesrus
9ee2a4b04a
Merge pull request #4470 from LLK/develop 
Merge develop into release
 2020-09-30 15:24:46 -04:00
BryceLTaylor
7a50c04885 Move join integration tests to Jest, add some tests 2020-09-30 14:30:00 -04:00
dependabot-preview[bot]
63898a1b9d
Merge pull request #4467 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200930030848 2020-09-30 10:18:37 +00:00