scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 07:08:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5684 commits 217 branches 1 tag 462 MiB
Commit graph

3398 commits

Author SHA1 Message Date
Sarah Otts
6904f50718
Merge pull request #3973 from seotts/add-disrespectful-report 
Add disrespectful report option, reorder options
 2020-05-15 10:43:29 -04:00
Chris Willis-Ford
1bab2bb59a
Merge pull request #3856 from cwillisf/day1-student-country-default 
default student's country to educator's during reg
 2020-05-13 11:11:18 -07:00
Ben Wheeler
4bd813629f safer referencing of teacher country 2020-05-13 13:20:36 -04:00
seotts
52b8dff59a Add disrespectful report option, reorder options 2020-05-13 11:41:05 -04:00
Chris Garrity
3c744bed4c Enable Help widget 
Enable Helpwidget, but keep showing the form for iOS 10 and lower.
 2020-05-08 13:02:07 -04:00
Chris Garrity
f600cad373 Put new help widget back behind feature flag 2020-05-07 12:30:50 -04:00
picklesrus
c5e1aa5324
Merge pull request #3857 from picklesrus/educator-faq-2 
Second, smaller round of updates to the FAQ page.
 2020-05-06 15:02:41 -04:00
Benjamin Wheeler
7309dda06b
Merge pull request #3849 from Accio1/issue/gh#3848-Move-People-To-Past-Contributers 
Move Andrew and Abisola to past contributors
 2020-05-06 00:40:27 -04:00
picklesrus
9a4b02bd98
Merge pull request #3847 from picklesrus/educator-page-mini-update 
Educator page mini update
 2020-05-05 14:15:14 -04:00
Chris Willis-Ford
39a7788c87
Merge pull request #3854 from LLK/hotfix/scratch-desktop-3.10.2 
[Develop] release Scratch Desktop 3.10.2
 2020-05-04 13:28:36 -07:00
Christopher Willis-Ford
1ba7bef8d8 release Scratch Desktop 3.10.2 2020-05-04 11:25:18 -07:00
chrisgarrity
3424d007ee
Merge pull request #3817 from chrisgarrity/helpwidget-update 
Helpwidget update
 2020-05-04 12:11:35 -04:00
Christopher Willis-Ford
1408b540e1 default student's country to educator's during reg 
Ideally the classroom info would include the country code, not just the
country name. Since it doesn't, this change includes a new function to
look up a country code by the country's name (not label).
 2020-05-02 00:44:23 -07:00
Chris Garrity
d538d5d053 Localize the widget 
Note that some of the Freshdesk locales don’t match the ones used by Scratch.
 2020-05-01 12:09:19 -04:00
-Accio-
629ecb2279
Add Andrew and Abisola to past contributers 2020-05-01 11:19:56 -04:00
-Accio-
db4e32180a
Remove Andrew and Abisola 2020-05-01 11:13:15 -04:00
Chris Garrity
23980e1f23 turn on popup help widget 
leaving the feature flag in place in case we decide to revert to the form.
 2020-05-01 10:30:09 -04:00
picklesrus
bcb848d515 Remove now unused FormatedHTMLMessage. 2020-05-01 10:27:31 -04:00
picklesrus
d968ec42bd Remove unsused message 2020-05-01 10:08:52 -04:00
Chris Garrity
2650c44407 hide inappropriate link field 
disable and hide functions expect argument to be an array.
 2020-05-01 09:23:35 -04:00
Chris Garrity
750071b7ae Adjust form height to avoid form scrolling 2020-05-01 09:23:35 -04:00
Chris Garrity
41c60c62d7 Wording change for Bugs and Glitches 2020-05-01 09:23:35 -04:00
Chris Garrity
3111b72117 Move profile or studio link out of description 
Prefill a new custom field for the inappropriate link instead of prefilling description.
In the popup make the link field hidden and disabled so that users don’t change it.
 2020-05-01 09:23:35 -04:00
Chris Garrity
09b578bff7 Update copy 2020-05-01 09:23:35 -04:00
Chris Garrity
3f5d34d05f delay loading freshdesk script 
Question: should script still have `async defer`
 2020-05-01 09:23:35 -04:00
picklesrus
c5aaa7cb05 Add probable final link 2020-04-30 17:16:58 -04:00
-Accio-
40aa52e673
Alphabetize the credits page 
Put the credits page in order by first names as opposed to last names which are no longer present.
 2020-04-29 10:36:27 -04:00
Benjamin Wheeler
ebbee5e7b7
Merge pull request #3830 from R4356th/patch-1 
Add new member's name
 2020-04-29 09:38:42 -04:00
R4356th
5826058da5
Update people.json 2020-04-27 23:51:26 +06:00
picklesrus
6f1b7d7bef Add setup guide link. Still needs final link filled in. 2020-04-27 10:38:40 -04:00
R4356th
84d861f299
Update people.json 2020-04-27 16:01:09 +06:00
apple502j
b2544e1cbd
Fix lint 2020-04-26 17:05:42 +09:00
apple502j
b476a1e4b3
Fix invisible actor on FollowStudio 2020-04-26 14:58:21 +09:00
picklesrus
859ce97ab0 Second, smaller round of updates to the FAQ page. 2020-04-23 09:32:51 -04:00
seotts
aca3ef0a0d Add scary subcategories 2020-04-22 15:38:39 -04:00
chrisgarrity
8d385afa44
Merge pull request #3569 from apple502j/remove-flag 
Remove app flag
 2020-04-22 07:28:11 -04:00
picklesrus
01afd414cd
Merge pull request #3807 from picklesrus/student-username-update 
Change up the messaging in student registration.
 2020-04-21 14:28:09 -04:00
Benjamin Wheeler
099d5a1007
Merge pull request #3436 from benjiwheeler/join-flow-toggle-info-button 
Join flow info button has larger touch target, can be clicked to toggle
 2020-04-21 11:00:27 -04:00
picklesrus
d6fdf90a56 remove unused message. 2020-04-20 17:38:20 -04:00
chrisgarrity
11e6c2ea9f
Merge pull request #3786 from apple502j/following-l10n 
Split follow splash into FollowUser and FollowStudio
 2020-04-17 07:12:08 -04:00
chrisgarrity
15990b5876
Merge branch 'develop' into remove-flag 2020-04-16 16:41:31 -04:00
picklesrus
2711bafbcd Change up the messaging in student registration to make the "don't use your real name" a blue info message and give some suggestions on how to choose a username. 2020-04-15 15:43:24 -04:00
Karishma Chadha
05c96b48da
Merge pull request #3806 from LLK/hotfix/credits 
[Develop] Hotfix/credits
 2020-04-15 15:37:13 -04:00
Karishma Chadha
13d8d1b200 Remove last names from credits page. 2020-04-15 12:02:07 -04:00
apple502j
7048e1e5dc
Fix typo 
Co-Authored-By: adroitwhiz <adroitwhiz@protonmail.com>
 2020-04-15 23:39:58 +09:00
Ben Wheeler
d1a871baa2 remove extraneous parenthesis from student signup route 2020-04-15 09:17:33 -04:00
chrisgarrity
5cd282ed56
Merge pull request #3800 from chrisgarrity/freshdesk-widget 
Freshdesk widget
 2020-04-14 15:43:01 -04:00
chrisgarrity
5e21c58c2a
Merge pull request #3710 from apple502j/localize-activity 
Localize activity messages
 2020-04-14 15:42:45 -04:00
chrisgarrity
21cc1a9780
Update src/components/helpwidget/helpwidget.jsx 
initialize widget settings on `window` before adding the script

Co-Authored-By: Ray Schamp <rschamp@users.noreply.github.com>
 2020-04-14 15:32:57 -04:00
Ray Schamp
5e33c4e37e
Merge pull request #3801 from Accio1/issue/gh-#3781-Delay-Scratch-Conference 
Fix gh-3781: Delay Scratch Conference
 2020-04-14 10:57:34 -04:00