Commit graph

9251 commits

Author SHA1 Message Date
dependabot-preview[bot]
d356ce589e
Merge pull request #4796 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201225035427 2020-12-25 11:02:17 +00:00
dependabot-preview[bot]
6b21053ea8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201223034244 to 0.1.0-prerelease.20201225035427.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201223034244...0.1.0-prerelease.20201225035427)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-25 10:49:02 +00:00
dependabot-preview[bot]
546edd60c0
Merge pull request #4795 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201225031621 2020-12-25 03:51:20 +00:00
dependabot-preview[bot]
caadfdfbc5
Bump scratch-l10n from 3.10.20201223031554 to 3.10.20201225031621
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201223031554 to 3.10.20201225031621.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201223031554...3.10.20201225031621)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-25 03:39:21 +00:00
dependabot-preview[bot]
5d9f63fe49
Merge pull request #4794 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201223034244 2020-12-23 11:00:12 +00:00
dependabot-preview[bot]
855cee5401
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201222041026 to 0.1.0-prerelease.20201223034244.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201222041026...0.1.0-prerelease.20201223034244)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-23 10:46:36 +00:00
dependabot-preview[bot]
71804e7413
Merge pull request #4793 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201223031554 2020-12-23 03:41:00 +00:00
dependabot-preview[bot]
03300d6a7e
Bump scratch-l10n from 3.10.20201222031511 to 3.10.20201223031554
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201222031511 to 3.10.20201223031554.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201222031511...3.10.20201223031554)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-23 03:27:30 +00:00
dependabot-preview[bot]
1a14b4a007
Merge pull request #4790 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201222041026 2020-12-22 10:59:58 +00:00
dependabot-preview[bot]
0cfceefe10
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201221041259 to 0.1.0-prerelease.20201222041026.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201221041259...0.1.0-prerelease.20201222041026)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-22 10:47:45 +00:00
dependabot-preview[bot]
3558e89ff2
Merge pull request #4789 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201222031511 2020-12-22 03:52:03 +00:00
dependabot-preview[bot]
5d80d9a9e8
Bump scratch-l10n from 3.10.20201221031502 to 3.10.20201222031511
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201221031502 to 3.10.20201222031511.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201221031502...3.10.20201222031511)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-22 03:38:33 +00:00
picklesrus
664ccc5d36
Update compose-comment.jsx
Fix missing comma from bad merge
2020-12-21 10:49:16 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute 2020-12-21 08:38:37 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute
Show warning message when user has been muted several times.
2020-12-21 08:36:21 -05:00
dependabot-preview[bot]
c5bc8b18be
Merge pull request #4785 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201221041259 2020-12-21 11:34:56 +00:00
dependabot-preview[bot]
9e3a6ddfa6
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201218042700 to 0.1.0-prerelease.20201221041259.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201218042700...0.1.0-prerelease.20201221041259)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-21 11:21:46 +00:00
dependabot-preview[bot]
d0e328cddc
Merge pull request #4784 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201221031502 2020-12-21 03:48:39 +00:00
dependabot-preview[bot]
738aded2bd
Bump scratch-l10n from 3.10.20201220031455 to 3.10.20201221031502
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201220031455 to 3.10.20201221031502.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201220031455...3.10.20201221031502)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-21 03:34:58 +00:00
dependabot-preview[bot]
5fab5ff297
Merge pull request #4782 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201220031455 2020-12-20 03:32:59 +00:00
dependabot-preview[bot]
ff1a7f552d
Bump scratch-l10n from 3.10.20201219031451 to 3.10.20201220031455
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201219031451 to 3.10.20201220031455.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201219031451...3.10.20201220031455)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-20 03:20:15 +00:00
dependabot-preview[bot]
f40fec264f
Merge pull request #4780 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201219031451 2020-12-19 03:33:06 +00:00
dependabot-preview[bot]
de65ef801d
Bump scratch-l10n from 3.10.20201218031454 to 3.10.20201219031451
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201218031454 to 3.10.20201219031451.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201218031454...3.10.20201219031451)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-19 03:20:14 +00:00
Benjamin Wheeler
0c911da463
Merge pull request #4563 from GrahamSH-LLK/patch-1
Add "FloralSunset" to Credits Page
2020-12-18 20:54:41 -05:00
seotts
7e140b3832 add new mute messages
Get correct mute message info for modal

remove extra spapce
2020-12-18 10:24:43 -05:00
picklesrus
ad5dc31cc7 Have mute modal always show if you post a comment and showWarning is true. 2020-12-18 09:30:02 -05:00
dependabot-preview[bot]
63277d595e
Merge pull request #4778 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201218042700 2020-12-18 10:58:51 +00:00
dependabot-preview[bot]
b35651ad7a
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201217045706 to 0.1.0-prerelease.20201218042700.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201217045706...0.1.0-prerelease.20201218042700)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-18 10:45:46 +00:00
dependabot-preview[bot]
466c32fa11
Merge pull request #4777 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201218031454 2020-12-18 03:48:40 +00:00
dependabot-preview[bot]
348e56ec28
Bump scratch-l10n from 3.10.20201217031549 to 3.10.20201218031454
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201217031549 to 3.10.20201218031454.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201217031549...3.10.20201218031454)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-18 03:35:25 +00:00
picklesrus
b228406207 Add new image for warning. 2020-12-17 15:43:48 -05:00
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -05:00
picklesrus
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning
Fix prop type. muteStepContent is an array not a string.
2020-12-17 10:00:26 -05:00
dependabot-preview[bot]
e608f2c5fd
Merge pull request #4772 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201217045706 2020-12-17 10:58:52 +00:00
dependabot-preview[bot]
0c5b12ccc4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201216054808 to 0.1.0-prerelease.20201217045706.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201216054808...0.1.0-prerelease.20201217045706)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-17 10:47:09 +00:00
dependabot-preview[bot]
0b0db9f03f
Merge pull request #4770 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201217031549 2020-12-17 03:39:07 +00:00
dependabot-preview[bot]
cb3557468c
Bump scratch-l10n from 3.10.20201216031625 to 3.10.20201217031549
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201216031625 to 3.10.20201217031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201216031625...3.10.20201217031549)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-17 03:27:00 +00:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username
switch educator registration checkusername endpoint from scratchr2 to api
2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7 Fix prop type. muteStepContent is an array not a string. 2020-12-16 07:54:20 -05:00
dependabot-preview[bot]
338ac99e6b
Merge pull request #4766 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201216054808 2020-12-16 11:29:44 +00:00
dependabot-preview[bot]
7f3e0973d8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201215053836 to 0.1.0-prerelease.20201216054808.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201215053836...0.1.0-prerelease.20201216054808)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-16 11:16:54 +00:00
dependabot-preview[bot]
47f9c13dc6
Merge pull request #4765 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201216031625 2020-12-16 03:49:37 +00:00
dependabot-preview[bot]
c40f44431c
Bump scratch-l10n from 3.10.20201215031549 to 3.10.20201216031625
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201215031549 to 3.10.20201216031625.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201215031549...3.10.20201216031625)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-16 03:36:50 +00:00
picklesrus
19b260a4a5 Add a timeout to stop displaying the mute status when a mute expires. 2020-12-15 14:49:35 -05:00
dependabot-preview[bot]
3c54c827fc
Merge pull request #4761 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201215053836 2020-12-15 10:59:28 +00:00
dependabot-preview[bot]
c41886c1fd
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201214041238 to 0.1.0-prerelease.20201215053836.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201214041238...0.1.0-prerelease.20201215053836)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-15 10:48:36 +00:00
dependabot-preview[bot]
e9b02ffa4d
Merge pull request #4760 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201215031549 2020-12-15 03:51:24 +00:00
dependabot-preview[bot]
27d5800d86
Bump scratch-l10n from 3.10.20201214031518 to 3.10.20201215031549
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201214031518 to 3.10.20201215031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201214031518...3.10.20201215031549)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-15 03:39:22 +00:00
picklesrus
299058cd9b
Merge pull request #4751 from picklesrus/timeout-mute
Fix isMuted so it doesn't do an extra unit conversion.
2020-12-14 20:22:43 -05:00
picklesrus
90ed44d6a8 Fix lint 2020-12-14 20:07:03 -05:00