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

8276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Otts
a7dae0561b
Merge branch 'develop' into muted-errors-from-backend 2021-06-14 15:40:05 -04:00
dependabot-preview[bot]
eb2c963413
Merge pull request #5603 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.12.20210614183204 2021-06-14 18:56:13 +00:00
dependabot-preview[bot]
88211c2d1b
Bump scratch-l10n from 3.11.20210614031633 to 3.12.20210614183204 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210614031633 to 3.12.20210614183204.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210614031633...3.12.20210614183204)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 18:37:55 +00:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021 
Bump Conference 2020 to 2021 (Take 2)
 2021-06-14 09:01:51 -04:00
dependabot-preview[bot]
8a686311cd
Merge pull request #5600 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210614040305 2021-06-14 10:58:09 +00:00
dependabot-preview[bot]
01a93e3adf
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210611035846 to 0.1.0-prerelease.20210614040305.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210611035846...0.1.0-prerelease.20210614040305)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 10:36:02 +00:00
dependabot-preview[bot]
cb2e9b22b2
Merge pull request #5597 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210614031633 2021-06-14 04:01:07 +00:00
dependabot-preview[bot]
4c9cc533d3
Bump scratch-l10n from 3.11.20210613031652 to 3.11.20210614031633 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210613031652 to 3.11.20210614031633.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210613031652...3.11.20210614031633)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 03:41:51 +00:00
DD Liu
2d884eef64
Merge pull request #5578 from fsih/whiteButtons 
Make the default nav button state white
 2021-06-13 23:07:33 -04:00
DD Liu
deb1f5eb7e
Merge pull request #5580 from fsih/titleLimit 
Make the title scroll after a certain length, and long words wrap
 2021-06-13 23:07:23 -04:00
dependabot-preview[bot]
70acd3b225
Merge pull request #5596 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210613031652 2021-06-13 03:42:44 +00:00
dependabot-preview[bot]
e97921cf8d
Bump scratch-l10n from 3.11.20210612031607 to 3.11.20210613031652 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210612031607 to 3.11.20210613031652.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210612031607...3.11.20210613031652)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-13 03:23:39 +00:00
dependabot-preview[bot]
f3718d6763
Merge pull request #5595 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210612031607 2021-06-12 03:40:15 +00:00
dependabot-preview[bot]
46150c9980
Bump scratch-l10n from 3.11.20210611210725 to 3.11.20210612031607 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611210725 to 3.11.20210612031607.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611210725...3.11.20210612031607)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-12 03:21:56 +00:00
Ben Wheeler
ecf3f004e6 updated maintenance and trouble page static content 2021-06-11 18:29:40 -04:00
dependabot-preview[bot]
0c635fb0d1
Merge pull request #5593 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210611210725 2021-06-11 21:31:12 +00:00
dependabot-preview[bot]
b6328ee0de
Bump scratch-l10n from 3.11.20210611031724 to 3.11.20210611210725 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611031724 to 3.11.20210611210725.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611031724...3.11.20210611210725)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-11 21:13:16 +00:00
Karishma Chadha
8ab13436c0
Merge pull request #5588 from kchadha/manager-limit 
Studio Manager Limit
 2021-06-11 16:39:27 -04:00
Karishma Chadha
85beabad19 Remove unneded redux connect code 2021-06-11 15:58:22 -04:00
Karishma Chadha
c773018c8e Update managerCount in redux when promoting a curator or removing a manager. 2021-06-11 15:55:28 -04:00
Eric Rosenbaum
4864913658
Merge pull request #5585 from ericrosenbaum/add-to-studio-empty-states-and-done-btn 
"Add to studio" modal empty states and done button
 2021-06-11 15:04:19 -04:00
Karishma Chadha
75687e52f7 Remove commented out CSS styling 2021-06-11 14:17:21 -04:00
Paul Kaplan
0bc9a92c4f
Merge pull request #5575 from LLK/release/2021-06-09 
Develop release/2021-06-09
 2021-06-11 10:38:34 -04:00
dependabot-preview[bot]
ad4c52da84
Merge pull request #5591 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210611035846 2021-06-11 11:01:33 +00:00
dependabot-preview[bot]
5d94af2dc4
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210610000654 to 0.1.0-prerelease.20210611035846.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210610000654...0.1.0-prerelease.20210611035846)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-11 10:44:25 +00:00
dependabot-preview[bot]
fdbdc9e7ca
Merge pull request #5589 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210611031724 2021-06-11 03:46:45 +00:00
dependabot-preview[bot]
b6c769bd46
Bump scratch-l10n from 3.11.20210610031613 to 3.11.20210611031724 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210610031613 to 3.11.20210611031724.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210610031613...3.11.20210611031724)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-11 03:29:21 +00:00
Karishma Chadha
6486f119a3 fix trailing space issue 2021-06-10 19:40:53 -04:00
Karishma Chadha
9fc2f8167d Fix prop warning in the studio curator invite box. 2021-06-10 19:24:54 -04:00
Karishma Chadha
96aeabd255 Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit. 2021-06-10 19:24:25 -04:00
Karishma Chadha
40b8f5a5c9 Update styling of promote modal so that if we get a network or other server error while trying to promote, we see the error message in the modal (and closer to the promote button). 2021-06-10 19:22:22 -04:00
Karishma Chadha
51858167c9 Display manager limit modal in two scenarios: if the frontend already knows that the manager limit has been reached, and if we have the promote modal up, but we got response from the server that the manager limit has been reached. 2021-06-10 19:20:51 -04:00
Karishma Chadha
e0e53b8d73 Create manager limit modal (modeled off of the promote-curator modal) which will be displayed if the user clicks promote when the manager limit has already been reached. 2021-06-10 19:17:07 -04:00
Karishma Chadha
ce8e270309 Set up state, tracking the number of managers the limits used to display info to the user. Handle new error response when trying to promote a curator. 2021-06-10 19:13:48 -04:00
picklesrus
17307cacd3 Add tests 2021-06-10 16:51:41 -04:00
picklesrus
fcbcef244b Show a status message in place of the usual comment components when studio comments are turned off. 2021-06-10 15:36:48 -04:00
Paul Kaplan
7f03b4265d
Merge pull request #5576 from LLK/release/2021-06-09 2021-06-10 13:09:21 -04:00
Eric Rosenbaum
c7ba97d291 Empty state styling 2021-06-10 10:52:23 -04:00
dependabot-preview[bot]
f495fbc0cf
Merge pull request #5582 from LLK/dependabot/npm_and_yarn/ws-5.2.3 2021-06-10 11:26:19 +00:00
dependabot-preview[bot]
72aa18d351
[Security] Bump ws from 5.2.2 to 5.2.3 
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3. **This update includes a security fix.**
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-10 11:09:11 +00:00
dependabot-preview[bot]
7aea13e607
Merge pull request #5583 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210610000654 2021-06-10 11:06:04 +00:00
dependabot-preview[bot]
b374ad98e5
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210609041525 to 0.1.0-prerelease.20210610000654.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210609041525...0.1.0-prerelease.20210610000654)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-10 10:41:22 +00:00
dependabot-preview[bot]
6e59d25a1f
Merge pull request #5581 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210610031613 2021-06-10 04:01:31 +00:00
dependabot-preview[bot]
1107e64d52
Bump scratch-l10n from 3.11.20210609031630 to 3.11.20210610031613 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210609031630 to 3.11.20210610031613.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210609031630...3.11.20210610031613)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-10 03:43:19 +00:00
Eric Rosenbaum
b6a91adf78 add empty states and done button 2021-06-09 17:38:22 -04:00
DD Liu
ee95a708b5 Make the title scroll after a certain length, and long words wrap 2021-06-09 14:57:53 -04:00
seotts
4f25a2ae34 Don’t show errors for toggling openToAll or commentsAllowed 2021-06-09 14:08:52 -04:00
seotts
91d66cd20b Display backend mute errors on studio edit 2021-06-09 14:08:51 -04:00
paulkaplan
6f83650835 Merge remote-tracking branch 'origin/develop' into release/2021-06-09 2021-06-09 15:55:02 +00:00
Paul Kaplan
68460611d8
Update main.yml 2021-06-09 11:54:19 -04:00