Commits · 4bd813629f31d146aa70d1bcd7e4993c60b3e96f · xpstem / scratch-www

13 May, 2020 1 commit
- safer referencing of teacher country · 4bd81362
  Ben Wheeler authored May 13, 2020
  
  4bd81362
02 May, 2020 1 commit

default student's country to educator's during reg · 1408b540

Christopher Willis-Ford authored May 02, 2020

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).

1408b540

01 May, 2020 1 commit
- Merge pull request #3836 from Accio1/issue/gh#3813-Alphabetize-Credits-Page · 7a17ed07
  Benjamin Wheeler authored May 01, 2020
```
Alphabetize the credits page
```
  7a17ed07
30 Apr, 2020 7 commits
- Merge pull request #3841 from LLK/release/2020-04-30 · 129506b0
  DD Liu authored Apr 30, 2020
```
[Develop] Release/2020-04-30
```
  129506b0
- Merge pull request #3846 from LLK/develop · 329d20c7
  DD Liu authored Apr 30, 2020
```
Merge develop into release
```
  329d20c7
- Merge pull request #3845 from fsih/updateGui · ba97eae0
  DD Liu authored Apr 30, 2020
```
Update gui
```
  ba97eae0
- update gui · 35e6187f
  DD Liu authored Apr 30, 2020
  
  35e6187f
- Merge pull request #3843 from LLK/develop · 7870c38e
  DD Liu authored Apr 29, 2020
```
Merge develop again
```
  7870c38e
- Merge pull request #3842 from fsih/updateGui · 5528790f
  DD Liu authored Apr 29, 2020
```
Update gui
```
  5528790f
- Update gui · 9447650c
  DD Liu authored Apr 29, 2020
  
  9447650c
29 Apr, 2020 6 commits
- Merge pull request #3839 from LLK/develop · c76497d0
  DD Liu authored Apr 29, 2020
```
Merge from develop to release branch
```
  c76497d0
- Merge pull request #3838 from fsih/updateGui · eecb3979
  DD Liu authored Apr 29, 2020
```
Update gui
```
  eecb3979
- Update gui · 2797064c
  DD Liu authored Apr 29, 2020
  
  2797064c
- Alphabetize the credits page · 40aa52e6
  -Accio- authored Apr 29, 2020
```
Put the credits page in order by first names as opposed to last names which are no longer present.
```
  40aa52e6
- Merge pull request #3830 from R4356th/patch-1 · ebbee5e7
  Benjamin Wheeler authored Apr 29, 2020
```
Add new member's name
```
  ebbee5e7
- Merge pull request #3829 from apple502j/patch-16 · d5e51d2f
  chrisgarrity authored Apr 29, 2020
```
Fix invisible actor on FollowStudio
```
  d5e51d2f
28 Apr, 2020 2 commits
- Merge pull request #3835 from LLK/hotfix/firefox-flicker · 3eae169c
  DD Liu authored Apr 28, 2020
```
[Develop] Update gui to fix flicker in firefox
```
  3eae169c
- Merge pull request #3834 from LLK/hotfix/firefox-flicker · b9faba4e
  DD Liu authored Apr 28, 2020
```
[Master] Update gui to fix flicker in firefox
```
  b9faba4e
27 Apr, 2020 3 commits
- Update gui to fix flicker in firefox · 42a5af30
  DD Liu authored Apr 27, 2020
  
  42a5af30
- Update people.json · 5826058d
  R4356th authored Apr 27, 2020
  
  5826058d
- Update people.json · 84d861f2
  R4356th authored Apr 27, 2020
  
  84d861f2
26 Apr, 2020 2 commits
- Fix lint · b2544e1c
  apple502j authored Apr 26, 2020
  
  b2544e1c
- Fix invisible actor on FollowStudio · b476a1e4
  apple502j authored Apr 26, 2020
  
  b476a1e4
23 Apr, 2020 6 commits
- Merge pull request #3824 from LLK/release/2020-04-23 · ea103fc6
  Benjamin Wheeler authored Apr 23, 2020
```
[Develop] Release/2020 04 23
```
  ea103fc6
- Merge pull request #3825 from LLK/release/2020-04-23 · 67f4abf8
  Benjamin Wheeler authored Apr 23, 2020
```
[Master] Release/2020 04 23
```
  67f4abf8
- Merge pull request #3819 from seotts/add-scary-subcategories · ac7d2120
  Sarah Otts authored Apr 23, 2020
```
Add subcategories for scary project report
```
  ac7d2120
- Merge pull request #3823 from LLK/develop · dc058e1c
  Benjamin Wheeler authored Apr 22, 2020
```
merge from develop to release branch 
```
  dc058e1c
- Merge pull request #3822 from benjiwheeler/scratch-gui · fa078a6e
  Benjamin Wheeler authored Apr 22, 2020
```
update scratch-gui
```
  fa078a6e
- update scratch-gui · e343b06a
  Ben Wheeler authored Apr 22, 2020
  
  e343b06a
22 Apr, 2020 2 commits
- Add scary subcategories · aca3ef0a
  seotts authored Apr 22, 2020
  
  aca3ef0a
- Merge pull request #3569 from apple502j/remove-flag · 8d385afa
  chrisgarrity authored Apr 22, 2020
```
Remove app flag
```
  8d385afa
21 Apr, 2020 2 commits
- Merge pull request #3807 from picklesrus/student-username-update · 01afd414
  picklesrus authored Apr 21, 2020
```
Change up the messaging in student registration. 
```
  01afd414
- Merge pull request #3436 from benjiwheeler/join-flow-toggle-info-button · 099d5a10
  Benjamin Wheeler authored Apr 21, 2020
```
Join flow info button has larger touch target, can be clicked to toggle
```
  099d5a10
20 Apr, 2020 1 commit
- remove unused message. · d6fdf90a
  picklesrus authored Apr 20, 2020
  
  d6fdf90a
17 Apr, 2020 1 commit
- Merge pull request #3786 from apple502j/following-l10n · 11e6c2ea
  chrisgarrity authored Apr 17, 2020
```
Split follow splash into FollowUser and FollowStudio
```
  11e6c2ea
16 Apr, 2020 3 commits
- Merge branch 'develop' into remove-flag · 15990b58
  chrisgarrity authored Apr 16, 2020
  
  15990b58
- Merge pull request #3810 from LLK/release/2020-04-16 · de4320cd
  picklesrus authored Apr 16, 2020
```
[Develop] Release/2020 04 16
```
  de4320cd
- Merge pull request #3811 from LLK/release/2020-04-16 · f80f96c6
  picklesrus authored Apr 16, 2020
```
[Master] Release/2020 04 16
```
  f80f96c6
15 Apr, 2020 2 commits
- Merge pull request #3809 from LLK/develop · f3f41a76
  picklesrus authored Apr 15, 2020
```
merge develop into release
```
  f3f41a76
- Merge pull request #3808 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200415195503 · 7c203bc0
  picklesrus authored Apr 15, 2020
```
Update scratch-gui to the latest version 🚀
```
  7c203bc0