Commit graph

8052 commits

Author SHA1 Message Date
chrisgarrity
d86d7b4f81
Merge pull request #5529 from LLK/develop
Update release branch with develop
2021-06-02 09:36:20 -04:00
dependabot-preview[bot]
2555b45bf1
Merge pull request #5528 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210602035258 2021-06-02 10:56:04 +00:00
dependabot-preview[bot]
5e71e3d3a2
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210531041354 to 0.1.0-prerelease.20210602035258.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210531041354...0.1.0-prerelease.20210602035258)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 10:37:50 +00:00
dependabot-preview[bot]
01904ae014
Merge pull request #5527 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.24 2021-06-02 04:17:16 +00:00
dependabot-preview[bot]
517d20862a
Bump @formatjs/intl-pluralrules from 4.0.23 to 4.0.24
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.23 to 4.0.24.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.23...@formatjs/intl-pluralrules@4.0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 03:58:21 +00:00
dependabot-preview[bot]
7732f4d695
Merge pull request #5526 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210602031702 2021-06-02 03:41:24 +00:00
dependabot-preview[bot]
97aeef2315
Bump scratch-l10n from 3.11.20210601031633 to 3.11.20210602031702
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210601031633 to 3.11.20210602031702.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210601031633...3.11.20210602031702)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-02 03:24:57 +00:00
DD Liu
165be114dd
Merge pull request #5500 from fsih/commentsNotAllowed
Add comments not allowed box
2021-06-01 15:49:29 -04:00
dependabot-preview[bot]
92d2586ed2
Merge pull request #5522 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.29 2021-06-01 17:05:00 +00:00
dependabot-preview[bot]
2f163f3b82
Merge pull request #5520 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.23 2021-06-01 17:03:05 +00:00
dependabot-preview[bot]
a8c3511c7f
Bump @formatjs/intl-locale from 2.4.28 to 2.4.29
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.28 to 2.4.29.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.28...@formatjs/intl-locale@2.4.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-01 16:48:25 +00:00
dependabot-preview[bot]
1a8d7bb66e
Bump @formatjs/intl-pluralrules from 4.0.22 to 4.0.23
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.22 to 4.0.23.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.22...@formatjs/intl-pluralrules@4.0.23)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-01 16:47:03 +00:00
dependabot-preview[bot]
19ebfc8aca
Merge pull request #5519 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210601031633 2021-06-01 03:55:22 +00:00
dependabot-preview[bot]
e5cecae153
Bump scratch-l10n from 3.11.20210531031608 to 3.11.20210601031633
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210531031608 to 3.11.20210601031633.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210531031608...3.11.20210601031633)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-01 03:38:54 +00:00
dependabot-preview[bot]
0ce29279af
Merge pull request #5517 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210531041354 2021-05-31 10:59:05 +00:00
dependabot-preview[bot]
346c8ce5ce
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210529033523 to 0.1.0-prerelease.20210531041354.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210529033523...0.1.0-prerelease.20210531041354)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-31 10:34:59 +00:00
dependabot-preview[bot]
e4a6f7ecb1
Merge pull request #5515 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210531031608 2021-05-31 04:02:54 +00:00
dependabot-preview[bot]
3e628e8096
Bump scratch-l10n from 3.11.20210530031559 to 3.11.20210531031608
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210530031559 to 3.11.20210531031608.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210530031559...3.11.20210531031608)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-31 03:46:37 +00:00
dependabot-preview[bot]
2bf170b11c
Merge pull request #5514 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210530031559 2021-05-30 03:38:26 +00:00
dependabot-preview[bot]
96bfbb9972
Bump scratch-l10n from 3.11.20210529031514 to 3.11.20210530031559
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210529031514 to 3.11.20210530031559.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210529031514...3.11.20210530031559)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-30 03:21:54 +00:00
dependabot-preview[bot]
2b0b16c27e
Merge pull request #5511 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210529033523 2021-05-29 04:10:53 +00:00
dependabot-preview[bot]
d65c6b578f
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210527103941 to 0.1.0-prerelease.20210529033523.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210527103941...0.1.0-prerelease.20210529033523)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-29 03:41:44 +00:00
dependabot-preview[bot]
b695e18830
Merge pull request #5510 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210529031514 2021-05-29 03:36:55 +00:00
dependabot-preview[bot]
064eb95bc4
Bump scratch-l10n from 3.11.20210528031513 to 3.11.20210529031514
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210528031513 to 3.11.20210529031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210528031513...3.11.20210529031514)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-29 03:21:04 +00:00
chrisgarrity
dd8a03e5b2
Merge pull request #5509 from chrisgarrity/fix-l10n-dependency
Fix the l10n version.
2021-05-28 14:02:27 -04:00
Chris Garrity
2c90dd5a3a Fix the l10n version.
Dependabot will take care of updates from now on.
2021-05-28 13:59:18 -04:00
dependabot-preview[bot]
aa812d9a91
Merge pull request #5506 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210528031513 2021-05-28 03:47:06 +00:00
dependabot-preview[bot]
29acdea069
Bump scratch-l10n from 3.11.20210527031534 to 3.11.20210528031513
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210527031534 to 3.11.20210528031513.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210527031534...3.11.20210528031513)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-28 03:31:10 +00:00
Karishma Chadha
f46de5923a
Merge pull request #5499 from LLK/release/2021-05-27
[Develop] Release 2021-05-27
2021-05-27 12:05:21 -04:00
Karishma Chadha
34f8868087
Merge pull request #5498 from LLK/release/2021-05-27
[Master] Release 2021-05-27
2021-05-27 11:51:14 -04:00
dependabot-preview[bot]
2787ec9bb5
Merge pull request #5502 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210527103941 2021-05-27 10:58:07 +00:00
dependabot-preview[bot]
cc90522f97
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210526041028 to 0.1.0-prerelease.20210527103941.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210526041028...0.1.0-prerelease.20210527103941)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-27 10:42:18 +00:00
dependabot-preview[bot]
9ac6d63dfa
Merge pull request #5501 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210527031534 2021-05-27 03:43:25 +00:00
dependabot-preview[bot]
8d92ebdb66
Bump scratch-l10n from 3.11.20210526031609 to 3.11.20210527031534
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210526031609 to 3.11.20210527031534.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210526031609...3.11.20210527031534)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-27 03:28:33 +00:00
Eric Rosenbaum
9ccbe94be1 add promote modal 2021-05-26 22:54:23 -04:00
DD Liu
2179ade65e Fix lint 2021-05-26 15:00:52 -04:00
DD Liu
cd930046bb Merge branch 'develop' into commentsNotAllowed 2021-05-26 14:47:20 -04:00
DD Liu
217c7ecafc Add comments not allowed box 2021-05-26 14:45:47 -04:00
Karishma Chadha
0490bd324d
Merge pull request #5497 from LLK/develop
Prepare release branch with new changes from develop
2021-05-26 12:15:34 -04:00
Paul Kaplan
35f9f92cea
Merge pull request #5432 from paulkaplan/studio-curator-invite
Update the curator invitation component to spec
2021-05-26 12:10:31 -04:00
Paul Kaplan
8451e57a8a Merge branch 'develop' into studio-curator-invite 2021-05-26 12:09:17 -04:00
Paul Kaplan
3ca94ee6cf Merge branch 'develop' into studio-curator-invite 2021-05-26 12:07:05 -04:00
Paul Kaplan
49bb597747
Merge pull request #5489 from fsih/editThumbnailButton
Edit thumbnail button
2021-05-26 12:03:25 -04:00
Paul Kaplan
dbf7522856 Merge branch 'develop' into editThumbnailButton 2021-05-26 12:02:54 -04:00
Paul Kaplan
3621cd24cf Add edit icon 2021-05-26 11:59:58 -04:00
Paul Kaplan
f11d3f795f
Merge pull request #5439 from paulkaplan/studio-meta
Add dynamic meta tags for studio pages
2021-05-26 11:55:44 -04:00
Paul Kaplan
f44cc23a98
Merge branch 'develop' into studio-meta 2021-05-26 11:55:35 -04:00
Paul Kaplan
60b154126d
Merge pull request #5467 from seotts/muted-users-cant-edit-studios
Prototype: muted users can't edit studios
2021-05-26 11:01:47 -04:00
Paul Kaplan
47560e5d5e Use the correct l10n message for curator page 2021-05-26 10:58:28 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00