scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-17 19:12:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8339 commits 221 branches 1 tag 516 MiB
Commit graph

8339 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eric Rosenbaum
0e49452fc7 expand replies 2021-06-17 09:49:23 -04:00
Sarah Otts
3e6f0c70fd
Merge pull request #5625 from seotts/revert-muted-add-proj 
Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-…
 2021-06-17 09:05:10 -04:00
seotts
5b7127a271 Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page" 
This reverts commit d468072552, reversing
changes made to 469878a2fc.
 2021-06-17 09:02:31 -04:00
dependabot-preview[bot]
230bd332f7
Merge pull request #5624 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210617035831 2021-06-17 11:01:42 +00:00
dependabot-preview[bot]
ef87bf238a
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210616035726 to 0.1.0-prerelease.20210617035831.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210616035726...0.1.0-prerelease.20210617035831)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-17 10:43:34 +00:00
dependabot-preview[bot]
1c2bf2bb16
Merge pull request #5623 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210617031540 2021-06-17 04:08:16 +00:00
dependabot-preview[bot]
8b784fc418
Bump scratch-l10n from 3.13.20210616143212 to 3.13.20210617031540 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210616143212 to 3.13.20210617031540.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210616143212...3.13.20210617031540)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-17 03:49:43 +00:00
Eric Rosenbaum
48c3032f54 load single comment 2021-06-16 17:42:40 -04:00
Benjamin Wheeler
d8df10e288
Merge pull request #5594 from benjiwheeler/trouble-maintenance-icons 
update maintenance and trouble page static content
 2021-06-16 14:54:42 -04:00
dependabot-preview[bot]
d10a7ddcdd
Merge pull request #5616 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210616035726 2021-06-16 16:00:40 +00:00
Karishma Chadha
8821e0e865 Studio creators and managers can delete their own comments 2021-06-16 11:17:43 -04:00
dependabot-preview[bot]
b38386c56c
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210615041617 to 0.1.0-prerelease.20210616035726.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210615041617...0.1.0-prerelease.20210616035726)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-16 15:02:54 +00:00
dependabot-preview[bot]
dec7833123
Merge pull request #5619 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210616143212 2021-06-16 14:57:52 +00:00
dependabot-preview[bot]
f091fc9b3c
Bump scratch-l10n from 3.12.20210615031544 to 3.13.20210616143212 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210615031544 to 3.13.20210616143212.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210615031544...3.13.20210616143212)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-16 14:38:22 +00:00
ericrosenbaum
73b2c3f6ae Merge remote-tracking branch 'origin/develop' into release/2021-06-16 2021-06-16 14:35:40 +00:00
Paul Kaplan
43b8b74d0c Move studio info request to top level 2021-06-16 09:55:29 -04:00
Paul Kaplan
4db968970a Use admin routes for studio info, curators, managers and activity 2021-06-16 09:54:40 -04:00
picklesrus
cda92f329d Fix lint 2021-06-15 17:34:05 -04:00
picklesrus
91f1c7ccf9 Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off 
resolve conflicts
 2021-06-15 17:25:22 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off 2021-06-15 17:24:43 -04:00
picklesrus
36516447cc Fix up tests from refactor and fix bug from refactor. 2021-06-15 17:22:32 -04:00
Bryce Taylor
8dc6f69b09
Merge pull request #5614 from BryceLTaylor/run-jest-tests-in-band 
run jest integration tests with --runInBand
 2021-06-15 16:41:13 -04:00
BryceLTaylor
a454686a92 run jest tests with --runInBand 2021-06-15 16:12:40 -04:00
Eric Rosenbaum
7c0ec57165 add loading spinner 2021-06-15 15:35:25 -04:00
Sarah Otts
d468072552
Merge pull request #5573 from seotts/muted-add-proj-via-proj-page 
Muted users can’t add projects to studio via project page
 2021-06-15 15:26:47 -04:00
Eric Rosenbaum
469878a2fc
Merge pull request #5608 from fsih/thumbWhiteBg 
Adjust thumbnail css
 2021-06-15 15:06:09 -04:00
Sarah Otts
a0ab492bd9
Merge branch 'develop' into muted-add-proj-via-proj-page 2021-06-15 14:50:15 -04:00
Eric Rosenbaum
6bbc62c5e3 thumbnail in report matches main thumbnail style 2021-06-15 12:16:33 -04:00
Eric Rosenbaum
a344f1280d style fixes 2021-06-15 12:16:04 -04:00
Sarah Otts
bf9622d924
Merge pull request #5577 from seotts/muted-errors-from-backend 
Show errors when studio edit gets a muted response from backend
 2021-06-15 11:04:05 -04:00
Eric Rosenbaum
cbbd0ebdaf style empty state 2021-06-15 10:51:45 -04:00
seotts
1a753dfde3 Put Add to Studio change behind session flag 2021-06-15 09:45:09 -04:00
seotts
56dc892ee5 Muted user can’t add proj to studio via proj page 2021-06-15 09:45:09 -04:00