DD Liu
c76497d06a
Merge pull request #3839 from LLK/develop
...
Merge from develop to release branch
2020-04-29 19:31:02 -04:00
DD Liu
eecb397943
Merge pull request #3838 from fsih/updateGui
...
Update gui
2020-04-29 19:12:26 -04:00
DD Liu
2797064c31
Update gui
2020-04-29 19:11:42 -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
chrisgarrity
d5e51d2f18
Merge pull request #3829 from apple502j/patch-16
...
Fix invisible actor on FollowStudio
2020-04-29 09:02:42 -04:00
DD Liu
3eae169c10
Merge pull request #3835 from LLK/hotfix/firefox-flicker
...
[Develop] Update gui to fix flicker in firefox
2020-04-28 10:21:46 -04:00
DD Liu
b9faba4eb8
Merge pull request #3834 from LLK/hotfix/firefox-flicker
...
[Master] Update gui to fix flicker in firefox
2020-04-28 10:06:13 -04:00
DD Liu
42a5af3097
Update gui to fix flicker in firefox
2020-04-27 16:18:24 -04:00
R4356th
5826058da5
Update people.json
2020-04-27 23:51:26 +06: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
Benjamin Wheeler
ea103fc69e
Merge pull request #3824 from LLK/release/2020-04-23
...
[Develop] Release/2020 04 23
2020-04-23 16:04:35 -04:00
Benjamin Wheeler
67f4abf832
Merge pull request #3825 from LLK/release/2020-04-23
...
[Master] Release/2020 04 23
2020-04-23 16:04:13 -04:00
Sarah Otts
ac7d21208f
Merge pull request #3819 from seotts/add-scary-subcategories
...
Add subcategories for scary project report
2020-04-23 15:24:41 -04:00
Benjamin Wheeler
dc058e1c45
Merge pull request #3823 from LLK/develop
...
merge from develop to release branch
2020-04-22 21:15:53 -04:00
Benjamin Wheeler
fa078a6ed3
Merge pull request #3822 from benjiwheeler/scratch-gui
...
update scratch-gui
2020-04-22 21:09:32 -04:00
Ben Wheeler
e343b06ac5
update scratch-gui
2020-04-22 21:04:45 -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
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
