scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1302 commits 217 branches 1 tag 473 MiB
Commit graph

1302 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Ray Schamp
a9039ca63b Only redirect approved educators to My Classes 
Fixes #800
 2016-08-02 10:52:47 -04:00
Ray Schamp
0e8e842eb2 Lint 2016-08-02 09:50:46 -04:00
Matthew Taylor
feee2f2955 Update conference schedule icons for consistency 
from @carljbowman, to @carljbowman
 2016-08-02 09:45:36 -04:00
Matthew Taylor
85377193a8 Merge pull request #796 from mewtaylor/isseu/gh-792 
[Develop] Hotfix: Create space between paragraph elements
 2016-08-02 09:37:27 -04:00
Matthew Taylor
5cbaabbe97 Merge pull request #791 from mewtaylor/hotfix/conference-livestream 
[Develop] Hotfix: Add hyperlink to keynote livstream for 2016 conf
 2016-08-02 09:37:16 -04:00
Matthew Taylor
2e962c7831 Create space between paragraph elements 
Fixes #792
 2016-08-01 14:21:27 -04:00
Ray Schamp
c842d06ac4 Add "Request Account" button to Educators landing 2016-08-01 12:19:29 -04:00
Ray Schamp
025958fc24 Add align prop to SubNavigation component 2016-08-01 12:18:25 -04:00
Connor Hudson
2407f1d6e4 Merge pull request #789 from technoboy10/gh781-oversized-jobs-image 
Fix GH-781: Jobs page image is too wide
 2016-08-01 11:01:26 -04:00
Matthew Taylor
00e6ad2ee1 Add hyperlink to keynote livstream for 2016 conf 2016-08-01 10:59:27 -04:00
Technoboy10
6b63f5b7ad set image width to 100% 2016-07-29 17:37:24 -04:00
Matthew Taylor
ee1e959be4 Merge pull request #786 from mewtaylor/issue/gh-775 
Fix GH-775: Fix gender input error alignment in IE11
 2016-07-28 16:20:40 -04:00
Matthew Taylor
4909d509d2 remove ie fallback to mobile styling 
it looks like @rschamp’s wodnerful `top` alignment fix for Chrome and Edge also helps here, from a test I did in IE11.
 2016-07-28 15:46:56 -04:00
Matthew Taylor
d97bc193df Remove unnecessary redefinitions 
These are already defined in the base, and are not overridden anywhere. Only redefine the things that were overridden.
 2016-07-28 15:11:14 -04:00
Matthew Taylor
2c9df3237e Fix gender input error alignment in IE11 
Also re-apply the arrow styling on the organization checkbox group, since it appears to be aligned correctly.
 2016-07-28 14:10:36 -04:00
Ray Schamp
70188cfb03 Set up SCRATCH_ENV for staging 2016-07-28 13:59:23 -04:00
Ray Schamp
00c7dc9257 Merge pull request #750 from LLK/release/2.2.11 
[Master] Release 2.2.11
 2016-07-28 12:58:46 -04:00
Ray Schamp
02ff0217c9 Merge pull request #782 from LLK/release/2.2.11 
[Develop] Release 2.2.11
 2016-07-28 12:53:07 -04:00
Ray Schamp
7e89ccefe9 Merge pull request #784 from rschamp/bugfix/783 
Move "select country" to general strings
 2016-07-28 12:27:35 -04:00
Ray Schamp
e218cc5169 Move "select country" to general strings 
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json

Fixes #783
 2016-07-28 12:26:56 -04:00
Matthew Taylor
9e9ffc96e9 Merge pull request #779 from mewtaylor/issue/gh-773 
Fix GH-[772,773]: Fix “afterschool” typo, default country and margin for username
 2016-07-28 10:52:55 -04:00
Ray Schamp
9a05016545 Merge pull request #780 from rschamp/bugfix/769 
Don't use a static width for inputs
 2016-07-28 10:40:13 -04:00
Ray Schamp
7e8fddef18 Don't use a static width for inputs 
Fixes #769
 2016-07-28 10:39:18 -04:00
Matthew Taylor
40fb433d7d Make country choice a function that’s called 
And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!
 2016-07-28 09:56:01 -04:00
Matthew Taylor
2650e6e148 Move countryOptions to the global scope 
thanks @rschamp!
 2016-07-28 08:30:29 -04:00
Matthew Taylor
cf4a057278 Fix “afterschool” typo 
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
 2016-07-27 23:33:45 -04:00