Ray Schamp
a4dd1611d1
Add student registration update view
2016-07-21 21:08:06 -04:00
Ray Schamp
1df6eb5d2a
Update incorrect CSS class name
2016-07-21 21:08:06 -04:00
Ray Schamp
7a6e5c3eb4
Fix student registration localization
...
Add missing strings, actually translate the content of the steps
2016-07-21 21:08:06 -04:00
Ray Schamp
6144c6f8d1
Merge pull request #745 from rschamp/bugfix/student-registration-url
...
Grab-bag of student registration fixes
2016-07-21 20:46:42 -04:00
Ray Schamp
8dae646ff3
Style tweaks
2016-07-21 20:44:51 -04:00
Ray Schamp
b06a9e49d0
Fix wording on student username step
2016-07-21 20:44:51 -04:00
Ray Schamp
9aa7e828b7
Remove "blank" classroom, show spinner instead
...
It was broken due to a key error on `classroom.images` anyway
2016-07-21 20:44:51 -04:00
Ray Schamp
8038fbcdc1
Fix classroom API call
2016-07-21 18:10:41 -04:00
Andrew Sliwinski
74b26267d2
Merge pull request #741 from thisandagain/bugfix/740
...
Adjustments to the educators page as per feedback
2016-07-21 13:49:37 -04:00
Matthew Taylor
bf28fae97c
Merge pull request #739 from mewtaylor/issue/gh-698
...
Fix GH-698: refresh session on successful registration
2016-07-21 13:44:15 -04:00
Andrew Sliwinski
99c61ef0f7
Adjustments to the educators page as per feedback. Resolves GH-740
2016-07-21 13:43:35 -04:00
Matthew Taylor
859877c1ff
refresh session on successful registration
...
This is needed to ensure that the approval step displays the correct “Wait for Approval” message. Fixes #698
2016-07-21 12:57:49 -04:00
Connor Hudson
63b0b03b0c
Merge pull request #738 from technoboy10/gh737-teacher-landing-asset
...
Fix GH-737: Replace teacher account asset
2016-07-21 10:38:10 -04:00
Matthew Taylor
7461098f53
Merge pull request #729 from mewtaylor/issue/gh-715
...
Fix GH-715: Change copy for `Wait for Approval`
2016-07-21 10:27:43 -04:00
Matthew Taylor
102de9a087
Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-715
...
* 'develop' of https://github.com/LLK/scratch-www :
Pluralize example headlines on educators page
Educator page language adjustments as per feedback. Resolves GH-734
fix typo
Update image format for API change
Fix lint errors, l10n issues
revert irrelevant change
Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues
Update description of demographics step
Add student registration flow
Scope message strings more reusably
Make registration styles reusable
Parse with babel-eslint
Fix whitespace
# Conflicts:
# src/l10n.json
2016-07-21 10:27:10 -04:00
Technoboy10
adab508b09
replace asset per #737
2016-07-21 10:26:53 -04:00
Connor Hudson
6a58c7b2e6
Merge pull request #731 from technoboy10/ie-validation-fallback
...
Fix GH-699: Fallback to mobile validation bubble on IE
2016-07-21 10:24:25 -04:00
Andrew Sliwinski
83dc5b0b45
Merge pull request #735 from thisandagain/bugfix/educator
...
Educator page content adjustments as per feedback
2016-07-21 08:46:52 -04:00
Andrew Sliwinski
4f6c071c2c
Pluralize example headlines on educators page
2016-07-21 08:41:31 -04:00
Andrew Sliwinski
4d2f9d7a05
Educator page language adjustments as per feedback. Resolves GH-734
2016-07-20 17:53:02 -04:00
Technoboy10
3bbc17bb35
moved ie targeting to steps.scss
2016-07-20 17:29:34 -04:00
Ray Schamp
d3f1046a42
Merge pull request #730 from rschamp/feature/3679-student-flow
...
Add student registration flow
2016-07-20 15:57:47 -04:00
Connor Hudson
1b5284fbf1
Merge pull request #733 from technoboy10/gh732-pluginstudio
...
Fix GH-732: Plug-In Studios -> Plug-In Studio
2016-07-20 14:57:06 -04:00
Technoboy10
74afd163b5
fix typo
2016-07-20 14:28:46 -04:00
Ray Schamp
754859f35f
Update image format for API change
...
Removed default `image` field convention
2016-07-20 13:47:43 -04:00
Ray Schamp
a3b56dcbf1
Fix lint errors, l10n issues
2016-07-20 12:07:19 -04:00
Technoboy10
285c4c2d69
revert irrelevant change
2016-07-20 09:58:37 -04:00
Technoboy10
4e6efae667
Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues
2016-07-20 09:46:51 -04:00
Ray Schamp
6d5b7d3c02
Update description of demographics step
2016-07-19 22:58:50 -04:00
Matthew Taylor
90a4277a8a
Change copy for Wait for Approval
...
Fixes #715
2016-07-19 16:54:38 -04:00
Ray Schamp
1c5940cc05
Add student registration flow
2016-07-19 16:51:28 -04:00
Ray Schamp
47ebef1b6f
Scope message strings more reusably
2016-07-19 16:51:10 -04:00
Ray Schamp
67ecb60f48
Make registration styles reusable
2016-07-19 16:49:12 -04:00
Ray Schamp
2065bc91a4
Parse with babel-eslint
...
Allows us to use the now-available es6 features without lint errors.
2016-07-19 16:46:08 -04:00
Ray Schamp
5b6a1fe8b9
Fix whitespace
2016-07-19 09:24:07 -04:00
Ray Schamp
e3378d0f6a
Merge pull request #662 from rschamp/feature/use-babel-develop
...
Use babel-loader for jsx transpilation
2016-07-18 13:07:23 -06:00
Connor Hudson
637b1352cd
Merge pull request #727 from technoboy10/gh674-ie11-card-margin
...
Fix GH-674: Waiting room cards should be centered in IE
2016-07-18 11:16:07 -04:00
Connor Hudson
f538016b47
Merge pull request #726 from technoboy10/gh701-ie11-ms-value
...
Fix GH-701, GH-700: IE11 select form background, indent issues
2016-07-18 10:52:51 -04:00
Technoboy10
8c260032fa
card margin auto
2016-07-18 10:39:13 -04:00
Technoboy10
db049b871f
fix IE11 select background, indent issues
2016-07-18 10:17:22 -04:00
Matthew Taylor
7741cb2c7e
Merge pull request #685 from St19Galla/patch-1
...
Fix gh-684 - Changing error message
2016-07-12 19:04:16 -04:00
Matthew Taylor
6fd1d08d56
Merge pull request #720 from mewtaylor/issue/usernames-search
...
[Develop] GH-710: only show username in search and explore
2016-07-11 20:21:58 -04:00
Matthew Taylor
27b5afddfb
Forgot search
...
thanks @thisandagain!
2016-07-11 19:59:13 -04:00
Matthew Taylor
845ddb2966
only show username in search and explore
...
fixes #710
2016-07-11 16:35:03 -04:00
Andrew Sliwinski
ff67f7bae4
Merge pull request #718 from thisandagain/hotfix/jobs
...
[Develop] Update jobs page
2016-07-11 16:26:36 -04:00
Andrew Sliwinski
f8ee125bfe
Update job listings
2016-07-11 16:16:46 -04:00
Matthew Taylor
e9c6213e51
Merge pull request #717 from mewtaylor/issue/gh-r2-3798
...
[Master] Hotfix: Allow urls with `ajax` to pass through
2016-07-11 15:21:56 -04:00
Matthew Taylor
3504ec1910
Merge pull request #716 from mewtaylor/issue/gh-r2-3798
...
Towards Hotfix: Allow urls with `ajax` to pass through
2016-07-11 11:16:52 -04:00
Matthew Taylor
d8a0436525
Forgot a few
2016-07-11 11:09:15 -04:00
Matthew Taylor
5e130d238b
Merge pull request #714 from mewtaylor/issue/gh-r2-3798
...
[Develop] Hotfix: Allow urls with `ajax` to pass through
2016-07-11 10:48:58 -04:00
