Commit graph

9379 commits

Author SHA1 Message Date
picklesrus
92667c097d Add tests and expose steps enum so it can be referenced from outside MuteModal 2021-02-04 11:13:30 -05:00
dependabot-preview[bot]
80ef31ebae
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210204101145 2021-02-04 11:54:38 +00:00
dependabot-preview[bot]
48a9d94a2a
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210202110057 to 0.1.0-prerelease.20210204101145.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210202110057...0.1.0-prerelease.20210204101145)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-04 11:33:30 +00:00
dependabot-preview[bot]
a4a74d6e10
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210204031607 2021-02-04 04:04:42 +00:00
dependabot-preview[bot]
9aacbcb3bf
Bump scratch-l10n from 3.11.20210203031454 to 3.11.20210204031607
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210203031454 to 3.11.20210204031607.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210203031454...3.11.20210204031607)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-04 03:45:10 +00:00
dependabot-preview[bot]
c0e183b91b
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210202110057 2021-02-04 01:32:49 +00:00
dependabot-preview[bot]
2c281ba923
Merge pull request from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.14 2021-02-03 16:40:58 +00:00
dependabot-preview[bot]
fd7bdc2c15
Bump @formatjs/intl-locale from 2.4.13 to 2.4.14
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.13 to 2.4.14.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.13...@formatjs/intl-locale@2.4.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-03 16:20:04 +00:00
dependabot-preview[bot]
cd057c2807
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210202035926 to 0.1.0-prerelease.20210202110057.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210202035926...0.1.0-prerelease.20210202110057)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-03 16:16:21 +00:00
Karishma Chadha
3dbfabfa97
Merge pull request from LLK/develop
Pull in changes from release 02-04-2021
2021-02-03 10:58:52 -05:00
dependabot-preview[bot]
297576f9b8
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210203031454 2021-02-03 14:16:15 +00:00
dependabot-preview[bot]
537537ce9e
Bump scratch-l10n from 3.11.20210202031504 to 3.11.20210203031454
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210202031504 to 3.11.20210203031454.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210202031504...3.11.20210203031454)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-03 13:57:33 +00:00
chrisgarrity
baba146ffb
Merge pull request from chrisgarrity/relative-time-polyfill
Add @formatjs/relativetimeformat-polyfill
2021-02-02 11:35:52 -05:00
picklesrus
f7bf204924 Draft: open mute modal from reply button if you're muted. 2021-02-02 11:34:27 -05:00
Chris Garrity
ae2bc24ffd Add @formatjs/relativetimeformat-polyfill
Safari < 14 does not support Intl.RelativeTimeFormat which is used in the moderation messaging. Adding this polyfill to support it. RelativeTimeFormat depends on Locale, which is also not available in Safari <14, and PluralRules, not available in Safari < 13.

There is a trade off between adding locale-data for all users that load the page regardless of what browser they’re using and whether they get muted, and only localizing the most common languages.
In the last 30 days only ~3% of users on scratch use a version of Safari (13.x) that doesn’t support Intl. Of that 3%, these 7 locales would cover over 60% of the users. English will be used by default if the locale data is not available.
2021-02-02 09:07:38 -05:00
Sarah Otts
f60a8c71a0
Merge pull request from seotts/automod-feedback-modal
Automod feedback modal steps
2021-02-02 08:58:47 -05:00
dependabot-preview[bot]
fe1dfaeb82
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210202035926 2021-02-02 11:01:31 +00:00
dependabot-preview[bot]
f174ce0455
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210201060217 to 0.1.0-prerelease.20210202035926.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210201060217...0.1.0-prerelease.20210202035926)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-02 10:52:17 +00:00
dependabot-preview[bot]
a12905689c
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210202031504 2021-02-02 03:35:29 +00:00
dependabot-preview[bot]
d0a0f14d40
Bump scratch-l10n from 3.11.20210201031532 to 3.11.20210202031504
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210201031532 to 3.11.20210202031504.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210201031532...3.11.20210202031504)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-02 03:26:43 +00:00
picklesrus
6d53018486
Merge pull request from picklesrus/zero-minutes-fix
Change time library to default to 1 minute when the time remaining is less than 30 seconds.
2021-02-01 15:56:37 -05:00
seotts
ba99d49298 Fix FeedbackForm tests + other small fixes
Add strings
2021-02-01 15:50:55 -05:00
picklesrus
e6f056b178 Add message at the top of file mentioning the version in scratchr2 2021-02-01 15:35:02 -05:00
Karishma Chadha
26d3bb73c6
Merge pull request from LLK/hotfix/sec-text-update
[Develop] Hotfix SEC Page Text Update
2021-02-01 10:32:27 -05:00
Karishma Chadha
a7d53f44be
Merge pull request from LLK/hotfix/sec-text-update
[Master] Hotfix SEC Text Update
2021-02-01 10:00:03 -05:00
picklesrus
b8cc0b2b83 Change time library to default to 1 minute when the time remaining is less than 30 seconds. 2021-02-01 09:53:46 -05:00
dependabot-preview[bot]
66773c9ed9
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210201060217 2021-02-01 13:19:49 +00:00
dependabot-preview[bot]
d0944c3c56
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210129041550 to 0.1.0-prerelease.20210201060217.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210129041550...0.1.0-prerelease.20210201060217)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 13:11:06 +00:00
dependabot-preview[bot]
54dec7904c
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210201031532 2021-02-01 04:03:39 +00:00
dependabot-preview[bot]
d2a4e703d3
Bump scratch-l10n from 3.11.20210131031530 to 3.11.20210201031532
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210131031530 to 3.11.20210201031532.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210131031530...3.11.20210201031532)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 03:45:39 +00:00
dependabot-preview[bot]
e047224ef7
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210131031530 2021-01-31 03:43:04 +00:00
dependabot-preview[bot]
427c23396d
Bump scratch-l10n from 3.11.20210130031523 to 3.11.20210131031530
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210130031523 to 3.11.20210131031530.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210130031523...3.11.20210131031530)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-31 03:24:42 +00:00
dependabot-preview[bot]
d9a3d2e4ca
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210130031523 2021-01-30 04:02:12 +00:00
dependabot-preview[bot]
59b776ca37
Bump scratch-l10n from 3.11.20210129031627 to 3.11.20210130031523
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210129031627 to 3.11.20210130031523.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210129031627...3.11.20210130031523)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-30 03:44:57 +00:00
Karishma Chadha
816c7e1d6d
Merge pull request from zoebentley/sec-updates-hotfix-jan-2021
Hotfix - Changed text on SEC page
2021-01-29 17:40:19 -05:00
Zoë Bentley
e51591620f Changed text on SEC page (for hotfix) 2021-01-29 14:56:47 -05:00
picklesrus
5e9b578d8b
Merge pull request from picklesrus/disable-comment-buttons
Set comment post and cancel buttons to be disabled when user is muted.
2021-01-29 09:09:58 -05:00
dependabot-preview[bot]
b85a3487b7
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210129041550 2021-01-29 11:02:15 +00:00
dependabot-preview[bot]
c37bd48160
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210128034946 to 0.1.0-prerelease.20210129041550.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210128034946...0.1.0-prerelease.20210129041550)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-29 10:44:33 +00:00
dependabot-preview[bot]
f62ba6a327
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210129031627 2021-01-29 03:48:02 +00:00
dependabot-preview[bot]
6df4fccd78
Bump scratch-l10n from 3.11.20210128031514 to 3.11.20210129031627
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210128031514 to 3.11.20210129031627.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210128031514...3.11.20210129031627)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-29 03:29:29 +00:00
seotts
42eb195b57 move feedback form to its own component 2021-01-28 15:45:00 -05:00
picklesrus
259446ed8e Set buttons to be disabled (and not just look disabled) when the user was just muted. They were clickable before. 2021-01-28 15:07:20 -05:00
chrisgarrity
63494a0069
Merge pull request from chrisgarrity/auto-mod/update-copy
Auto mod/update copy
2021-01-28 14:15:13 -05:00
Chris Garrity
64c89b1716 Update to the general moderation message. 2021-01-28 12:11:35 -05:00
picklesrus
6fca9c7020
Merge pull request from LLK/release/2021-01-27
[Develop] Release/2021 01 27
2021-01-28 11:28:22 -05:00
picklesrus
18df0c54d8
Merge branch 'develop' into release/2021-01-27 2021-01-28 11:09:33 -05:00
Chris Garrity
d639c2d7a9 Fix typo 2021-01-28 11:01:09 -05:00
picklesrus
b8a2e309b8
Merge pull request from LLK/release/2021-01-27
[Master] Release 2021-01-27
2021-01-28 10:56:13 -05:00
dependabot-preview[bot]
90deb5e872
Merge pull request from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210128034946 2021-01-28 11:09:20 +00:00