Commit graph

7772 commits

Author SHA1 Message Date
dependabot-preview[bot]
5359e6f5cd
Bump scratch-l10n from 3.11.20210329031438 to 3.11.20210330031505
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210329031438 to 3.11.20210330031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210329031438...3.11.20210330031505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-30 03:44:01 +00:00
Karishma Chadha
587ce9dd00 Add most recent gui hotfix version 2021-03-29 13:34:29 -04:00
Karishma Chadha
345046030c Reference new images of cats in the code 2021-03-29 13:17:31 -04:00
Karishma Chadha
7f5e8f7ea3 More secret lives and punctuation 2021-03-29 13:17:31 -04:00
seotts
1ba9be920a fix linting problem 2021-03-29 13:17:10 -04:00
seotts
9d4937fae4 remove unused import 2021-03-29 13:17:10 -04:00
seotts
14b87afe7e boop
upside down

load fake results

working on rainbow

rainbow

small change

secret life

remove fake results
2021-03-29 13:17:10 -04:00
Karishma Chadha
f861d912e1 Cat lives and images 2021-03-29 13:16:10 -04:00
Karishma Chadha
419a245d81 Revert "Revert "Merge branch 'hotfix/totally-normal-2020' into develop""
This reverts commit 934f238726.
2021-03-29 13:16:10 -04:00
dependabot-preview[bot]
632017842e
Merge pull request #5206 from LLK/dependabot/npm_and_yarn/y18n-3.2.2 2021-03-29 16:36:35 +00:00
dependabot-preview[bot]
adec52eaef
[Security] Bump y18n from 3.2.1 to 3.2.2
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 16:26:25 +00:00
Paul Kaplan
40122f809a
Merge pull request #5100 from paulkaplan/comments-reducer
Extract comments reducer from preview reducer
2021-03-29 11:40:23 -04:00
dependabot-preview[bot]
2edd90b731
Merge pull request #5202 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210329042543 2021-03-29 13:32:49 +00:00
dependabot-preview[bot]
bbd9e2fa3d
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210325034601 to 0.1.0-prerelease.20210329042543.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210325034601...0.1.0-prerelease.20210329042543)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 13:15:27 +00:00
dependabot-preview[bot]
895cbef163
Merge pull request #5201 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210329031438 2021-03-29 04:07:51 +00:00
dependabot-preview[bot]
f3e0d84037
Bump scratch-l10n from 3.11.20210328031444 to 3.11.20210329031438
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210328031444 to 3.11.20210329031438.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210328031444...3.11.20210329031438)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 03:59:41 +00:00
dependabot-preview[bot]
232fdac69d
Merge pull request #5200 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210328031444 2021-03-28 03:29:40 +00:00
dependabot-preview[bot]
ed6baed56a
Bump scratch-l10n from 3.11.20210327031512 to 3.11.20210328031444
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210327031512 to 3.11.20210328031444.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210327031512...3.11.20210328031444)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-28 03:21:10 +00:00
dependabot-preview[bot]
12b0916794
Merge pull request #5198 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210327031512 2021-03-27 03:29:48 +00:00
dependabot-preview[bot]
f1e8edbd51
Bump scratch-l10n from 3.11.20210326031542 to 3.11.20210327031512
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210326031542 to 3.11.20210327031512.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210326031542...3.11.20210327031512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-27 03:21:25 +00:00
dependabot-preview[bot]
91ba295a4d
Merge pull request #5193 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.13 2021-03-26 04:31:03 +00:00
dependabot-preview[bot]
63eaeadf1a
Merge pull request #5192 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.4 2021-03-26 04:30:21 +00:00
dependabot-preview[bot]
29bbdba87e
Merge pull request #5191 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.21 2021-03-26 04:29:27 +00:00
dependabot-preview[bot]
62f4fa8729
Bump @formatjs/intl-pluralrules from 4.0.12 to 4.0.13
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.12 to 4.0.13.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.12...@formatjs/intl-pluralrules@4.0.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-26 04:22:12 +00:00
dependabot-preview[bot]
d2494ce8cf
Bump @formatjs/intl-relativetimeformat from 8.1.3 to 8.1.4
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.3 to 8.1.4.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.3...@formatjs/intl-relativetimeformat@8.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-26 04:22:05 +00:00
dependabot-preview[bot]
a7546342b2
Bump @formatjs/intl-locale from 2.4.20 to 2.4.21
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.20 to 2.4.21.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.20...@formatjs/intl-locale@2.4.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-26 04:21:54 +00:00
dependabot-preview[bot]
2880812c5e
Merge pull request #5190 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210326031542 2021-03-26 03:33:57 +00:00
dependabot-preview[bot]
703691d904
Bump scratch-l10n from 3.11.20210325031604 to 3.11.20210326031542
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210325031604 to 3.11.20210326031542.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210325031604...3.11.20210326031542)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-26 03:25:17 +00:00
picklesrus
ff4c0fbcf5
Merge pull request #5184 from LLK/release/2021-03-24
[develop] Release/2021 03 24
2021-03-25 14:27:55 -04:00
picklesrus
d20288692b
Merge pull request #5185 from LLK/release/2021-03-24
Release/2021 03 24
2021-03-25 14:04:13 -04:00
dependabot-preview[bot]
a40e96f3dd
Merge pull request #5189 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210325034601 2021-03-25 10:59:19 +00:00
dependabot-preview[bot]
a400128024
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210324120840 to 0.1.0-prerelease.20210325034601.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210324120840...0.1.0-prerelease.20210325034601)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-25 10:51:06 +00:00
dependabot-preview[bot]
c9dda1995e
Merge pull request #5187 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210325031604 2021-03-25 03:39:32 +00:00
dependabot-preview[bot]
bd8fa8581f
Bump scratch-l10n from 3.11.20210324031512 to 3.11.20210325031604
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210324031512 to 3.11.20210325031604.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210324031512...3.11.20210325031604)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-25 03:31:55 +00:00
Eric Rosenbaum
8b98820495 Add nav bubbles 2021-03-24 16:12:47 -04:00
Eric Rosenbaum
82d759e30a grid displays “Project Title” 2021-03-24 16:12:37 -04:00
Paul Kaplan
8a33d1c5a5 Re-export missing base comment actions to simplify 2021-03-24 14:48:05 -04:00
Paul Kaplan
d02ddef8e7 Remove single nesting requirement that was preventing tests from running 2021-03-24 14:38:41 -04:00
Paul Kaplan
9252d56376 Merge branch 'develop' into comments-reducer 2021-03-24 14:35:12 -04:00
picklesrus
b3022d69a4
Merge pull request #5183 from LLK/develop
merge develop into release
2021-03-24 10:08:44 -04:00
dependabot-preview[bot]
c996d8306f
Merge pull request #5182 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210324120840 2021-03-24 13:45:42 +00:00
dependabot-preview[bot]
ae04b5da91
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210323153928 to 0.1.0-prerelease.20210324120840.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210323153928...0.1.0-prerelease.20210324120840)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-24 12:33:28 +00:00
dependabot-preview[bot]
9315583690
Merge pull request #5180 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210323153928 2021-03-24 10:58:03 +00:00
dependabot-preview[bot]
917f7901ca
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210323041806 to 0.1.0-prerelease.20210323153928.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210323041806...0.1.0-prerelease.20210323153928)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-24 10:49:59 +00:00
dependabot-preview[bot]
486c0014e5
Merge pull request #5178 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210324031512 2021-03-24 03:41:20 +00:00
dependabot-preview[bot]
eb691f36dd
Bump scratch-l10n from 3.11.20210323031446 to 3.11.20210324031512
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210323031446 to 3.11.20210324031512.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210323031446...3.11.20210324031512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-24 03:33:53 +00:00
Sarah Otts
363236055c
Merge pull request #5175 from seotts/modal-past-mute-messaging
Show different modal message when already muted
2021-03-23 17:01:30 -04:00
Eric Rosenbaum
9466a7b75b add grid 2021-03-23 16:58:38 -04:00
seotts
f6f1095d93 add justMuted variable, fix linting 2021-03-23 16:33:24 -04:00
BryceLTaylor
523b31c379 circleci deploy to staging with circle instead of travis 2021-03-23 16:01:09 -04:00