Commit graph

7197 commits

Author SHA1 Message Date
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 #4933 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 #4928 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 #4919 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 #4922 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 #4920 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 #4900 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 #4911 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 #4910 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 #4917 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210128034946 2021-01-28 11:09:20 +00:00
dependabot-preview[bot]
1b5108fcdb
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210127035945 to 0.1.0-prerelease.20210128034946.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210127035945...0.1.0-prerelease.20210128034946)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-28 10:51:58 +00:00
dependabot-preview[bot]
8f370e6352
Merge pull request #4916 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210128031514 2021-01-28 03:53:26 +00:00
dependabot-preview[bot]
f756d346b8
Bump scratch-l10n from 3.11.20210127031556 to 3.11.20210128031514
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210127031556 to 3.11.20210128031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210127031556...3.11.20210128031514)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-28 03:35:41 +00:00
chrisgarrity
fb57798f1b
Merge pull request #4915 from chrisgarrity/release/2021-01-27-update-gui
Update to scratch-gui@0.1.0-prerelease.20210127220606
2021-01-27 17:28:49 -05:00
Chris Garrity
2b1f5ba5d0 Update to scratch-gui@0.1.0-prerelease.20210127220606 2021-01-27 17:25:11 -05:00
Paul Kaplan
6e86a616a2
Merge pull request #4909 from LLK/develop
Merge develop to release branch 2021-01-27
2021-01-27 09:39:49 -05:00
dependabot-preview[bot]
dac0e7cadf
Merge pull request #4908 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210127035945 2021-01-27 11:02:52 +00:00
dependabot-preview[bot]
97623b6c50
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210126085610 to 0.1.0-prerelease.20210127035945.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210126085610...0.1.0-prerelease.20210127035945)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 10:45:14 +00:00
dependabot-preview[bot]
4cfabaf67d
Merge pull request #4906 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210127031556 2021-01-27 04:01:14 +00:00
dependabot-preview[bot]
cbe187f55c
Bump scratch-l10n from 3.11.20210127015526 to 3.11.20210127031556
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210127015526 to 3.11.20210127031556.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210127015526...3.11.20210127031556)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 03:43:01 +00:00
dependabot-preview[bot]
d24c5ff88e
Merge pull request #4905 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210127015526 2021-01-27 02:18:21 +00:00
dependabot-preview[bot]
4bb7911e49
Bump scratch-l10n from 3.11.20210127013110 to 3.11.20210127015526
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210127013110 to 3.11.20210127015526.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210127013110...3.11.20210127015526)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 02:01:02 +00:00
dependabot-preview[bot]
ed8ab88128
Merge pull request #4904 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210127013110 2021-01-27 01:55:05 +00:00
dependabot-preview[bot]
87b2054660
Bump scratch-l10n from 3.11.20210126234757 to 3.11.20210127013110
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210126234757 to 3.11.20210127013110.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210126234757...3.11.20210127013110)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 01:36:38 +00:00
dependabot-preview[bot]
af4b7a5258
Merge pull request #4903 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210126234757 2021-01-27 00:11:07 +00:00
dependabot-preview[bot]
16e49f451b
Bump scratch-l10n from 3.11.20210126195218 to 3.11.20210126234757
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210126195218 to 3.11.20210126234757.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210126195218...3.11.20210126234757)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 23:53:34 +00:00
Benjamin Wheeler
656f9faaf6
Merge pull request #4887 from benjiwheeler/maintenance-revise
revise maintenance page to be 3.0 styled, update download links
2021-01-26 16:58:49 -05:00
Ben Wheeler
d6f3158a7a revised doctype, icon size 2021-01-26 16:14:48 -05:00
Sarah Otts
90e0f40886
Merge branch 'develop' into automod-feedback-modal 2021-01-26 15:30:26 -05:00
seotts
a037395689 Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal
# Conflicts:
#	src/components/modal/mute/modal.jsx
#	src/components/modal/mute/modal.scss
#	src/l10n.json
2021-01-26 15:27:05 -05:00
dependabot-preview[bot]
9c78476f21
Merge pull request #4902 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210126195218 2021-01-26 20:15:49 +00:00
dependabot-preview[bot]
92d5672624
Bump scratch-l10n from 3.10.20210126031644 to 3.11.20210126195218
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210126031644 to 3.11.20210126195218.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210126031644...3.11.20210126195218)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 19:58:06 +00:00
Chris Garrity
1afa2a3e33 Adjust formatting of the comment status box
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
2021-01-26 08:58:01 -05:00
Chris Garrity
eac7552841 Revise messaging when scratchers are muted
We want folks to use comments appropriately, not punish them. Reword the messaging to be more friendly and encourage positive uses of comments.
2021-01-26 08:42:41 -05:00
dependabot-preview[bot]
0c3a409089
Merge pull request #4899 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210126085610 2021-01-26 11:48:08 +00:00
dependabot-preview[bot]
4460ebbaca
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210125050354 to 0.1.0-prerelease.20210126085610.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210125050354...0.1.0-prerelease.20210126085610)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 10:47:26 +00:00
dependabot-preview[bot]
2f19d27f80
Merge pull request #4897 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210126031644 2021-01-26 03:45:54 +00:00
dependabot-preview[bot]
94522ad2a2
Bump scratch-l10n from 3.10.20210125031522 to 3.10.20210126031644
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210125031522 to 3.10.20210126031644.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210125031522...3.10.20210126031644)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 03:28:38 +00:00
seotts
9df36b0fcf add tests for feedback form, clean-up form 2021-01-25 17:52:59 -05:00
Ben Wheeler
7ec9d58784 tweaks to formatting, icons, links, fonts 2021-01-25 14:11:34 -05:00
Benjamin Wheeler
0155d28ea5
Merge pull request #4831 from GrahamSH-LLK/develop
Update 1.4 Copytext
2021-01-25 13:32:48 -05:00