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 4edab6927e7b7322c9f9
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 8cdd89586a4edab6927e
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
rschamp
c52677ccc6
Update community guidelines
2021-05-25 11:05:17 -04:00
Paul Kaplan
0ccf28e388
Merge pull request #5466 from ericrosenbaum/load-24-projects-per-page
...
Small fixes for "add to studio" modal
2021-05-25 10:00:03 -04:00
Paul Kaplan
5903f57597
Merge pull request #5468 from cwillisf/studios-stats-and-icons
...
Studios stats and icons
2021-05-25 09:53:18 -04:00
Paul Kaplan
f50d8dbf66
Wrap counts in span for styling
2021-05-25 09:48:33 -04:00
dependabot-preview[bot]
70817bb148
Merge pull request #5482 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210525033905
2021-05-25 11:09:47 +00:00
dependabot-preview[bot]
e2bc78444e
Bump scratch-gui
...
Bumps [scratch-gui](https://github.com/LLK/scratch-gui ) from 0.1.0-prerelease.20210522033750 to 0.1.0-prerelease.20210525033905.
- [Release notes](https://github.com/LLK/scratch-gui/releases )
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210522033750...0.1.0-prerelease.20210525033905 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-25 10:51:08 +00:00
dependabot-preview[bot]
94927b7f6a
Merge pull request #5479 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210525031530
2021-05-25 03:39:04 +00:00
dependabot-preview[bot]
6e67bfbaea
Bump scratch-l10n from 3.11.20210524031609 to 3.11.20210525031530
...
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n ) from 3.11.20210524031609 to 3.11.20210525031530.
- [Release notes](https://github.com/LLK/scratch-l10n/releases )
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210524031609...3.11.20210525031530 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-25 03:24:23 +00:00
Eric Rosenbaum
e5212234ac
lint
2021-05-24 17:22:20 -04:00
Eric Rosenbaum
a390c0655f
Merge branch 'develop' of https://github.com/LLK/scratch-www into load-24-projects-per-page
...
# Conflicts:
# src/views/studio/modals/user-projects-modal.jsx
2021-05-24 17:18:09 -04:00
