scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 16:51:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7292 commits 221 branches 1 tag 508 MiB
Commit graph

2399 commits

Author SHA1 Message Date
picklesrus
9a3fe8f222 Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted. 2021-02-05 08:01:33 -05:00
picklesrus
92667c097d Add tests and expose steps enum so it can be referenced from outside MuteModal 2021-02-04 11:13:30 -05:00
picklesrus
f7bf204924 Draft: open mute modal from reply button if you're muted. 2021-02-02 11:34:27 -05:00
Karishma Chadha
26d3bb73c6
Merge pull request #4932 from LLK/hotfix/sec-text-update 
[Develop] Hotfix SEC Page Text Update
 2021-02-01 10:32:27 -05:00
Zoë Bentley
e51591620f Changed text on SEC page (for hotfix) 2021-01-29 14:56:47 -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
Chris Garrity
64c89b1716 Update to the general moderation message. 2021-01-28 12:11:35 -05:00
Chris Garrity
d639c2d7a9 Fix typo 2021-01-28 11:01:09 -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
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
seotts
9d08b69bed show correct messaging instead of always General 2021-01-20 13:03:39 -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
Paul Kaplan
e1d0329633 Fix lint issues again 2021-01-13 09:39:36 -05:00
Paul Kaplan
4ca6e52233 Fix formatting 2021-01-13 09:29:40 -05:00
Paul Kaplan
2a0aa3b03e Add the FAQ 2021-01-13 08:55:22 -05:00
Paul Kaplan
5883070647 Update SEC page content 2021-01-12 15:59:59 -05:00
Benjamin Wheeler
596343048a
Merge pull request #4748 from mxmou/fix-search-loadmore 
Fix "Load more" scrolling on search results
 2021-01-12 14:51:35 -05:00
seotts
1aa59edaa3 Remove use of FormattedHTMLMessage 2021-01-08 14:03:29 -05:00
seotts
31016df1f5 Don’t fail if mute_status isn’t available 2021-01-07 14:05:02 -05:00
seotts
c8373ab888 Revert "Revert "Add new mute message types"" 
This reverts commit 1575ed06cf.
 2021-01-07 14:04:48 -05:00
Sarah Otts
1575ed06cf
Revert "Add new mute message types" 2021-01-06 16:51:03 -05:00
Karishma Chadha
6d8cac4239
Merge pull request #4817 from LLK/hotfix/sec-google-nolink 
[Develop] Hotfix sec google nolink
 2021-01-06 10:56:41 -05:00
Karishma Chadha
3bdb5abdd5
Merge pull request #4814 from kchadha/annual-report-credits 
Add Tracy to credits page and Annual Report team section.
 2021-01-06 10:44:06 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix 
World map fixes - Border thickness, Eswatini, remove unused css
 2021-01-06 10:43:50 -05:00
Karishma Chadha
edca23f6ce Add Tracy to credits page and Annual Report team section. 2021-01-05 15:51:38 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs 
In the Annual Report Team section, open link to Scratch Team members in new tab
 2021-01-05 14:38:03 -05:00
Sarah Otts
f3dbe23c5e
Fix syntax error from merge 2021-01-04 11:20:16 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
picklesrus
664ccc5d36
Update compose-comment.jsx 
Fix missing comma from bad merge
 2020-12-21 10:49:16 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute 2020-12-21 08:38:37 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute 
Show warning message when user has been muted several times.
 2020-12-21 08:36:21 -05:00
Benjamin Wheeler
0c911da463
Merge pull request #4563 from GrahamSH-LLK/patch-1 
Add "FloralSunset" to Credits Page
 2020-12-18 20:54:41 -05:00
seotts
7e140b3832 add new mute messages 
Get correct mute message info for modal

remove extra spapce
 2020-12-18 10:24:43 -05:00
picklesrus
ad5dc31cc7 Have mute modal always show if you post a comment and showWarning is true. 2020-12-18 09:30:02 -05:00
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -05:00
picklesrus
19b260a4a5 Add a timeout to stop displaying the mute status when a mute expires. 2020-12-15 14:49:35 -05:00
picklesrus
a39244ea6c
Merge branch 'develop' into timeout-mute 2020-12-14 13:27:12 -05:00
chrisgarrity
17407f0fcf
Merge pull request #4752 from chrisgarrity/localize-mute 
Localize mute
 2020-12-11 16:19:27 -05:00
Chris Garrity
501147060d Update generic message copy 
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
 2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages 
Add formatted messages for comment status and mute modal
 2020-12-11 08:44:17 -05:00
picklesrus
110077e8e8 Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit. 
Also, fix isMuted so it doesn't do an extra unit conversion.
 2020-12-11 08:14:15 -05:00
GrahamSH
88aee16cb7
Move to fix alphabetization 2020-12-10 16:59:07 -05:00
MaxiMouse
8f4c67144a Fix "Load more" scrolling on search results 2020-12-10 22:12:51 +01:00
Benjamin Wheeler
8d4a5c2f91
Merge pull request #4526 from Purple-Hacker/patch-2 
Updated addresses on DMCA
 2020-12-10 14:21:28 -05:00
picklesrus
2d5e9a6378 Fix merge conflicts and set default object for mute_status if props do not exist. 2020-12-08 08:00:01 -05:00
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted. 
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
 2020-12-08 07:28:40 -05:00
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
seotts
1d70ee243c Make borders smaller, show data for Eswatini 2020-12-07 12:45:01 -05:00
seotts
86650e1ce9 open link to Scratch Team member in new tab 2020-12-07 12:43:43 -05:00
Paul Kaplan
591b3ce6a2 Add Google.org to intro paragraph on SEC 2020-12-04 09:13:02 -05:00
Paul Kaplan
f315ea2f15
Update the SeC page wording 
Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.”

Change requested from KO.
 2020-12-01 13:32:36 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
picklesrus
0f83b0c7c8
Merge pull request #4655 from picklesrus/use-minutes 
Disable comment box functionality when you've just been muted.
 2020-11-25 10:18:41 -05:00
picklesrus
71521e2aa5 Fix lint and update text. 2020-11-18 14:48:15 -05:00
picklesrus
fe9d9078b2 Fix styling of disabled comment box. 2020-11-18 14:40:11 -05:00
Zoë Bentley
dad5a34fbe Changed Teacher Accounts Setup Guide link to PDF link on resources server 2020-11-18 12:50:22 -05:00
Zoë Bentley
1bfa0f20a3 Changed Teacher Account Setup Guide link from .doc to .PDF 2020-11-18 12:05:33 -05:00
Ray Schamp
433a5c7100
Merge pull request #4664 from LLK/hotfix/hoc-banner-2020 
[Develop] HOC banner 2020
 2020-11-18 10:23:56 -05:00
picklesrus
aed0f024c0 Disable comment box functionality when you've just been muted. 
Also, keep showing the blue comment status box based on when the mute 
expires rather than basing it on the status of the commet box itself.

TODO: css for disabled state.  The grey is there as a placeholder/proof 
of concept.
 2020-11-17 17:04:54 -05:00
Ben Wheeler
a4689fc159 Turn off middle banner and set HoC start and end times for 2020 2020-11-17 15:04:29 -05:00
Ben Wheeler
bd3ef208f6 added makeItFly image and text for HoC banner 2020-11-17 15:04:07 -05:00
Paul Kaplan
2292fc039d
Merge pull request #4649 from LLK/hotfix/sec-page 
[Hotfix/Develop] SEC page
 2020-11-17 11:17:43 -05:00
Paul Kaplan
b92b98bd19 Fix hyphens 2020-11-16 15:19:42 -05:00
Paul Kaplan
2799bc97f6 Fix lint error 2020-11-16 14:39:37 -05:00
Paul Kaplan
ee645b250a Add culturally sustaining link 2020-11-16 14:31:31 -05:00
Christopher Willis-Ford
35839ada12 remove version number from micro:bit firmware URL 
This new URL will be a redirect to the actual file, including the
version number. This way we'll be able to deploy firmware updates
without needing to change any content in this repository.
 2020-11-16 11:04:36 -08:00
Paul Kaplan
550a661687 Add SEC page 2020-11-16 10:35:40 -05:00
picklesrus
b1f7a2be10
Merge pull request #4637 from picklesrus/use-minutes 
Convert mute timestamp to always show in minutes.
 2020-11-16 10:28:55 -05:00
Karishma Chadha
760e303d30
Merge pull request #4617 from kchadha/annual-report-data-cleanup 
Annual Report - Break out supporters list into separate JSON
 2020-11-16 10:15:28 -05:00
Karishma Chadha
4728e3f50e
Merge pull request #4615 from kchadha/annual-report-link 
Add link to annual report from about page
 2020-11-16 10:15:02 -05:00
picklesrus
0470e0e56b Convert timestamp to always show in minutes. 
This is minor step towards correct time formatting. More coming later.
 2020-11-13 15:03:49 -05:00
Benjamin Wheeler
79d3d07dcc
Merge pull request #4284 from doc-han/patch-1 
update translation URL
 2020-11-13 14:13:16 -05:00
Ben Wheeler
f2111eb5a3 updated number of languages 2020-11-13 14:11:25 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days. 
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
 2020-11-13 08:26:54 -05:00
Radman Siddiki
b74d857ad9 Delete communityblocks-interviews.jsx 2020-11-12 13:43:33 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior 
Skeleton of code to show mute modal and comment status.
 2020-11-10 10:24:04 -05:00
Karishma Chadha
f89d1313e0 Break out supporters lists into json file and dynamically create lists of supporters. 2020-11-09 11:37:31 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status. 
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
 2020-11-09 11:01:42 -05:00
Karishma Chadha
c3accb0111 Add link to annual report from about page 2020-11-09 10:20:11 -05:00
Benjamin Wheeler
69efc1afea
Merge pull request #4287 from R4356th/patch-11 
Replace "Tips Page" with "Ideas Page"
 2020-11-05 09:41:48 -05:00
Karishma Chadha
4369899813 Fix BLM studio link 2020-10-29 09:43:10 -04:00
Karishma Chadha
4f6828bde8 Update board member section 2020-10-28 18:31:10 -04:00
seotts
b3cdc0ebcd fix Mahmoud’s image 2020-10-28 18:17:07 -04:00
seotts
729739c222 fix typo in project title 2020-10-28 18:04:51 -04:00
Karishma Chadha
412de9dbda Fix typos in content 2020-10-28 17:08:36 -04:00
Karishma Chadha
8d722d454f Update l10n to remove unused strings from financials section 2020-10-28 13:06:44 -04:00
seotts
367ada3452 remove middle of financials section 2020-10-28 12:57:20 -04:00
Karishma Chadha
b673d718d4 Minor content update 2020-10-28 10:34:41 -04:00
Karishma Chadha
9a5560bdf5 Don't show scratch-jr-transition images on small screens. Fix lint issue. 2020-10-27 16:43:21 -04:00
seotts
a8058aa0bf remove comments; add new lines 2020-10-27 15:29:50 -04:00
seotts
5e075a2feb make financials button responsive 2020-10-27 14:23:34 -04:00
seotts
23736463f8 make map key even more responsive 2020-10-27 14:16:42 -04:00
seotts
f88fd8279a make map key responsive 2020-10-27 13:55:10 -04:00
Karishma Chadha
73cf337ac2 Map title update 2020-10-27 12:55:16 -04:00