Commit graph

6757 commits

Author SHA1 Message Date
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
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
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
dependabot-preview[bot]
cfaf7f00ce
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201208061839 to 0.1.0-prerelease.20201209232508.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201208061839...0.1.0-prerelease.20201209232508)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-10 10:40:46 +00:00
picklesrus
287426c379
Merge pull request #4721 from picklesrus/comment-status
Show the comment status box on project page loads if the user is muted.
2020-12-09 11:40:38 -05:00
dependabot-preview[bot]
4f870a6741
Merge pull request #4743 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201209031543 2020-12-09 03:43:10 +00:00
dependabot-preview[bot]
f53f480284
Bump scratch-l10n from 3.10.20201208031649 to 3.10.20201209031543
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201208031649 to 3.10.20201209031543.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201208031649...3.10.20201209031543)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-09 03:32:03 +00:00
Bryce Taylor
91f5e4bba5
Merge pull request #4642 from LLK/circleci-project-setup
Circleci project setup
2020-12-08 15:12:09 -05:00
picklesrus
2d5e9a6378 Fix merge conflicts and set default object for mute_status if props do not exist. 2020-12-08 08:00:01 -05:00
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted.
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
2020-12-08 07:28:40 -05:00
dependabot-preview[bot]
5af560690c
Merge pull request #4739 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201208061839 2020-12-08 10:59:06 +00:00
dependabot-preview[bot]
e0373c970e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201207040127 to 0.1.0-prerelease.20201208061839.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201207040127...0.1.0-prerelease.20201208061839)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-08 10:48:10 +00:00
dependabot-preview[bot]
57a5150cd1
Merge pull request #4738 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201208031649 2020-12-08 03:47:08 +00:00
dependabot-preview[bot]
eeab1a53ae
Bump scratch-l10n from 3.10.20201207031619 to 3.10.20201208031649
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201207031619 to 3.10.20201208031649.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201207031619...3.10.20201208031649)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-08 03:35:58 +00:00
picklesrus
c35e3be25b
Merge pull request #4635 from picklesrus/readable-time
Add a time formatting utility that formats a relative time in the future.
2020-12-07 16:48:50 -05:00
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -05:00