Commit graph

8209 commits

Author SHA1 Message Date
dependabot-preview[bot]
34acdd9d9c
Bump scratch-l10n from 3.13.20210624031503 to 3.13.20210625031500
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210624031503 to 3.13.20210625031500.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210624031503...3.13.20210625031500)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-25 03:25:25 +00:00
Paul Kaplan
ffb0e96f47
Merge pull request #5664 from LLK/revert-5660-revert-5630-reduce-reply-requests
Reduce reply requests, for real this time I promise
2021-06-24 14:51:39 -04:00
Sarah Otts
3958d9df7d
Merge pull request #5659 from seotts/manager-modal-padding
Change manager modal width
2021-06-24 14:33:10 -04:00
Sarah Otts
d5a94ae59c
Merge pull request #5658 from seotts/add-by-url-text
Match Add Project placeholder & button text to old studios
2021-06-24 14:33:02 -04:00
Paul Kaplan
ccc07d3ca8 Merge branch 'develop' into revert-5660-revert-5630-reduce-reply-requests 2021-06-24 13:19:37 -04:00
Paul Kaplan
70ae24fc68
Merge pull request #5656 from LLK/release/2021-06-23
Develop release/2021-06-23
2021-06-24 13:17:49 -04:00
Paul Kaplan
975d24cd5d
Revert "Revert "Only request replies if reply_count > 0"" 2021-06-24 10:59:09 -04:00
dependabot-preview[bot]
11c403aaca
Merge pull request #5663 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210624031503 2021-06-24 03:54:49 +00:00
dependabot-preview[bot]
a7953f52d2
Bump scratch-l10n from 3.13.20210623031509 to 3.13.20210624031503
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210623031509 to 3.13.20210624031503.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210623031509...3.13.20210624031503)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-24 03:36:03 +00:00
Karishma Chadha
b838945145
Merge pull request #5660 from LLK/revert-5630-reduce-reply-requests
Revert "Only request replies if reply_count > 0"
2021-06-23 16:38:41 -04:00
Karishma Chadha
10f887f8ba
Revert "Only request replies if reply_count > 0" 2021-06-23 16:30:20 -04:00
seotts
29a818a5bc Change http to https in placeholder 2021-06-23 14:26:03 -04:00
seotts
a3b3a66f7a Rename button; change placeholder text
lint fix

lint
2021-06-23 14:13:49 -04:00
seotts
0f43addd10 Change manager modal width 2021-06-23 14:06:57 -04:00
kchadha
af02cb0736 Merge remote-tracking branch 'origin/develop' into release/2021-06-23 2021-06-23 16:50:28 +00:00
Paul Kaplan
b3795c943f
Merge pull request #5630 from paulkaplan/reduce-reply-requests
Only request replies if reply_count > 0
2021-06-23 12:40:45 -04:00
Paul Kaplan
b5a68924c9
Merge pull request #5651 from paulkaplan/update-reply-count-for-new-replies
Update the reply_count when you leave a reply
2021-06-23 12:38:33 -04:00
Paul Kaplan
614cfdc4bb
Update src/redux/comments.js
Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>
2021-06-23 12:37:15 -04:00
Paul Kaplan
e331c20d99
Merge pull request #5649 from paulkaplan/no-report-own-comments
Fix permissions issues on studio comments
2021-06-23 10:38:57 -04:00
Paul Kaplan
810465bfcf
Merge branch 'develop' into no-report-own-comments 2021-06-23 09:49:38 -04:00
Paul Kaplan
5b17870cb7
Merge pull request #5655 from LLK/revert-5631-final-studio-routes
Revert "Switch studios route to real version for testing on staging"
2021-06-23 09:29:35 -04:00
Paul Kaplan
96cb2f7959
Revert "Switch studios route to real version for testing on staging" 2021-06-23 09:29:04 -04:00
dependabot-preview[bot]
a0fcf88929
Merge pull request #5654 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210623031509 2021-06-23 03:52:11 +00:00
dependabot-preview[bot]
01bf8e6b17
Bump scratch-l10n from 3.13.20210621031558 to 3.13.20210623031509
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210621031558 to 3.13.20210623031509.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210621031558...3.13.20210623031509)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-23 03:32:27 +00:00
DD Liu
b7eb0b9026
Merge pull request #5653 from fsih/hoverState
Studio tab nav button styling
2021-06-22 20:01:16 -04:00
DD Liu
a85fb9c5dd
Merge pull request #5652 from fsih/replacePngs
Replace pngs with svgs
2021-06-22 19:44:23 -04:00
DD Liu
d3e400485e Fix syntax 2021-06-22 19:37:41 -04:00
DD Liu
cf26eb9cb2 Increase the padding in and around tab nav buttons 2021-06-22 16:48:18 -04:00
Paul Kaplan
d1242f8f26
Merge pull request #5645 from paulkaplan/fix-admin-panel-spacing 2021-06-22 14:39:27 -04:00
DD Liu
2ebd1be1a8 Make the tab button hover states match the spec 2021-06-22 13:40:33 -04:00
Paul Kaplan
d575928ea1
Merge pull request #5646 from paulkaplan/fix-studio-grid-spacing
Make column and row gaps the same on studio tile grids
2021-06-22 12:11:41 -04:00
Paul Kaplan
90d7b0c528
Merge pull request #5647 from paulkaplan/no-reply-when-studio-comments-disabled
Only show reply button when comments are allowed on a studio
2021-06-22 12:11:24 -04:00
Paul Kaplan
581f4d0cac Update the reply_count when you leave a reply 2021-06-22 12:03:13 -04:00
DD Liu
4ecffa885f Replace pngs with svgs 2021-06-22 02:45:28 -04:00
Paul Kaplan
cfd52d9369 Pass a customized comment component for studios 2021-06-21 16:06:40 -04:00
Paul Kaplan
fced16b08c Make Comment component a prop 2021-06-21 15:37:36 -04:00
Paul Kaplan
53b207e003 Only show reply button when comments are allowed 2021-06-21 12:56:29 -04:00
Paul Kaplan
547f5b959b Make column and row gaps the same 2021-06-21 12:36:53 -04:00
Paul Kaplan
d35cee93f1 Fix unneeded variables 2021-06-21 12:34:49 -04:00
Paul Kaplan
1cace60ebd Fix admin panel space remaining after logging out 2021-06-21 12:25:19 -04:00
dependabot-preview[bot]
03ce4470a4
Merge pull request #5642 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210621040041 2021-06-21 11:00:37 +00:00
dependabot-preview[bot]
17c47fac1f
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210618042754 to 0.1.0-prerelease.20210621040041.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210618042754...0.1.0-prerelease.20210621040041)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-21 10:42:47 +00:00
dependabot-preview[bot]
51def6ea87
Merge pull request #5641 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210621031558 2021-06-21 04:04:41 +00:00
dependabot-preview[bot]
22aaa08027
Bump scratch-l10n from 3.13.20210620031657 to 3.13.20210621031558
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210620031657 to 3.13.20210621031558.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210620031657...3.13.20210621031558)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-21 03:45:30 +00:00
dependabot-preview[bot]
3c85961e7a
Merge pull request #5640 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210620031657 2021-06-20 03:42:04 +00:00
dependabot-preview[bot]
76fbdc997b
Bump scratch-l10n from 3.13.20210619031554 to 3.13.20210620031657
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210619031554 to 3.13.20210620031657.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210619031554...3.13.20210620031657)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-20 03:23:11 +00:00
dependabot-preview[bot]
5545c7e648
Merge pull request #5639 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210619031554 2021-06-19 03:40:21 +00:00
dependabot-preview[bot]
688e5b149a
Bump scratch-l10n from 3.13.20210618031601 to 3.13.20210619031554
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210618031601 to 3.13.20210619031554.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210618031601...3.13.20210619031554)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-19 03:21:44 +00:00
Eric Rosenbaum
303d800041
Merge pull request #5632 from ericrosenbaum/add-to-studio-fixes
Style fixes for "add to studio" modal
2021-06-18 15:43:33 -04:00
Paul Kaplan
1eb91e22b3
Merge pull request #5631 from paulkaplan/final-studio-routes
Switch studios route to real version for testing on staging
2021-06-18 15:41:32 -04:00