Commit graph

7122 commits

Author SHA1 Message Date
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
picklesrus
2f2e95f3e2 Fix merge conflict. 2020-12-14 16:16:09 -05:00
picklesrus
a39244ea6c
Merge branch 'develop' into timeout-mute 2020-12-14 13:27:12 -05:00
picklesrus
242fedbfe6 Add a test that the constructor properly sets muteExpriresAtMs by converting from seconds to ms. 2020-12-14 08:45:08 -05:00
dependabot-preview[bot]
63b9e44748
Merge pull request #4759 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201214041238 2020-12-14 13:27:31 +00:00
dependabot-preview[bot]
7e4ce19513
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201211035917 to 0.1.0-prerelease.20201214041238.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201211035917...0.1.0-prerelease.20201214041238)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-14 13:15:02 +00:00
dependabot-preview[bot]
04745810f7
Merge pull request #4758 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201214031518 2020-12-14 03:59:09 +00:00
dependabot-preview[bot]
75de8ccda9
Bump scratch-l10n from 3.10.20201213031451 to 3.10.20201214031518
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201213031451 to 3.10.20201214031518.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201213031451...3.10.20201214031518)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-14 03:48:15 +00:00
dependabot-preview[bot]
69d5d4f74b
Merge pull request #4757 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201213031451 2020-12-13 03:39:49 +00:00
dependabot-preview[bot]
7d244c6e22
Bump scratch-l10n from 3.10.20201212031431 to 3.10.20201213031451
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201212031431 to 3.10.20201213031451.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201212031431...3.10.20201213031451)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-13 03:28:54 +00:00
dependabot-preview[bot]
724610f335
Merge pull request #4754 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201212031431 2020-12-12 03:36:02 +00:00
dependabot-preview[bot]
7086992d89
Bump scratch-l10n from 3.10.20201211031507 to 3.10.20201212031431
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201211031507 to 3.10.20201212031431.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201211031507...3.10.20201212031431)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-12 03:23:32 +00:00
chrisgarrity
17407f0fcf
Merge pull request #4752 from chrisgarrity/localize-mute
Localize mute
2020-12-11 16:19:27 -05:00
Chris Garrity
57a094179c Fix tests again 2020-12-11 14:42:06 -05:00
Chris Garrity
501147060d Update generic message copy
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
2020-12-11 09:52:30 -05:00
Chris Garrity
015f036e93 Update tests
Tests needed to be updated after wrapping the MuteModal component in the Intl HOC.
2020-12-11 08:45:29 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages
Add formatted messages for comment status and mute modal
2020-12-11 08:44:17 -05:00
picklesrus
110077e8e8 Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit.
Also, fix isMuted so it doesn't do an extra unit conversion.
2020-12-11 08:14:15 -05:00
dependabot-preview[bot]
83253ade63
Merge pull request #4750 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201211035917 2020-12-11 10:57:43 +00:00
dependabot-preview[bot]
3dae88ec88
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201209232508 to 0.1.0-prerelease.20201211035917.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201209232508...0.1.0-prerelease.20201211035917)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-11 10:44:45 +00:00
dependabot-preview[bot]
640a813710
Merge pull request #4749 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201211031507 2020-12-11 03:51:26 +00:00
dependabot-preview[bot]
7a26edf60c
Bump scratch-l10n from 3.10.20201209031543 to 3.10.20201211031507
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201209031543 to 3.10.20201211031507.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201209031543...3.10.20201211031507)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-11 03:39:26 +00:00
GrahamSH
88aee16cb7
Move to fix alphabetization 2020-12-10 16:59:07 -05:00
MaxiMouse
8f4c67144a Fix "Load more" scrolling on search results 2020-12-10 22:12:51 +01:00
Benjamin Wheeler
8d4a5c2f91
Merge pull request #4526 from Purple-Hacker/patch-2
Updated addresses on DMCA
2020-12-10 14:21:28 -05:00
Benjamin Wheeler
0aa15b91c9
Merge pull request #2763 from apple502j/patch-10
Change min height
2020-12-10 14:15:19 -05:00
dependabot-preview[bot]
7e2b21605b
Merge pull request #4746 from LLK/dependabot/npm_and_yarn/ini-1.3.7 2020-12-10 17:19:42 +00:00
dependabot-preview[bot]
88a5365641
[Security] Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-10 17:07:48 +00:00
dependabot-preview[bot]
6de18a5fab
Merge pull request #4745 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201209232508 2020-12-10 10:52:40 +00:00