scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
8051 commits 216 branches 1 tag 474 MiB
Commit graph

8051 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Paul Kaplan
04c93c68da
Update main.yml 2021-06-09 11:48:59 -04:00
Paul Kaplan
398bf3f109
Update main.yml 2021-06-09 11:46:48 -04:00
Paul Kaplan
b250f30486
Update main.yml 2021-06-09 11:45:04 -04:00
Paul Kaplan
56b351c604
Update main.yml 2021-06-09 11:38:02 -04:00
Paul Kaplan
238a6704af
Update main.yml 2021-06-09 11:35:44 -04:00
Paul Kaplan
7469ce488d
Update main.yml 2021-06-09 11:26:03 -04:00
Paul Kaplan
8df9213ad1
Update main.yml 2021-06-09 11:09:30 -04:00
Paul Kaplan
f149b98fa2
Update main.yml 2021-06-09 11:08:07 -04:00
Paul Kaplan
0740a51e04
Update main.yml 2021-06-09 11:04:17 -04:00
Paul Kaplan
04fb00f45c
Update main.yml 2021-06-09 11:03:13 -04:00
Paul Kaplan
04d93b9903
Try again to automate release branch creation 2021-06-09 10:58:32 -04:00
Paul Kaplan
d34d863242
Try creating a github action to automate release branch creation 2021-06-09 10:52:28 -04:00
Eric Rosenbaum
b7eb303217
Merge pull request #5568 from ericrosenbaum/hide-validation 
Hide validation message on click outside
 2021-06-09 09:56:04 -04:00
picklesrus
b65ab82a89
Merge pull request #5561 from picklesrus/project-comments 
handle project comments turned off
 2021-06-09 09:41:44 -04:00
Sarah Otts
a1178f7ae1
Merge pull request #5567 from seotts/muted-update-session 
When a user gets muted, update mute status in the session
 2021-06-09 09:17:21 -04:00
picklesrus
0edd946fee Address review comments 2021-06-09 09:08:16 -04:00
dependabot-preview[bot]
7cbff4bd18
Merge pull request #5571 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210609041525 2021-06-09 11:00:09 +00:00
dependabot-preview[bot]
4077e0ff6b
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210606094924 to 0.1.0-prerelease.20210609041525.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210606094924...0.1.0-prerelease.20210609041525)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-09 10:39:32 +00:00
dependabot-preview[bot]
669d64fe46
Merge pull request #5569 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210609031630 2021-06-09 03:52:45 +00:00
dependabot-preview[bot]
f653c60c5e
Bump scratch-l10n from 3.11.20210608031537 to 3.11.20210609031630 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210608031537 to 3.11.20210609031630.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210608031537...3.11.20210609031630)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-09 03:35:20 +00:00
Eric Rosenbaum
d9169e1892 catch errors 2021-06-08 14:55:37 -04:00