Ben Wheeler
4bd813629f
safer referencing of teacher country
2020-05-13 13:20:36 -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
Benjamin Wheeler
7a17ed0789
Merge pull request #3836 from Accio1/issue/gh#3813-Alphabetize-Credits-Page
...
Alphabetize the credits page
2020-05-01 10:52:44 -04:00
DD Liu
129506b0e3
Merge pull request #3841 from LLK/release/2020-04-30
...
[Develop] Release/2020-04-30
2020-04-30 14:02:55 -04:00
DD Liu
329d20c718
Merge pull request #3846 from LLK/develop
...
Merge develop into release
2020-04-30 12:49:21 -04:00
DD Liu
ba97eae0bc
Merge pull request #3845 from fsih/updateGui
...
Update gui
2020-04-30 12:48:35 -04:00
DD Liu
35e6187f66
update gui
2020-04-30 12:47:31 -04:00
DD Liu
7870c38e76
Merge pull request #3843 from LLK/develop
...
Merge develop again
2020-04-29 21:47:22 -04:00
DD Liu
5528790f6f
Merge pull request #3842 from fsih/updateGui
...
Update gui
2020-04-29 21:46:44 -04:00
DD Liu
9447650cb9
Update gui
2020-04-29 21:46:05 -04:00
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
-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
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
