scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-28 01:56:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5889 commits 216 branches 1 tag 476 MiB
Commit graph

5889 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
de4320cdeb
Merge pull request #3810 from LLK/release/2020-04-16 
[Develop] Release/2020 04 16
 2020-04-16 14:43:45 -04:00
picklesrus
f80f96c641
Merge pull request #3811 from LLK/release/2020-04-16 
[Master] Release/2020 04 16
 2020-04-16 14:18:35 -04:00
picklesrus
f3f41a7653
Merge pull request #3809 from LLK/develop 
merge develop into release
 2020-04-15 17:07:27 -04:00
picklesrus
7c203bc051
Merge pull request #3808 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200415195503 
Update scratch-gui to the latest version 🚀
 2020-04-15 17:04:41 -04:00
greenkeeper[bot]
baf6bc259d
chore(package): update lockfile package-lock.json 2020-04-15 20:48:57 +00:00
greenkeeper[bot]
69927e2020
chore(package): update scratch-gui to version 0.1.0-prerelease.20200415195503 2020-04-15 20:48:53 +00: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
ec93e3d7cf
Merge pull request #3805 from LLK/hotfix/credits 
[Master] Hotfix: Remove last names from credits page
 2020-04-15 15:36:44 -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
Benjamin Wheeler
4774107934
Merge pull request #3804 from benjiwheeler/add-missing-paren 
remove extraneous parenthesis from student signup route
 2020-04-15 09:20:32 -04: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
Ray Schamp
e8d58c6884
Move space out of l10n string and into JSX 2020-04-14 10:56:56 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -04:00
apple502j
8ca097fde2 Rename followee to studio 2020-04-14 13:47:07 +09:00
-Accio-
4c0e13a154
Make desc1a bold 
Made desc1a bold in order to emphasize it, and added a line break betwwen regestrationDelayed and connectNow
 2020-04-13 21:25:03 -04:00
-Accio-
952f95c784
Seperate desc1 
Seperate desc1 into desc1 and desc1a so that desc1a can be bolded in order to emphasize it.
 2020-04-13 21:19:56 -04:00
Ben Wheeler
5805d8a0fe first take on toggleable open close state for info messages 
make info button have large, invisible boundary

fix info button ref setting

WIP: experiment with more sophisticated mouseout handling

add lodash debounce

use lodash debounce to reduce info message flickering

tweak info message position per added padding

remove leftover function

update info button tests, add a bunch more
 2020-04-13 17:06:33 -04:00
Benjamin Wheeler
ae04860160
Merge pull request #3788 from benjiwheeler/join-endpoint 
added /signup/TOKEN route; handle route alongside existing student signup route
 2020-04-13 14:41:19 -04:00
Ben Wheeler
05e61cc842 changed student signup route from /join/TOKEN to /signup/TOKEN 2020-04-13 13:11:11 -04:00
apple502j
3146ee8b83 Remove app flag 2020-04-14 01:40:05 +09:00
-Accio-
6e68eb0ae5
Fix spacing again 2020-04-12 10:00:34 -04:00
-Accio-
9675bfe76e
Fix spacing 
Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>
 2020-04-12 09:22:38 -04:00
-Accio-
ca2e6fd089
Delay Scratch Conference to 2021 2020-04-11 22:40:14 -04:00
-Accio-
8cf5e09546
Delay Scratch Conference to 2021 2020-04-11 22:39:58 -04:00
Chris Garrity
23306ff336 remove excess space in the form 
There’s too much space after removing the redundant field.
 2020-04-10 16:09:17 -04:00
apple502j
93f9eaf718 Fix editor title when not logged in 2020-04-11 01:30:29 +09:00
Chris Garrity
7d9e6ea8b7 Add pop up Help widget 
Initial version of contact us with the pop up Freshdesk help widget.
* adding feature flag `?CONTACT_US_POPUP=true` to the URL allows to switch between current contact-us with form, and new contact-us with popup widget.
* new copy for the contact us page (selected based on feature flag)
* handles scratchr2 redirects by pre-opening the popup on the contact us form and handles multiple parameters
 2020-04-10 12:16:44 -04:00
Chris Garrity
93d7946af7 Remove unnecessary userAgent field 
The Freshdesk form/widget collects Browser and OS meta data so there’s no need to duplicate it.
 2020-04-10 12:08:07 -04:00
chrisgarrity
d8df31587e
Merge pull request #3794 from LLK/release/2020-04-09 
[DEVELOP] Release/2020 04 09
 2020-04-10 07:38:53 -04:00
chrisgarrity
d4a9a90597
Merge pull request #3793 from LLK/release/2020-04-09 
[MASTER] Release 2020-04-09
 2020-04-09 17:03:02 -04:00
DD Liu
3e4b108dbb Revert pen change in render 2020-04-09 16:18:56 -04:00
chrisgarrity
315beea775
Merge pull request #3790 from seotts/report-copy 
Update project report copy
 2020-04-09 09:22:10 -04:00
chrisgarrity
52dcecf74b
Merge pull request #3792 from LLK/develop 
Update release from develop
 2020-04-08 16:27:42 -04:00
chrisgarrity
fe8706c644
Merge pull request #3791 from chrisgarrity/update-gui 
update gui version for releae
 2020-04-08 16:20:33 -04:00
Chris Garrity
515a474946 update gui version for releae 2020-04-08 16:19:27 -04:00
seotts
907c0a5228 Merge branch 'report-copy' of github.com:seotts/scratch-www into report-copy 2020-04-08 14:18:38 -04:00
seotts
41b87b0958 use exisiting general string for "Community Guidelines" 2020-04-08 14:14:43 -04:00
Sarah Otts
fed2fe0fa1
remove unnecessary curly brackets 2020-04-08 10:29:33 -04:00
seotts
42cfba3199 Update report copy 2020-04-08 10:10:10 -04:00
Sarah Otts
306e1f302e
Merge pull request #3785 from seotts/report-subcategories 
[Develop] Add nested categories to project report module
 2020-04-06 13:54:39 -04:00