scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1647 commits 216 branches 1 tag 474 MiB
Commit graph

1647 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Technoboy10
63c67a1d2d use frameless.js for carousel breakpoints 2016-08-02 09:17:13 -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
Ray Schamp
668f141457 Merge pull request #778 from rschamp/bugfix/chrome-52 
Set common y-origin for validation bubbles
 2016-07-27 20:17:32 -04:00
Ray Schamp
ecbbeb5612 Set common y-origin for validation bubbles 
I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block.

Resolves #770
 2016-07-27 20:15:53 -04:00
Ray Schamp
ade303bd80 Merge pull request #777 from rschamp/bugfix/class-invite 
Resurrect old invite step design for new users
 2016-07-27 19:34:34 -04:00
Ray Schamp
19d67dc0b4 Resurrect old invite step design for new users 2016-07-27 19:32:08 -04:00
Technoboy10
2da07923ca revert verbiage change as per IRL discussion with Carl 2016-07-27 15:49:48 -04:00
Ray Schamp
27a7b98ab9 Merge pull request #765 from rschamp/bugfix/752 
Redesign invite step, add option to log out
 2016-07-27 14:37:45 -04:00
Ray Schamp
89071b10d0 Lint 2016-07-27 14:12:55 -04:00
Ray Schamp
b35d7606f4 Merge pull request #766 from rschamp/bugfix/password-reset 
Don't redirect to password reset on complete_registration
 2016-07-27 10:28:11 -04:00
Ray Schamp
0b1f708400 Don't redirect to password reset on complete_registration 2016-07-27 10:27:31 -04:00
Ray Schamp
d1f73c3ef4 Redesign invite step, add option to log out 
Resolves #752
 2016-07-27 10:24:37 -04:00
Technoboy10
26d314a5c1 undo weird merge thing that happened a while back 2016-07-27 09:54:07 -04:00
Technoboy10
5e7bf85733 remove redundant media query from footer.scss 2016-07-27 09:48:07 -04:00
Ray Schamp
2b1cf25f88 Merge pull request #763 from rschamp/bugfix/3878 
Redirect students that must reset their password
 2016-07-27 09:35:19 -04:00
Technoboy10
0d2416c850 fix merge conflicts 2016-07-27 09:33:15 -04:00
Technoboy10
90631b3054 remove dev file 2016-07-27 09:27:22 -04:00
Technoboy10
25402113bf tweak a few things before WIP PR 2016-07-27 09:26:33 -04:00
Matthew Taylor
f4c60a915b Merge pull request #761 from mewtaylor/issue/gh-757 
Fix GH-757: Redirect to `/educators/classes` if a confirmed teacher
 2016-07-27 07:41:59 -04:00
Matthew Taylor
806fd25e46 Move to the view 
thanks @rschamp!
 2016-07-26 17:03:41 -04:00
Ray Schamp
d83df730c8 Redirect students that must reset their password 
Fixes LLK/scratchr2#3878
 2016-07-26 16:40:05 -04:00
Technoboy10
ae9c15f6ce update with routes.json from develop branch 2016-07-26 15:51:05 -04:00
Matthew Taylor
60a62bb374 Redirect to /educators/classes if a confirmed teacher 
Fixes #757. Note: Because we are getting this info from the session, the redirect may not happen until the page is rendered first in cases where the connection is slow, or the db is slow.
 2016-07-26 15:24:51 -04:00
Matthew Taylor
1c7dc73ed7 Merge pull request #753 from mewtaylor/issue/gh-749 
Fix GH-749: Fix formatting for a few form elements
 2016-07-26 11:42:13 -04:00