Commit graph

7575 commits

Author SHA1 Message Date
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
Ben Wheeler
7810eab73b slight change to wording about newer versions of scratch 2021-01-25 13:31:59 -05:00
Ben Wheeler
3e9d9acfd1 revise maintenance page to be 3.0 styled, update download links 2021-01-25 13:28:30 -05:00
dependabot-preview[bot]
90a132477f
Merge pull request #4892 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210125050354 2021-01-25 11:33:14 +00:00
dependabot-preview[bot]
8ff15a72e8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210121230641 to 0.1.0-prerelease.20210125050354.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210121230641...0.1.0-prerelease.20210125050354)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-25 11:15:47 +00:00
dependabot-preview[bot]
31ba6f7117
Merge pull request #4890 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210125031522 2021-01-25 04:02:26 +00:00
dependabot-preview[bot]
1c5181e145
Bump scratch-l10n from 3.10.20210124031505 to 3.10.20210125031522
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210124031505 to 3.10.20210125031522.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210124031505...3.10.20210125031522)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-25 03:45:36 +00:00
dependabot-preview[bot]
2ac1064057
Merge pull request #4889 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20210124031505 2021-01-24 03:36:35 +00:00
dependabot-preview[bot]
8a4591f7b0
Bump scratch-l10n from 3.10.20210122132044 to 3.10.20210124031505
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210122132044 to 3.10.20210124031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210122132044...3.10.20210124031505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-24 03:20:36 +00:00
seotts
f2a3dfda1b Revert "Revert "Use formik for feedback form""
This reverts commit c22c2c967b.
2021-01-22 15:14:21 -05:00
seotts
037f91e76c Revert "Revert "Add feedback step using a Formsy textarea""
This reverts commit 1bc3aaf0ee.
2021-01-22 15:14:06 -05:00
dependabot-preview[bot]
4a7b81728c 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 15:12:14 -05:00
seotts
1bc3aaf0ee Revert "Add feedback step using a Formsy textarea"
This reverts commit 5e4fc154c6.
2021-01-22 15:12:14 -05:00
seotts
c22c2c967b Revert "Use formik for feedback form"
This reverts commit 512358e9af.
2021-01-22 15:12:14 -05:00
dependabot-preview[bot]
8d31720004
Merge pull request #4884 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210121230641 2021-01-22 19:33:17 +00:00
seotts
14c7a7eae0 temporarily remove failing test 2021-01-22 13:16:44 -05:00
seotts
b42966ac6a Revert "Add feedback step using a Formsy textarea"
This reverts commit 5e4fc154c6.
2021-01-22 12:13:40 -05:00
seotts
af56e2389c Revert "Use formik for feedback form"
This reverts commit 512358e9af.
2021-01-22 12:13:03 -05:00
seotts
512358e9af Use formik for feedback form
cleanup
2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6 Add feedback step using a Formsy textarea 2021-01-22 11:58:56 -05:00
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