Commit graph

7730 commits

Author SHA1 Message Date
Eric Rosenbaum
df30f9bac6 add modal for report received 2021-05-14 16:03:22 -04:00
Eric Rosenbaum
20a342c0a2 Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal
# Conflicts:
#	src/views/studio/studio-report.jsx
2021-05-14 15:20:41 -04:00
Eric Rosenbaum
454ae1e92f don’t use html form 2021-05-14 15:15:27 -04:00
Eric Rosenbaum
3a9742c77e use radio button values in report 2021-05-14 14:51:17 -04:00
Eric Rosenbaum
28a5ee47aa initial work on studio report modal 2021-05-14 11:46:37 -04:00
dependabot-preview[bot]
8984f2cedc
Merge pull request #5413 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.19 2021-05-14 15:03:46 +00:00
dependabot-preview[bot]
176e6fd3f3
Merge pull request #5415 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.25 2021-05-14 15:02:41 +00:00
dependabot-preview[bot]
7c413028ab
Bump @formatjs/intl-locale from 2.4.24 to 2.4.25
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.24 to 2.4.25.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.24...@formatjs/intl-locale@2.4.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-14 14:49:01 +00:00
dependabot-preview[bot]
7f58e68835
Bump @formatjs/intl-pluralrules from 4.0.18 to 4.0.19
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.18 to 4.0.19.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.18...@formatjs/intl-pluralrules@4.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-14 14:48:49 +00:00
Paul Kaplan
132912c5a5
Merge pull request #5410 from paulkaplan/studio-info-cleanup
Minor style cleanups for studio page
2021-05-14 09:43:10 -04:00
Paul Kaplan
44c51a7dc8 Minor style cleanups for studio page 2021-05-14 09:40:56 -04:00
Paul Kaplan
8bc026a958
Merge pull request #5381 from paulkaplan/studio-tile-overflow-menu
Studio tile overflow menu
2021-05-14 09:30:56 -04:00
Paul Kaplan
e9728b8a13
Merge pull request #5388 from paulkaplan/studio-project-errors
Add error display for studio curator and project adder inputs
2021-05-14 09:30:42 -04:00
Paul Kaplan
9f6f973185
Merge pull request #5401 from paulkaplan/studio-recent-students
Show "students projects" filter on studio project browser
2021-05-14 09:24:06 -04:00
Paul Kaplan
d847a57078
Merge branch 'develop' into studio-recent-students 2021-05-14 08:49:25 -04:00
Paul Kaplan
3fad1f6fef
Merge pull request #5397 from paulkaplan/bugfix/studio-playground-may12
Bug fixes from studio playground test on May 12
2021-05-14 08:48:43 -04:00
dependabot-preview[bot]
6b383ba36d
Merge pull request #5408 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210514040957 2021-05-14 10:56:32 +00:00
dependabot-preview[bot]
cb14b43fc3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210513040305 to 0.1.0-prerelease.20210514040957.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210513040305...0.1.0-prerelease.20210514040957)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-14 10:42:32 +00:00
dependabot-preview[bot]
83255cfb1c
Merge pull request #5407 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210514031523 2021-05-14 03:57:23 +00:00
dependabot-preview[bot]
503195ebab
Bump scratch-l10n from 3.11.20210513031505 to 3.11.20210514031523
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210513031505 to 3.11.20210514031523.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210513031505...3.11.20210514031523)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-14 03:43:40 +00:00
Paul Kaplan
512b63dcae
Merge pull request #5406 from paulkaplan/fixup-studio-headers
Fixup header styling
2021-05-13 21:46:50 -04:00
Paul Kaplan
d16042310b Fixup header styling 2021-05-13 21:45:05 -04:00
Paul Kaplan
2962f78881
Merge pull request #5405 from fsih/avatarStyle
Outlines for avatars
2021-05-13 21:23:00 -04:00
Paul Kaplan
f9c1b429f0 Include avatar sizing 2021-05-13 21:22:27 -04:00
Paul Kaplan
1268654d91
Merge pull request #5404 from fsih/studioOpenToggle
Studio open toggle
2021-05-13 21:10:18 -04:00
Paul Kaplan
a88feb5888 add mutating css class for project toggle and fix imports 2021-05-13 21:07:31 -04:00
Paul Kaplan
1b0b5a09b9 Use the correct l10n string, fix imports and add mutating css class 2021-05-13 21:02:54 -04:00
DD Liu
bd2bcd1331 Outlines for avatars 2021-05-13 17:49:23 -04:00
DD Liu
3d1bd3768e Replace checkbox with toggle for whether studio is open to all 2021-05-13 16:20:35 -04:00
DD Liu
cccc3abd57 Adjust padding so that the class can be reused for other pages 2021-05-13 16:05:56 -04:00
DD Liu
dffcbebc37 Switch the checkbox to a toggle slider for studio comments allowed 2021-05-13 15:46:34 -04:00
Paul Kaplan
26704990d7 Bonus: update the loadmore style to match other loader sections 2021-05-13 13:24:24 -04:00
Paul Kaplan
e73312c0d2 Show students filter for educators viewing a classroom studio 2021-05-13 13:23:47 -04:00
Paul Kaplan
134cd927ec Add classroomId to studio reducer 2021-05-13 13:20:26 -04:00
chrisgarrity
fd6215d581
Merge pull request #5386 from LLK/release/2021-05-12
[Develop] Release 2021-05-12
2021-05-13 10:46:47 -04:00
Paul Kaplan
d35c539529 Add validation messages for title, image and description 2021-05-13 10:36:40 -04:00
Sarah Otts
f5c3b87d2b
Merge pull request #5399 from zoebentley/dev-page-fix-2
Fixed problem introduced by previous fix
2021-05-13 09:50:36 -04:00
Zoë Bentley
3fbfb6dfd1 Fixed problem introduced by previous fix 2021-05-13 09:39:08 -04:00
chrisgarrity
132cf487f4
Merge pull request #5391 from LLK/fix-intro-when-logged-in
fix logic for when to show intro to users
2021-05-13 09:35:32 -04:00
Paul Kaplan
a190424f7e Make sure modal always fits inside the screen 2021-05-13 09:22:50 -04:00
Paul Kaplan
231fba944a Check for duplicates locally before trying to add the project to the studio 2021-05-13 09:06:04 -04:00
Paul Kaplan
4fcdf9b99f Allow URLs to be passed for the project input 2021-05-13 09:05:23 -04:00
Paul Kaplan
4f6a583277 Add placeholders for project and curator inputs 2021-05-13 09:04:39 -04:00
Paul Kaplan
3a59ea072c Prevent submission of blank curator/project fields 2021-05-13 08:35:46 -04:00
dependabot-preview[bot]
4a97535153
Merge pull request #5395 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210513040305 2021-05-13 10:54:16 +00:00
dependabot-preview[bot]
71220edd4e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210512144423 to 0.1.0-prerelease.20210513040305.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210512144423...0.1.0-prerelease.20210513040305)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-13 10:34:52 +00:00
dependabot-preview[bot]
fdbfbda3bf
Merge pull request #5394 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210513031505 2021-05-13 03:49:09 +00:00
dependabot-preview[bot]
4dc1da3ea1
Bump scratch-l10n from 3.11.20210512031514 to 3.11.20210513031505
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210512031514 to 3.11.20210513031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210512031514...3.11.20210513031505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-13 03:36:41 +00:00
Sarah Otts
81c59b5620
Merge pull request #5392 from zoebentley/dev-page-fix
Fixes to Developers' Page
2021-05-12 16:57:19 -04:00
zoebentley
bf55d26e20
Merge branch 'release/2021-05-12' into dev-page-fix 2021-05-12 16:56:26 -04:00