scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 05:22:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9268 commits 222 branches 1 tag 524 MiB
Commit graph

9268 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
BryceLTaylor
83fb28830b circleci update package lock after rebase 2021-03-19 17:09:52 -04:00
BryceLTaylor
e6ac2a8248 circleci remove more references to circleci-configure-tests branch 2021-03-19 17:01:44 -04:00
BryceLTaylor
5c5da095fa circleci rename workflow 2021-03-19 17:01:44 -04:00
BryceLTaylor
7b208b6859 circleci don’t run workflow on circleCI-configure-tests branch 2021-03-19 17:01:44 -04:00
BryceLTaylor
54a81bf1c5 circleci turn off deploy to staging with circle 2021-03-19 17:01:44 -04:00
BryceLTaylor
e4ceaebdc9 circleci turn on build job for production 2021-03-19 17:01:44 -04:00
BryceLTaylor
e6abb412fb circleci use version 3.5 of get-pip.py, not 2.7 2021-03-19 17:01:44 -04:00
BryceLTaylor
b615a038c1 circleci use python3 instead of python to get pip 2021-03-19 17:01:44 -04:00
BryceLTaylor
2c19107746 circleci re-add python setup step, include install pip 2021-03-19 17:01:44 -04:00
BryceLTaylor
52eff51b40 circleci add install s3cmd back in 2021-03-19 17:01:44 -04:00
BryceLTaylor
d1d4ac696f circleci remove update python 2021-03-19 17:01:44 -04:00
BryceLTaylor
ba17ae952f circleci move python setup to its own run step 2021-03-19 17:01:44 -04:00
BryceLTaylor
ec1fea2efd circleci use next-generation docker image 2021-03-19 17:01:44 -04:00
BryceLTaylor
69cedde787 circleci remove checking ubuntu version 2021-03-19 17:01:44 -04:00
BryceLTaylor
98aff9920b circleci fix python install check ubuntu version 2021-03-19 17:01:44 -04:00