Commit graph

7708 commits

Author SHA1 Message Date
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
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
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
Zoë Bentley
d5af535ea2 Fixes to Developers' Page 2021-05-12 16:52:16 -04:00
Ben Wheeler
d3685610f6 fix logic for when to show intro to users 2021-05-12 16:27:25 -04:00
Benjamin Wheeler
8827fca1ac
Merge pull request #5390 from LLK/fix-close-button
rename .close-button style to not conflict
2021-05-12 14:18:01 -04:00
Ben Wheeler
316f26bed5 rename .close-button style to not conflict 2021-05-12 14:14:34 -04:00
chrisgarrity
b2362204b3
Merge pull request #5385 from LLK/develop
Merge from develop into release branch
2021-05-12 12:46:54 -04:00
dependabot-preview[bot]
619f4400b8
Merge pull request #5384 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210512144423 2021-05-12 16:39:46 +00:00
dependabot-preview[bot]
2e96fc228c
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210512034627 to 0.1.0-prerelease.20210512144423.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210512034627...0.1.0-prerelease.20210512144423)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-12 16:26:29 +00:00
chrisgarrity
f90772f2ea
Merge pull request #5383 from LLK/revert-5382-update-gui
Revert "manually update gui"
2021-05-12 12:03:13 -04:00
chrisgarrity
f2038420a0
Revert "manually update gui" 2021-05-12 12:02:50 -04:00
chrisgarrity
800b193bf7
Merge pull request #5382 from chrisgarrity/update-gui
manually update gui
2021-05-12 11:08:04 -04:00
Chris Garrity
87187ec9f8 manually update gui 2021-05-12 11:06:37 -04:00
dependabot-preview[bot]
f0dda606d8
Merge pull request #5380 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210512034627 2021-05-12 10:54:31 +00:00
dependabot-preview[bot]
59dd48e0f4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210510170231 to 0.1.0-prerelease.20210512034627.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210510170231...0.1.0-prerelease.20210512034627)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-12 10:41:16 +00:00
dependabot-preview[bot]
c4a031649a
Merge pull request #5379 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210512031514 2021-05-12 03:44:31 +00:00
dependabot-preview[bot]
3381101fda
Bump scratch-l10n from 3.11.20210511031531 to 3.11.20210512031514
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210511031531 to 3.11.20210512031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210511031531...3.11.20210512031514)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-12 03:31:12 +00:00
Paul Kaplan
0d3f10292b
Merge pull request #5375 from paulkaplan/studio-empty-states
Add empty states for curators and projects
2021-05-11 14:40:01 -04:00
Paul Kaplan
397ac7334a
Merge branch 'develop' into studio-empty-states 2021-05-11 14:10:56 -04:00
Paul Kaplan
2fe3948ef9
Merge pull request #5371 from paulkaplan/add-studio-activity-pagination
Add studio activity pagination
2021-05-11 14:09:52 -04:00
Paul Kaplan
f61047dda0
Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 13:38:15 -04:00