scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 13:32:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8913 commits 223 branches 1 tag 526 MiB
Commit graph

8913 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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