Commit graph

7360 commits

Author SHA1 Message Date
dependabot-preview[bot]
32a361234f
Merge pull request #5158 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210318040059 2021-03-18 10:53:22 +00:00
dependabot-preview[bot]
8a8a64f0cf
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210317035743 to 0.1.0-prerelease.20210318040059.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210317035743...0.1.0-prerelease.20210318040059)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-18 10:45:37 +00:00
dependabot-preview[bot]
b9d097e505
Merge pull request #5156 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210318031539 2021-03-18 03:43:18 +00:00
dependabot-preview[bot]
fe0b968192
Bump scratch-l10n from 3.11.20210317031517 to 3.11.20210318031539
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210317031517 to 3.11.20210318031539.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210317031517...3.11.20210318031539)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-18 03:35:23 +00:00
Sarah Otts
1d381c073a
Merge pull request #5155 from zoebentley/conference-update-march-2021-fixed-dependencies
Fixed other place where date appears on Conference page
2021-03-17 16:09:04 -04:00
seotts
23da1e2781 Continued work 2021-03-17 16:07:30 -04:00
Zoë Bentley
acbda599e5 Fixed other place where date appears 2021-03-17 16:04:55 -04:00
Eric Rosenbaum
5aeee265b7
Merge pull request #5152 from LLK/develop
merge from develop to release branch
2021-03-17 11:25:45 -04:00
dependabot-preview[bot]
ff18ff4a76
Merge pull request #5151 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210317035743 2021-03-17 10:56:04 +00:00
dependabot-preview[bot]
c3231dd2b7
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210302213127 to 0.1.0-prerelease.20210317035743.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210302213127...0.1.0-prerelease.20210317035743)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-17 10:48:52 +00:00
dependabot-preview[bot]
9286165164
Merge pull request #5150 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210317031517 2021-03-17 03:43:09 +00:00
dependabot-preview[bot]
6b28e1d040
Bump scratch-l10n from 3.11.20210316031549 to 3.11.20210317031517
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210316031549 to 3.11.20210317031517.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210316031549...3.11.20210317031517)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-17 03:35:47 +00:00
Sarah Otts
c3342d9224
Merge pull request #5121 from zoebentley/conference-update-march-2021-fixed-dependencies
Made changes to conf 2020 page (fixed dependencies)
2021-03-16 15:05:48 -04:00
Paul Kaplan
eb3bdfee56 Fix linting 2021-03-16 14:58:54 -04:00
Zoë Bentley
9e74481db4 Changed the date to be only one day, July 22 2021-03-16 14:57:04 -04:00
Paul Kaplan
acedd550da Use the infinite loading module for all the data 2021-03-16 14:18:22 -04:00
Paul Kaplan
6b87429e65 Create a redux module for infinitely loading editable lists 2021-03-16 14:17:52 -04:00
Paul Kaplan
560379f9fb Simple data fetching using react hooks 2021-03-16 14:17:52 -04:00
dependabot-preview[bot]
cfc749ab72
Merge pull request #5148 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210316031549 2021-03-16 03:50:49 +00:00
dependabot-preview[bot]
f9e4d8af1c
Bump scratch-l10n from 3.11.20210315031457 to 3.11.20210316031549
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210315031457 to 3.11.20210316031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210315031457...3.11.20210316031549)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-16 03:43:09 +00:00
seotts
cf71b77622 Work on adding messaging for previous mute 2021-03-15 15:42:12 -04:00
dependabot-preview[bot]
3030f8dfda
Merge pull request #5146 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.3 2021-03-15 17:32:47 +00:00
dependabot-preview[bot]
95230c26d1
Merge pull request #5145 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.20 2021-03-15 17:28:24 +00:00
dependabot-preview[bot]
82b761fc9b
Merge pull request #5144 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.12 2021-03-15 17:26:52 +00:00
dependabot-preview[bot]
3eb3788f3c
Bump @formatjs/intl-relativetimeformat from 8.1.2 to 8.1.3
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.2 to 8.1.3.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.2...@formatjs/intl-relativetimeformat@8.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-15 17:24:53 +00:00
dependabot-preview[bot]
df62420810
Bump @formatjs/intl-locale from 2.4.19 to 2.4.20
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.19 to 2.4.20.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.19...@formatjs/intl-locale@2.4.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-15 17:20:19 +00:00
dependabot-preview[bot]
51dc30288d
Bump @formatjs/intl-pluralrules from 4.0.11 to 4.0.12
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.11 to 4.0.12.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.11...@formatjs/intl-pluralrules@4.0.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-15 17:20:10 +00:00
Paul Kaplan
7b7266c5b4
Merge pull request #5117 from paulkaplan/studio-route
Add dev route with very bare studio playground
2021-03-15 12:03:24 -04:00
chrisgarrity
a5b735f971
Merge pull request #5142 from LLK/hotfix/automod-mar15
[Develop] Hotfix - automod everyone (mar 15)
2021-03-15 09:31:10 -04:00
chrisgarrity
14052544bd
Merge pull request #5143 from LLK/hotfix/automod-mar15
[Master] Hotfix - automod everyone (mar15)
2021-03-15 09:30:27 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted
Prevent feedback when not just muted
2021-03-15 09:10:48 -04:00
dependabot-preview[bot]
266833b35c
Merge pull request #5136 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210315031457 2021-03-15 03:53:58 +00:00
dependabot-preview[bot]
97f4bb711b
Bump scratch-l10n from 3.11.20210314031515 to 3.11.20210315031457
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210314031515 to 3.11.20210315031457.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210314031515...3.11.20210315031457)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-15 03:46:16 +00:00
dependabot-preview[bot]
e6a0a3d57c
Merge pull request #5133 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210314031515 2021-03-14 03:28:37 +00:00
dependabot-preview[bot]
922b1d46b0
Bump scratch-l10n from 3.11.20210313031534 to 3.11.20210314031515
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210313031534 to 3.11.20210314031515.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210313031534...3.11.20210314031515)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-14 03:21:05 +00:00
dependabot-preview[bot]
1fe239b065
Merge pull request #5131 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210313031534 2021-03-13 03:47:18 +00:00
dependabot-preview[bot]
07d830eae2
Bump scratch-l10n from 3.11.20210312031542 to 3.11.20210313031534
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210312031542 to 3.11.20210313031534.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210312031542...3.11.20210313031534)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-13 03:40:13 +00:00
Sarah Otts
da64706b0d
Remove unused FlexRow 2021-03-12 09:10:25 -05:00
dependabot-preview[bot]
391470beab
Merge pull request #5129 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210312031542 2021-03-12 03:51:18 +00:00
dependabot-preview[bot]
34bd50a501
Bump scratch-l10n from 3.11.20210311031457 to 3.11.20210312031542
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210311031457 to 3.11.20210312031542.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210311031457...3.11.20210312031542)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-12 03:42:24 +00:00
seotts
50f49c28a2 remove commented-out test 2021-03-11 16:31:59 -05:00
seotts
936172d70b only show feedback link for new mute
Add variable for isBad string
2021-03-11 13:06:51 -05:00
Karishma Chadha
65782822a9
Merge pull request #5127 from LLK/release/2021-03-11
[Develop] Release 2021-03-11
2021-03-11 10:45:38 -05:00
Karishma Chadha
03c8ab448b
Merge pull request #5126 from LLK/release/2021-03-11
[Master] Release 2021-03-11
2021-03-11 10:45:09 -05:00
dependabot-preview[bot]
2e560afe20
Merge pull request #5124 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210311031457 2021-03-11 03:51:40 +00:00
dependabot-preview[bot]
5e4780dbe1
Bump scratch-l10n from 3.11.20210310031445 to 3.11.20210311031457
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210310031445 to 3.11.20210311031457.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210310031445...3.11.20210311031457)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-11 03:42:09 +00:00
Sarah Otts
39f3950620
Merge pull request #5123 from seotts/fix-llk-link
Fix LLK link
2021-03-10 16:17:40 -05:00
seotts
f78a683b09 Update link to LLK to new Media Lab url 2021-03-10 16:16:06 -05:00
Paul Kaplan
fb4370b412 Remove dev routes on staging 2021-03-10 15:09:07 -05:00
Karishma Chadha
735a70963d
Merge pull request #5122 from LLK/develop
Pull changes from develop into release branch
2021-03-10 11:19:27 -05:00