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

9233 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
ae04b5da91
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210323153928 to 0.1.0-prerelease.20210324120840.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210323153928...0.1.0-prerelease.20210324120840)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-24 12:33:28 +00:00
dependabot-preview[bot]
9315583690
Merge pull request #5180 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210323153928 2021-03-24 10:58:03 +00:00
dependabot-preview[bot]
917f7901ca
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210323041806 to 0.1.0-prerelease.20210323153928.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210323041806...0.1.0-prerelease.20210323153928)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-24 10:49:59 +00:00
dependabot-preview[bot]
486c0014e5
Merge pull request #5178 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210324031512 2021-03-24 03:41:20 +00:00
dependabot-preview[bot]
eb691f36dd
Bump scratch-l10n from 3.11.20210323031446 to 3.11.20210324031512 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210323031446 to 3.11.20210324031512.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210323031446...3.11.20210324031512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-24 03:33:53 +00:00
Sarah Otts
363236055c
Merge pull request #5175 from seotts/modal-past-mute-messaging 
Show different modal message when already muted
 2021-03-23 17:01:30 -04:00
Eric Rosenbaum
9466a7b75b add grid 2021-03-23 16:58:38 -04:00
seotts
f6f1095d93 add justMuted variable, fix linting 2021-03-23 16:33:24 -04:00
BryceLTaylor
523b31c379 circleci deploy to staging with circle instead of travis 2021-03-23 16:01:09 -04:00
seotts
60bf05fbbf Reuse l10n strings instead of duplicating them 2021-03-23 15:45:16 -04:00
Paul Kaplan
8144b0c2e1 Display permissions selectors in the playground 2021-03-23 15:19:28 -04:00
Paul Kaplan
99195d6df3 Add studio selector and tests 2021-03-23 15:19:01 -04:00
Paul Kaplan
f03fbb503b Add session selector and tests 2021-03-23 15:18:36 -04:00
Paul Kaplan
2265cd0d90 Add permissions selector and tests 2021-03-23 15:18:17 -04:00
seotts
ccab9566b8 Show different modal message when muted in the past 2021-03-23 11:00:01 -04:00
Sarah Otts
20270a43dd
Merge pull request #5154 from LLK/release/2021-03-17 
[Develop] Release 2021-03-17
 2021-03-23 10:09:35 -04:00
Eric Rosenbaum
6080facb66
Merge pull request #5171 from ericrosenbaum/fix-components-page 
Fix components page
 2021-03-23 10:04:17 -04:00
dependabot-preview[bot]
a3a85621e7
Merge pull request #5174 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210323041806 2021-03-23 13:58:45 +00:00
Zoë Bentley
138ed7339e Fixed other place where date appears 2021-03-23 09:57:50 -04:00
dependabot-preview[bot]
507292530a
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210322040541 to 0.1.0-prerelease.20210323041806.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210322040541...0.1.0-prerelease.20210323041806)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-23 13:50:18 +00:00
dependabot-preview[bot]
a3a93ec057
Merge pull request #5172 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210323031446 2021-03-23 03:50:35 +00:00
dependabot-preview[bot]
e741dd7722
Bump scratch-l10n from 3.11.20210322031531 to 3.11.20210323031446 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210322031531 to 3.11.20210323031446.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210322031531...3.11.20210323031446)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-23 03:42:30 +00:00
Eric Rosenbaum
2330553765 re-add the carousel component in a box 2021-03-22 17:27:52 -04:00
Eric Rosenbaum
10f9194f61 fix form and carousel enough to display them 2021-03-22 17:24:18 -04:00
Bryce Taylor
c0d681aea1
Merge pull request #5170 from BryceLTaylor/update-eslint-config 
update eslint-config-scratch to 7.0.0
 2021-03-22 11:18:08 -04:00
Paul Kaplan
cd0ab5dbc8
Merge pull request #5164 from paulkaplan/studio-roles 
Fetch studio info and roles in redux
 2021-03-22 11:09:44 -04:00
Sarah Otts
a087ac4f18
Merge pull request #5165 from zoebentley/conference-update-followup-march-2021 
Made small updates to Scratch 2021 Conference page
 2021-03-22 10:47:53 -04:00
BryceLTaylor
3a4aacfb73 update eslint-config-scratch to 7.0.0 2021-03-22 10:32:54 -04:00
Sarah Otts
059b6bf2c5
Merge pull request #5166 from seotts/message-already-muted 
When a user is already muted, show a different message in the blue box
 2021-03-22 10:20:15 -04:00
dependabot-preview[bot]
4fdd0bd445
Merge pull request #5169 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210322040541 2021-03-22 11:24:58 +00:00
dependabot-preview[bot]
bc30ace5d6
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210319040415 to 0.1.0-prerelease.20210322040541.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210319040415...0.1.0-prerelease.20210322040541)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-22 11:16:40 +00:00
dependabot-preview[bot]
85ffbaba65
Merge pull request #5168 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210322031531 2021-03-22 03:57:35 +00:00
dependabot-preview[bot]
17ed8dbf82
Bump scratch-l10n from 3.11.20210321031436 to 3.11.20210322031531 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210321031436 to 3.11.20210322031531.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210321031436...3.11.20210322031531)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-22 03:49:49 +00:00
dependabot-preview[bot]
605bfed8f6
Merge pull request #5167 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210321031436 2021-03-21 03:28:42 +00:00
dependabot-preview[bot]
04203c8283
Bump scratch-l10n from 3.11.20210319031448 to 3.11.20210321031436 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210319031448 to 3.11.20210321031436.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210319031448...3.11.20210321031436)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-21 03:20:28 +00:00
Bryce Taylor
2fc449d76f
Merge pull request #5019 from LLK/circleCI-configure-tests 
Circle ci configure tests
 2021-03-19 17:28:55 -04:00
BryceLTaylor
177ee69cce fix package-lock.json 2021-03-19 17:19:40 -04:00
BryceLTaylor
d1980857dc Revert "circleci zip the build for testing purposes" 
This reverts commit 3f6b5d2269b84c1e7237805ae3c7f959dcae6410.

# Conflicts:
#	.travis.yml
 2021-03-19 17:09:52 -04:00
BryceLTaylor
5f755524bf Revert "circleci build master to compare travis and circle" 
This reverts commit cc9b2090b9271bd53a1e1ee7cfbd50249ad06ec8.

# Conflicts:
#	.travis.yml
 2021-03-19 17:09:52 -04:00
BryceLTaylor
8757b7de9c circleci zip the build for testing purposes 2021-03-19 17:09:52 -04:00
BryceLTaylor
e29bc578d5 circleci build master to compare travis and circle 2021-03-19 17:09:52 -04:00
BryceLTaylor
482ca6f614 remove mention of ./test/results from readme 2021-03-19 17:09:52 -04:00
BryceLTaylor
ac27f8f589 circleci turn off staging deploy and tests through circle 2021-03-19 17:09:52 -04:00
BryceLTaylor
167d44f6a6 circleci make jest tests use default reporter by default 2021-03-19 17:09:52 -04:00
BryceLTaylor
e605f0b7a0 circleci turn on running staging deploy and integration jobs 2021-03-19 17:09:52 -04:00
BryceLTaylor
ccd78b7692 circleci move creating out put files to circle config for unit tests 2021-03-19 17:09:52 -04:00
BryceLTaylor
031e00232d circleci move creating integration output files to circle config 2021-03-19 17:09:52 -04:00
BryceLTaylor
68e441f938 circleci store build folder as artifact 2021-03-19 17:09:52 -04:00
BryceLTaylor
3c529438a0 circleci config update readme about .test/results 2021-03-19 17:09:52 -04:00
BryceLTaylor
7b3369bddf circleci remove store_artifacts steps from integration tests 2021-03-19 17:09:52 -04:00