Commit graph

9379 commits

Author SHA1 Message Date
dependabot-preview[bot]
a18d3f0021
Merge pull request #4885 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210122132044 2021-01-22 13:45:48 +00:00
dependabot-preview[bot]
1e5dd58422
Bump scratch-l10n from 3.10.20210121031534 to 3.10.20210122132044
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210121031534 to 3.10.20210122132044.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210121031534...3.10.20210122132044)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-22 13:29:40 +00:00
dependabot-preview[bot]
847fd7e1c7
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210121085100 to 0.1.0-prerelease.20210121230641.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210121085100...0.1.0-prerelease.20210121230641)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-22 10:53:47 +00:00
Sarah Otts
fa27af5a8e
Merge pull request #4880 from seotts/automod-messaging-all-types
Show correct mute messaging instead of always the general message
2021-01-21 16:19:53 -05:00
picklesrus
61e0404485
Merge pull request #4876 from LLK/release/2021-01-21
[develop]Release/2021 01 21
2021-01-21 11:11:47 -05:00
picklesrus
514a390664
Merge pull request #4877 from LLK/release/2021-01-21
Release/2021 01 21
2021-01-21 09:47:10 -05:00
dependabot-preview[bot]
67c173fa42
Merge pull request #4882 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210121085100 2021-01-21 11:01:58 +00:00
dependabot-preview[bot]
cc8f56112d
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210120145348 to 0.1.0-prerelease.20210121085100.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210120145348...0.1.0-prerelease.20210121085100)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-21 10:45:28 +00:00
dependabot-preview[bot]
b20a02bce6
Merge pull request #4881 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210121031534 2021-01-21 03:54:42 +00:00
dependabot-preview[bot]
e3d5b79b09
Bump scratch-l10n from 3.10.20210120031458 to 3.10.20210121031534
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210120031458 to 3.10.20210121031534.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210120031458...3.10.20210121031534)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-21 03:38:11 +00:00
seotts
9d08b69bed show correct messaging instead of always General 2021-01-20 13:03:39 -05:00
picklesrus
363aefcef8
Merge pull request #4879 from LLK/develop
merge develop into release again to pickup new gui
2021-01-20 11:22:21 -05:00
picklesrus
41c6dd65a2
Merge pull request #4878 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210120145348
Bump scratch-gui from 0.1.0-prerelease.20210119122627 to 0.1.0-prerelease.20210120145348
2021-01-20 10:59:34 -05:00
dependabot-preview[bot]
46e260dcf5
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210119122627 to 0.1.0-prerelease.20210120145348.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210119122627...0.1.0-prerelease.20210120145348)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-20 15:19:39 +00:00
picklesrus
8b1b8de6dd
Merge pull request #4875 from LLK/develop
Merge develop into release
2021-01-20 07:22:47 -05:00
dependabot-preview[bot]
080f0def30
Merge pull request #4874 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210119122627 2021-01-20 11:49:03 +00:00
dependabot-preview[bot]
a0ba8da232
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210119040907 to 0.1.0-prerelease.20210119122627.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210119040907...0.1.0-prerelease.20210119122627)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-20 11:32:53 +00:00
dependabot-preview[bot]
00d1b02a25
Merge pull request #4873 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210120031458 2021-01-20 03:44:24 +00:00
dependabot-preview[bot]
f989a58362
Bump scratch-l10n from 3.10.20210119031507 to 3.10.20210120031458
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210119031507 to 3.10.20210120031458.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210119031507...3.10.20210120031458)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-20 03:28:19 +00:00
dependabot-preview[bot]
cf45128620
Merge pull request #4866 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210119040907 2021-01-19 11:07:39 +00:00
dependabot-preview[bot]
c070350dfc
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210118042355 to 0.1.0-prerelease.20210119040907.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210118042355...0.1.0-prerelease.20210119040907)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-19 10:51:41 +00:00
dependabot-preview[bot]
632f2d3277
Merge pull request #4865 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210119031507 2021-01-19 03:51:48 +00:00
dependabot-preview[bot]
10b2610402
Bump scratch-l10n from 3.10.20210118031657 to 3.10.20210119031507
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210118031657 to 3.10.20210119031507.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210118031657...3.10.20210119031507)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-19 03:35:52 +00:00
dependabot-preview[bot]
853cf6d953
Merge pull request #4862 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210118042355 2021-01-18 12:01:22 +00:00
dependabot-preview[bot]
ed9f401cde
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210115093838 to 0.1.0-prerelease.20210118042355.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210115093838...0.1.0-prerelease.20210118042355)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-18 11:46:26 +00:00
dependabot-preview[bot]
69b0d9f53e
Merge pull request #4861 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210118031657 2021-01-18 04:03:22 +00:00
dependabot-preview[bot]
a9a6e760be
Bump scratch-l10n from 3.10.20210117031557 to 3.10.20210118031657
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210117031557 to 3.10.20210118031657.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210117031557...3.10.20210118031657)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-18 03:47:54 +00:00
dependabot-preview[bot]
e83db5d76b
Merge pull request #4859 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210117031557 2021-01-17 03:36:33 +00:00
dependabot-preview[bot]
6fdf732536
Bump scratch-l10n from 3.10.20210116031507 to 3.10.20210117031557
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210116031507 to 3.10.20210117031557.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210116031507...3.10.20210117031557)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-17 03:21:24 +00:00
dependabot-preview[bot]
ef15181b11
Merge pull request #4858 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210116031507 2021-01-16 03:37:09 +00:00
dependabot-preview[bot]
9b5cfd2b6a
Bump scratch-l10n from 3.10.20210115031552 to 3.10.20210116031507
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210115031552 to 3.10.20210116031507.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210115031552...3.10.20210116031507)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-16 03:21:41 +00:00
dependabot-preview[bot]
63fc6cdbd1
Merge pull request #4856 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210115093838 2021-01-15 11:07:30 +00:00
dependabot-preview[bot]
7ac45fb136
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210114042314 to 0.1.0-prerelease.20210115093838.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210114042314...0.1.0-prerelease.20210115093838)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-15 10:51:27 +00:00
dependabot-preview[bot]
e34c7300f7
Merge pull request #4854 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210115031552 2021-01-15 03:42:57 +00:00
dependabot-preview[bot]
43f752fdc0
Bump scratch-l10n from 3.10.20210114031436 to 3.10.20210115031552
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210114031436 to 3.10.20210115031552.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210114031436...3.10.20210115031552)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-15 03:27:50 +00:00
picklesrus
ce4f0516e8
Merge pull request #4764 from picklesrus/timeout-mute
Add a timeout to stop displaying the mute status when a mute expires.
2021-01-14 15:08:17 -05:00
Eric Rosenbaum
325ea47953
Merge pull request #4847 from LLK/release/2021-01-13
[Develop] Release 2021-01-13
2021-01-14 11:51:33 -05:00
Eric Rosenbaum
ad9d5b00f8
Merge pull request #4846 from LLK/release/2021-01-13
[Master] Release 2021-01-13
2021-01-14 11:51:01 -05:00
picklesrus
a5f436a4c0
Update compose-comment.jsx
Fix whitespace
2021-01-14 08:05:47 -05:00
picklesrus
6eca07a413
Fix syntax error from merge 2021-01-14 07:55:54 -05:00
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute 2021-01-14 07:47:47 -05:00
picklesrus
55d69b0e7b merge 2021-01-14 07:43:53 -05:00
picklesrus
47d63cb529 Reset more of the state when a mute expires.
This allows the comment box to show up again in a normal state with no 
errors.
2021-01-14 07:42:53 -05:00
dependabot-preview[bot]
bbef2eefac
Merge pull request #4852 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210114042314 2021-01-14 10:58:17 +00:00
dependabot-preview[bot]
7a535a9bd0
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210112040114 to 0.1.0-prerelease.20210114042314.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210112040114...0.1.0-prerelease.20210114042314)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-14 10:43:50 +00:00
dependabot-preview[bot]
a594df2603
Merge pull request #4850 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210114031436 2021-01-14 03:39:42 +00:00
dependabot-preview[bot]
30fac77ae8
Bump scratch-l10n from 3.10.20210112031449 to 3.10.20210114031436
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210112031449 to 3.10.20210114031436.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210112031449...3.10.20210114031436)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-14 03:24:52 +00:00
Paul Kaplan
d27f301b91
Merge pull request #4848 from LLK/develop
Update relase branch with SEC update that went into develop
2021-01-13 10:20:28 -05:00
Paul Kaplan
8e87f82f92
Merge pull request #4843 from paulkaplan/sec-update
Update SEC page content
2021-01-13 10:18:56 -05:00
Paul Kaplan
e1d0329633 Fix lint issues again 2021-01-13 09:39:36 -05:00