Commit graph

8786 commits

Author SHA1 Message Date
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
rschamp
31e6616544 Rename all Conference 2020 folders to 2021
This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.
2021-05-26 10:22:12 -04:00
rschamp
232d9f3bbd Revert "Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021"
This reverts commit 4edab6927e, reversing
changes made to 7b7322c9f9.
2021-05-26 09:40:41 -04:00
rschamp
65f8cc732c Revert "Merge pull request #5493 from LLK/revert-5478-rearrange-conference-2021"
This reverts commit 8cdd89586a, reversing
changes made to 4edab6927e.
2021-05-26 09:40:34 -04:00
Ray Schamp
8cdd89586a
Merge pull request #5493 from LLK/revert-5478-rearrange-conference-2021
Revert "Fix integration test broken in #5476"
2021-05-26 09:36:02 -04:00
Ray Schamp
4edab6927e
Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021
Revert "Bump conference URL one year"
2021-05-26 09:35:53 -04:00
Ray Schamp
f902e25b0f
Revert "Bump conference URL one year" 2021-05-26 09:35:35 -04:00
Ray Schamp
4c73bdb87c
Revert "Fix integration test broken in #5476" 2021-05-26 09:34:53 -04:00
Ray Schamp
7b7322c9f9
Merge pull request #5483 from rschamp/new-community-guidelines
Update community guidelines
2021-05-26 09:08:29 -04:00
dependabot-preview[bot]
dc783f81dc
Merge pull request #5491 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210526041028 2021-05-26 10:56:46 +00:00
dependabot-preview[bot]
050f52e368
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210525033905 to 0.1.0-prerelease.20210526041028.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210525033905...0.1.0-prerelease.20210526041028)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-26 10:40:50 +00:00
dependabot-preview[bot]
df1dfb0d94
Merge pull request #5490 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210526031609 2021-05-26 03:49:19 +00:00
dependabot-preview[bot]
2420851634
Bump scratch-l10n from 3.11.20210525031530 to 3.11.20210526031609
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210525031530 to 3.11.20210526031609.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210525031530...3.11.20210526031609)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-26 03:33:55 +00:00
Karishma Chadha
6870db418e Track which comment thread has the thread limit status box so that only one status box is displayed in the whole studio comments view. 2021-05-25 23:19:36 -04:00
Karishma Chadha
e57cd9a111 Introduce comment thread limit on studio comments. When a user clicks reply on a thread that has reached the limit, display a comment status message in place of the comment composer. The user should only see one status box in a message thread. 2021-05-25 23:17:57 -04:00
Benjamin Wheeler
cc2689de4c
Merge pull request #4792 from benjiwheeler/assets-surrogate
set, purge static_assets surrogate key on deploy
2021-05-25 18:56:03 -04:00
DD Liu
eff5803b92 Fix lint issues 2021-05-25 17:35:18 -04:00
DD Liu
8f542fa5e5 Change file input to edit thumbnail icon" 2021-05-25 17:30:38 -04:00
Bryce Taylor
1a76ecf90c
Merge pull request #4545 from BryceLTaylor/moce-project-rows-tests
Move Project Rows tests from Tap to Jest
2021-05-25 15:57:24 -04:00
BryceLTaylor
d6a9c8d1bd Revert "bump chromedriver to version 90.0.1"
This reverts commit 0dee03c57c.
2021-05-25 15:55:19 -04:00