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

8222 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Kaplan
547f5b959b Make column and row gaps the same 2021-06-21 12:36:53 -04:00
Paul Kaplan
d35cee93f1 Fix unneeded variables 2021-06-21 12:34:49 -04:00
Paul Kaplan
1cace60ebd Fix admin panel space remaining after logging out 2021-06-21 12:25:19 -04:00
dependabot-preview[bot]
03ce4470a4
Merge pull request #5642 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210621040041 2021-06-21 11:00:37 +00:00
dependabot-preview[bot]
17c47fac1f
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210618042754 to 0.1.0-prerelease.20210621040041.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210618042754...0.1.0-prerelease.20210621040041)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-21 10:42:47 +00:00
dependabot-preview[bot]
51def6ea87
Merge pull request #5641 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210621031558 2021-06-21 04:04:41 +00:00
dependabot-preview[bot]
22aaa08027
Bump scratch-l10n from 3.13.20210620031657 to 3.13.20210621031558 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210620031657 to 3.13.20210621031558.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210620031657...3.13.20210621031558)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-21 03:45:30 +00:00
dependabot-preview[bot]
3c85961e7a
Merge pull request #5640 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210620031657 2021-06-20 03:42:04 +00:00
dependabot-preview[bot]
76fbdc997b
Bump scratch-l10n from 3.13.20210619031554 to 3.13.20210620031657 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210619031554 to 3.13.20210620031657.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210619031554...3.13.20210620031657)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-20 03:23:11 +00:00
dependabot-preview[bot]
5545c7e648
Merge pull request #5639 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210619031554 2021-06-19 03:40:21 +00:00
dependabot-preview[bot]
688e5b149a
Bump scratch-l10n from 3.13.20210618031601 to 3.13.20210619031554 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210618031601 to 3.13.20210619031554.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210618031601...3.13.20210619031554)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-19 03:21:44 +00:00
Eric Rosenbaum
303d800041
Merge pull request #5632 from ericrosenbaum/add-to-studio-fixes 
Style fixes for "add to studio" modal
 2021-06-18 15:43:33 -04:00
Paul Kaplan
1eb91e22b3
Merge pull request #5631 from paulkaplan/final-studio-routes 
Switch studios route to real version for testing on staging
 2021-06-18 15:41:32 -04:00
Paul Kaplan
6e43607a1d
Merge pull request #5633 from paulkaplan/remove-debug-errors 
Improve errors around following studios
 2021-06-18 15:01:23 -04:00
Paul Kaplan
10bcc2319a Fix typo in translation string 2021-06-18 14:59:32 -04:00
Paul Kaplan
d5e9dd0829
Merge pull request #5609 from fsih/adjustResponsive 
Adjust responsive boundaries for grid reflow
 2021-06-18 14:52:32 -04:00
Paul Kaplan
48958ddba4
Merge pull request #5607 from fsih/textBoxGray 
Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages
 2021-06-18 14:52:18 -04:00
Karishma Chadha
6545b5d314
Merge pull request #5636 from LLK/hotfix/new-emoji 
[Develop] Hotfix new emojis
 2021-06-18 14:16:21 -04:00
Karishma Chadha
e6232df12a
Merge pull request #5635 from LLK/hotfix/new-emoji 
[Master] Hotfix new emojis
 2021-06-18 14:02:28 -04:00
seotts
30aacf813b Add BLM and Pride emoji images 2021-06-18 12:13:43 -04:00
Paul Kaplan
ae202c7bcd Remove Debug component in studios 2021-06-18 11:49:57 -04:00
Paul Kaplan
fa8aff5837 Replace debug error on StudioFollow 2021-06-18 11:27:00 -04:00
Paul Kaplan
4c2b588926 Include react-hooks eslint plugin to prevent hooks usage errors. 
I'm including this now because when implementing the studio follow
error messaging, I made a mistake (conditionally calling useState)
that was tough to track down, and this linter plugin prevents that.
 2021-06-18 11:09:43 -04:00
Sarah Otts
3948a07902
Merge pull request #5627 from seotts/fix-muted-proj-page 
Fix preventing muted users from adding projects via project page
 2021-06-18 10:44:21 -04:00
Eric Rosenbaum
ffdf39282d gray border above done button row 2021-06-18 10:35:19 -04:00
Eric Rosenbaum
06e074bbe8 fix bottom padding 2021-06-18 10:32:02 -04:00
Paul Kaplan
7330bc00f5 Update studios route to final version for testing 2021-06-18 10:29:24 -04:00
Paul Kaplan
2e976e0358 Only request replies if reply_count > 0 2021-06-18 10:14:50 -04:00
dependabot-preview[bot]
a4aa8546fd
Merge pull request #5629 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210618042754 2021-06-18 10:57:58 +00:00
dependabot-preview[bot]
cca5a011cd
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210617035831 to 0.1.0-prerelease.20210618042754.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210617035831...0.1.0-prerelease.20210618042754)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-18 10:35:14 +00:00
dependabot-preview[bot]
6d4f97ed13
Merge pull request #5628 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210618031601 2021-06-18 04:05:18 +00:00
dependabot-preview[bot]
286deaf7c0
Bump scratch-l10n from 3.13.20210617031540 to 3.13.20210618031601 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210617031540 to 3.13.20210618031601.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210617031540...3.13.20210618031601)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-18 03:47:34 +00:00
Eric Rosenbaum
b913d5f3ae restyle nav buttons 2021-06-17 22:50:10 -04:00
seotts
ad3f50ac10 Revert "Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page"" 
This reverts commit 5b7127a271.

# Conflicts:
#	src/views/preview/subactions.jsx
 2021-06-17 17:19:51 -04:00
seotts
60b98908e0 use selectIsMuted to determine whether to show error 2021-06-17 17:18:40 -04:00
picklesrus
2cc413f8ae
Merge pull request #5587 from picklesrus/studio-comments-off 
Studio comments off
 2021-06-17 16:34:27 -04:00
picklesrus
740e8c19b6 Add tests for single comment mode. 2021-06-17 16:27:50 -04:00
picklesrus
fe82cf3873 fix indentation 2021-06-17 15:48:38 -04:00
picklesrus
292bb02483
Merge branch 'develop' into studio-comments-off 2021-06-17 15:46:28 -04:00
Paul Kaplan
588ee63204
Merge pull request #5626 from ericrosenbaum/studio-single-comment 
Studio single comment view
 2021-06-17 15:01:32 -04:00
Paul Kaplan
cf0f4ee6b3
Merge pull request #5620 from paulkaplan/view-deleteted-studios 
Admins can view deleted studios
 2021-06-17 15:00:02 -04:00
Eric Rosenbaum
1605e23d5f fix logic for single comment effect 2021-06-17 14:05:25 -04:00
Eric Rosenbaum
a5800cb8fb revert change to comment limit 2021-06-17 14:04:34 -04:00
picklesrus
7d2d0cb3d9 Fix lint 2021-06-17 13:55:39 -04:00
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off 2021-06-17 13:47:03 -04:00
Eric Rosenbaum
bba5b69cb9
Merge pull request #5617 from LLK/release/2021-06-16 
Develop release/2021-06-16
 2021-06-17 13:17:50 -04:00
Eric Rosenbaum
7b42c0d5b7
Merge pull request #5618 from LLK/release/2021-06-16 
Master release/2021-06-16
 2021-06-17 13:17:09 -04:00
Paul Kaplan
23f7e563ab Include deleted studio banner 2021-06-17 12:37:45 -04:00
Karishma Chadha
f4b0bc8aee
Merge pull request #5621 from kchadha/studio-permissions-audit 
Studio creators and managers can delete their own comments
 2021-06-17 12:21:40 -04:00
Eric Rosenbaum
8c9cc0e859 load more button style 2021-06-17 10:03:24 -04:00