scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1346 commits 218 branches 1 tag 463 MiB
Commit graph

1346 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
47d0cca883 Merge pull request #824 from St19Galla/patch-1 
Fix GH-806: Teacher Account Video Embded
 2016-08-10 12:15:56 -04:00
St19_Galla
ecd1963bbe Update faq.jsx 2016-08-10 12:14:08 -04:00
Matthew Taylor
d639d17d85 Merge pull request #827 from mewtaylor/issue/gh-816 
[Develop] Hotfix: Remove `phoneLength` validation
 2016-08-10 09:51:35 -04:00
Matthew Taylor
6e3a18a574 only look for empty phone on submit 
thanks @rschamp!
 2016-08-10 09:45:21 -04:00
Matthew Taylor
30945bc078 Remove phoneLength validation 2016-08-10 07:53:49 -04:00
Connor Hudson
f49d6e6a83 Merge pull request #767 from technoboy10/mobile-nav-footer 
Fix GH-217: Implement responsive nav and footer (woohoo!)
 2016-08-09 15:09:01 -04:00
Matthew Taylor
20f944c70f Merge pull request #823 from TheGrits/patch-1 
Fix gh-822: Missing Email Address
 2016-08-09 10:42:22 -04:00
St19_Galla
8b18629264 amend text 2016-08-09 10:22:48 -04:00
St19_Galla
fd5be4bf8d Embed Video 2016-08-09 10:16:08 -04:00
Technoboy10
c009497b6b use scss in navbar instead of react-responsive 2016-08-09 09:55:20 -04:00
The_Grits
722b7ec20c Add email address link 
Fixes #822
 2016-08-08 19:37:58 -04:00
Matthew Taylor
68042b056b Merge pull request #821 from mewtaylor/hotfix/gh-673 
[Develop] Hotfix: Bind the banner api method to the splash page
 2016-08-08 16:39:39 -04:00
Matthew Taylor
7cb14c17b9 Bind the api method to the splash page 
otherwise, `this` is undefined. Fixes #673.
 2016-08-08 16:31:03 -04:00
Matthew Taylor
f3c4276d0f Merge pull request #814 from St19Galla/patch-1 
Fix GH-812 / Enhance Checkbox Display
 2016-08-08 10:20:09 -04:00
Matthew Taylor
b553b3f25f Merge pull request #817 from mewtaylor/issue/gh-658 
Fix GH-658: remove link to “My Classes” from faq
 2016-08-08 09:58:56 -04:00
Matthew Taylor
967e5b6d3f remove link to “My Classes” from faq 
so that it doesn’t 403 for people without educator accounts. Fixes #658
 2016-08-08 08:34:20 -04:00
Matthew Taylor
606e3600ba Merge pull request #803 from mewtaylor/issue/gh-683 
Fix GH-[683,705,712,797]: Updates to registration UX for teachers
 2016-08-08 08:10:24 -04:00
St19_Galla
a7ea6d7fd9 whoops, don't need that anymore 2016-08-05 15:51:48 -04:00
St19_Galla
ef55f20ff3 now i finally understand scss variables 2016-08-05 15:50:51 -04:00
St19_Galla
3ff81296a7 test 2016-08-05 15:43:15 -04:00
St19_Galla
dd85de22e6 Enhance Checkbox Display 2016-08-05 15:24:33 -04:00
Matthew Taylor
371aab1e26 Merge pull request #811 from mewtaylor/hotfix/js-types 
[Develop] Fall back to doing it the svg way
 2016-08-04 08:36:39 -04:00
Matthew Taylor
dc209f466a Fall back to doing it the svg way 2016-08-04 08:35:30 -04:00
Matthew Taylor
4bfb4e197d Merge pull request #810 from mewtaylor/hotfix/js-types 
[Develop] Hotfix: Don’t use mime magic to guess
 2016-08-04 08:24:52 -04:00
Matthew Taylor
3a6ed90e72 Don’t use mime magic to guess 
hopefully just using file extensions works
 2016-08-04 08:24:02 -04:00
Matthew Taylor
04524c8d91 Merge pull request #809 from mewtaylor/hotfix/js-types 
[Develop] Set mime types on deploy
 2016-08-04 08:09:40 -04:00
Matthew Taylor
538aed21eb remove extra space 2016-08-04 08:04:45 -04:00
Matthew Taylor
1013f260b9 Use guess-mime-type to get the right file type 
should help with some header issues we’re seeing. Also remove `x-frame-options` meta tag, since it’s not acknolwedged by some browsers (like Chrome).
 2016-08-04 08:02:45 -04:00
Ray Schamp
e5b62ba61b Merge pull request #808 from rschamp/hotfix/ta-yt-ta-faq 
[Develop] Add link to teacher account walkthrough video
 2016-08-03 17:04:41 -04:00
Ray Schamp
77644aafb2 Merge pull request #807 from rschamp/hotfix/ta-yt-ta-faq 
[Master] Add link to teacher account walkthrough video
 2016-08-03 17:04:35 -04:00
Matthew Taylor
776623bbb3 Merge pull request #790 from mewtaylor/hotfix/conference-livestream 
[Master] Hotfix: Add hyperlink to keynote livstream for 2016 conf
 2016-08-03 17:03:09 -04:00
Ray Schamp
42229e84e7 Add link to teacher account walkthrough video 2016-08-03 16:53:38 -04:00
Matthew Taylor
fa1ad542a5 Merge pull request #795 from mewtaylor/isseu/gh-792 
[Master] Hotfix: Create space between paragraph elements
 2016-08-03 16:43:14 -04:00
Matthew Taylor
0eb47bb0f0 Merge pull request #798 from mewtaylor/hotfix/dedicated-to-carljbowman 
[Master] Hotfix: Update conference schedule icons for consistency
 2016-08-03 16:27:29 -04:00
Matthew Taylor
73fbc36ff9 declare callback if undefined 2016-08-03 16:24:51 -04:00
Matthew Taylor
4a527fdd2e Merge branch 'master' of https://github.com/LLK/scratch-www into hotfix/conference-livestream 
* 'master' of https://github.com/LLK/scratch-www:
  Only redirect approved educators to My Classes
  Lint
  Add "Request Account" button to Educators landing
  Add `align` prop to `SubNavigation` component
 2016-08-03 16:19:09 -04:00
Matthew Taylor
2e319e60ab Merge branch 'master' of https://github.com/LLK/scratch-www into hotfix/dedicated-to-carljbowman 
* 'master' of https://github.com/LLK/scratch-www:
  Only redirect approved educators to My Classes
  Lint
  Add "Request Account" button to Educators landing
  Add `align` prop to `SubNavigation` component
 2016-08-03 16:18:16 -04:00
Matthew Taylor
fc20f59a7e Merge branch 'master' of https://github.com/LLK/scratch-www into isseu/gh-792 
* 'master' of https://github.com/LLK/scratch-www:
  Only redirect approved educators to My Classes
  Lint
  Add "Request Account" button to Educators landing
  Add `align` prop to `SubNavigation` component
 2016-08-03 16:17:30 -04:00
Ray Schamp
d2d78da580 Merge pull request #793 from rschamp/hotfix/activate-teacher-registration 
[Master] Add "Request Account" button to Educators landing page
 2016-08-03 15:50:48 -04:00
Matthew Taylor
86662e13d6 Consolidate and remove onValidSubmit 2016-08-03 15:20:58 -04:00
Matthew Taylor
4e568f7c06 use minLength instead 
it’s the same thing :). Thanks @rschamp!
 2016-08-03 14:34:07 -04:00
Matthew Taylor
cec3214def some updates from feedback 
thanks @rschamp!

1. moved org type validation to a custom validation
2. added a callback to the username validation call
 2016-08-03 12:11:55 -04:00
Technoboy10
fdfbf57e28 fix file location 2016-08-02 16:50:40 -04:00
Technoboy10
c19c32ded3 fix merge conflicts from upstream/develop 2016-08-02 16:50:23 -04:00
Technoboy10
ed924e3b2c add space back in 2016-08-02 15:30:01 -04:00
Matthew Taylor
f0c2280fde Updates to registration UX for teachers 
1. Phone too long validation occurs before submit now.
2. Organization “other” type is now being required
3. Organization type required now shows up at the same time as other organization validation errors
4. Username check now occurs earlier, on blur rather than on submit
 2016-08-02 15:23:09 -04:00
Matthew Taylor
f17eed0b5e Merge pull request #799 from mewtaylor/hotfix/dedicated-to-carljbowman 
[Develop] Hotfix: Update conference schedule icons for consistency
 2016-08-02 14:50:29 -04:00
Ray Schamp
735646265d Merge pull request #801 from rschamp/hotfix/waiting-room-loop 
[Master] Only redirect approved educators to My Classes
 2016-08-02 11:53:27 -04:00
Ray Schamp
c55595fbc3 Merge pull request #802 from rschamp/hotfix/waiting-room-loop 
[Develop] Only redirect approved educators to My Classes
 2016-08-02 11:24:01 -04:00
Ray Schamp
0e6a7e6fdc Merge pull request #794 from rschamp/hotfix/activate-teacher-registration 
[Develop] Add "Request Account" button to Educators landing page
 2016-08-02 10:55:43 -04:00