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
Technoboy10
2a5f330884
hide intro if not desktop width
2016-07-26 11:29:45 -04:00
Matthew Taylor
e87a2bce76
remove trailing whitespace
2016-07-26 11:24:51 -04:00
Technoboy10
a8b26b1a1c
experiment with removing content display from scss
2016-07-26 11:06:21 -04:00
Matthew Taylor
69ac5b60bd
make .no-label an auto assignment
...
thanks @rschamp!
2016-07-26 10:44:19 -04:00
Matthew Taylor
b510d154df
remove ‘noformsy` option on inputs
2016-07-26 10:20:06 -04:00
Ray Schamp
cd3eafe9a0
Merge pull request #754 from rschamp/bugfix/747
...
Make the student registration views more consistent with each other
2016-07-26 09:28:52 -04:00
Matthew Taylor
6787ae03ce
Apply classes to row, not textarea
...
And move help rendering into the phone input row.
2016-07-26 08:06:38 -04:00
Ray Schamp
74f56d42c5
Explicitly show a spinner while loading class data
...
To make this view work consistently with the complete registration view
2016-07-25 16:59:55 -04:00
Ray Schamp
4df4ea8930
Show an error to logged out users
...
When logged out users visit the complete registration view, show them an error rather than a spinner.
2016-07-25 16:58:38 -04:00
Matthew Taylor
d8e07ee7f6
use rowClassName instead
...
so that it can include `label`. Also add some default styling to `label` in `.row`. Thanks @rschamp!
2016-07-25 15:43:44 -04:00
Matthew Taylor
263d292b3c
Fix formatting for a few form elements
...
and make use of the FRC `elementWrapperClassName`, since they way we did it before – custom `className` strings on the element – was not working. Fixes #749 .
2016-07-25 13:21:28 -04:00
