Commit graph

7165 commits

Author SHA1 Message Date
Eric Rosenbaum
6d1c14e0e4
Merge pull request #4976 from LLK/release/2021-02-10
[Develop] Release 2021-02-10
2021-02-11 11:11:03 -05:00
Eric Rosenbaum
d8cd6bb030
Merge pull request #4975 from LLK/release/2021-02-10
[Master] Release 2021-02-10
2021-02-11 11:09:24 -05:00
dependabot-preview[bot]
54941a9428
Merge pull request #4979 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210211040214 2021-02-11 11:07:09 +00:00
dependabot-preview[bot]
0a26c8e832
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210210053415 to 0.1.0-prerelease.20210211040214.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210210053415...0.1.0-prerelease.20210211040214)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-11 10:57:12 +00:00
dependabot-preview[bot]
d8e5af14dd
Merge pull request #4977 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210211031450 2021-02-11 03:36:32 +00:00
dependabot-preview[bot]
d7d3e85e07
Bump scratch-l10n from 3.11.20210210031517 to 3.11.20210211031450
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210210031517 to 3.11.20210211031450.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210210031517...3.11.20210211031450)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-11 03:25:59 +00:00
seotts
e23b27abc6 send automod feedback to api 2021-02-10 16:20:58 -05:00
Eric Rosenbaum
394039b05b
Merge pull request #4974 from LLK/develop
merge from develop to release branch
2021-02-10 11:20:44 -05:00
dependabot-preview[bot]
a9412af916
Merge pull request #4973 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210210053415 2021-02-10 11:00:07 +00:00
dependabot-preview[bot]
dcf746b4e9
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210209053420 to 0.1.0-prerelease.20210210053415.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210209053420...0.1.0-prerelease.20210210053415)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-10 10:49:55 +00:00
dependabot-preview[bot]
9a7cbc68c8
Merge pull request #4971 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210210031517 2021-02-10 03:38:06 +00:00
dependabot-preview[bot]
2ef2845406
Bump scratch-l10n from 3.11.20210209031515 to 3.11.20210210031517
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210209031515 to 3.11.20210210031517.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210209031515...3.11.20210210031517)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-10 03:28:10 +00:00
dependabot-preview[bot]
75e9ad6b3d
Merge pull request #4970 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210209053420 2021-02-09 10:49:51 +00:00
dependabot-preview[bot]
6c19ed7f9b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210208043947 to 0.1.0-prerelease.20210209053420.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210208043947...0.1.0-prerelease.20210209053420)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-09 10:40:50 +00:00
dependabot-preview[bot]
c9b1307f38
Merge pull request #4968 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210209031515 2021-02-09 03:53:07 +00:00
dependabot-preview[bot]
2f82ef04da
Bump scratch-l10n from 3.11.20210208031546 to 3.11.20210209031515
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210208031546 to 3.11.20210209031515.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210208031546...3.11.20210209031515)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-09 03:23:05 +00:00
picklesrus
4e97e7c60e
Merge pull request #4943 from picklesrus/reply-mute
Open mute modal from reply button if you're muted.
2021-02-08 13:28:21 -05:00
picklesrus
7c382a73fa Fix double reply button click bug by "cancelling" the reply when you click it and are already muted. 2021-02-08 07:38:39 -05:00
dependabot-preview[bot]
f9ae42d2c0
Merge pull request #4964 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210208043947 2021-02-08 12:04:17 +00:00
dependabot-preview[bot]
af2c38024f
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210205041308 to 0.1.0-prerelease.20210208043947.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210205041308...0.1.0-prerelease.20210208043947)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-08 11:54:55 +00:00
dependabot-preview[bot]
52b9c4430d
Merge pull request #4963 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210208031546 2021-02-08 03:56:23 +00:00
dependabot-preview[bot]
ef0058388a
Bump scratch-l10n from 3.11.20210207031837 to 3.11.20210208031546
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210207031837 to 3.11.20210208031546.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210207031837...3.11.20210208031546)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-08 03:47:12 +00:00
dependabot-preview[bot]
2dd5dc0ef7
Merge pull request #4962 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210207031837 2021-02-07 03:33:45 +00:00
dependabot-preview[bot]
bf0e511016
Bump scratch-l10n from 3.11.20210206031558 to 3.11.20210207031837
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210206031558 to 3.11.20210207031837.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210206031558...3.11.20210207031837)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-07 03:24:30 +00:00
dependabot-preview[bot]
2074af70db
Merge pull request #4960 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210206031558 2021-02-06 03:31:25 +00:00
dependabot-preview[bot]
7ce2604f01
Bump scratch-l10n from 3.11.20210205031546 to 3.11.20210206031558
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210205031546 to 3.11.20210206031558.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210205031546...3.11.20210206031558)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-06 03:21:41 +00:00
picklesrus
de5a8026c1 Show the blue box on replies that got the user muted. 2021-02-05 08:16:00 -05:00
picklesrus
9a3fe8f222 Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted. 2021-02-05 08:01:33 -05:00
dependabot-preview[bot]
313b306e69
Merge pull request #4958 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210205041308 2021-02-05 10:53:46 +00:00
dependabot-preview[bot]
f4c6f8b4e4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210204101145 to 0.1.0-prerelease.20210205041308.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210204101145...0.1.0-prerelease.20210205041308)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-05 10:43:55 +00:00
dependabot-preview[bot]
91d1d1500c
Merge pull request #4957 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210205031546 2021-02-05 03:47:03 +00:00
dependabot-preview[bot]
c26dad8312
Bump scratch-l10n from 3.11.20210204031607 to 3.11.20210205031546
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210204031607 to 3.11.20210205031546.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210204031607...3.11.20210205031546)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-05 03:37:19 +00:00
Karishma Chadha
a53f9aed35
Merge pull request #4956 from LLK/release/2021-02-04
[Develop] Update travis.yml to fix build issues on 'master'
2021-02-04 17:26:44 -05:00
Karishma Chadha
c42334a4cb
Merge pull request #4955 from LLK/release/2021-02-04
[Master] Update travis.yml to fix build issues on 'master'
2021-02-04 14:45:24 -05:00
Karishma Chadha
c9464954d0
Update travis.yml to fix build issues on 'master' 2021-02-04 13:51:02 -05:00
Karishma Chadha
38beb6a92a
Merge pull request #4948 from LLK/release/2021-02-04
[Develop] Release 2021-02-04
2021-02-04 12:31:19 -05:00
Karishma Chadha
6f3aed4a09
Merge pull request #4947 from LLK/release/2021-02-04
[Master] Release 2021-02-04
2021-02-04 12:30:59 -05:00
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 #4953 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 #4952 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 #4950 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 #4951 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 #4946 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 #4945 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 #4895 from chrisgarrity/relative-time-polyfill
Add @formatjs/relativetimeformat-polyfill
2021-02-02 11:35:52 -05:00