scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-28 00:12:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14386 commits 224 branches 1 tag 533 MiB
Commit graph

14386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
401edb354d Merge pull request #751 from rschamp/bugfix/747 
Show an error if the API doesn't return class data
 2016-07-25 11:46:03 -04:00
Ray Schamp
61e21f6b5b Show an error if the API doesn't return class data 
Fixes #747.

Also explicitly show a spinner when the component is waiting on the class API, and hide it when it returns.
 2016-07-25 11:41:10 -04:00
Technoboy10
daf803d4a3 experiment with the react-responsive library 2016-07-25 10:53:57 -04:00
Technoboy10
188841c73c layout reducer (needs work) 2016-07-22 14:57:47 -04:00
Technoboy10
808922b50d pass layout to navbar and footer 2016-07-22 14:57:05 -04:00
Technoboy10
391344489d footer mobile 2016-07-22 14:56:14 -04:00
Technoboy10
5b9cef8dd6 navbar mobile 2016-07-22 14:55:56 -04:00
Technoboy10
a9def9c1ae tweak splash to not be terrible on mobile 2016-07-22 14:53:39 -04:00
Ray Schamp
7ae7db76a2 Fix typo 2016-07-22 12:45:18 -04:00
Ray Schamp
62609cbc87 Collapse by beginning all routes with a common ^ 2016-07-22 12:38:24 -04:00
Ray Schamp
eba654c411 Collapse /classes routes to shorten condition 2016-07-22 12:21:42 -04:00
Ray Schamp
44c2b55f14 Merge pull request #746 from rschamp/bugfix/token-path 
Don't require end slashes when replacing arguments
 2016-07-22 11:48:03 -04:00
Ray Schamp
e5ad1872d0 Don't require end slashes when replacing arguments 2016-07-22 11:47:26 -04:00
Ray Schamp
4074e218b2 Merge pull request #744 from rschamp/feature/3679-complete-registration 
Add Student registration update view
 2016-07-22 09:44:23 -04:00
Ray Schamp
7455807591 Provide RegistrationError content as children 
This allows us to do more inline formatting, so we don't have any of that outside of `render`.

Thanks @mewtaylor
 2016-07-22 09:38:37 -04:00
Ray Schamp
be41d004ad Show password by default 2016-07-21 21:08:07 -04:00
Ray Schamp
3335207c54 Update copy for password step 2016-07-21 21:08:07 -04:00
Ray Schamp
7e330bfb67 Redirect to student registration update view 
Previously requests to /session/ would return a signal to redirect, but we need /session/ to complete registration. So check if we should redirect when we retrieve the session.

Also update this behavior for banned users.
 2016-07-21 21:08:07 -04:00
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
Technoboy10
b88b8c83b1 redo responsive nav 2016-07-21 10:12:16 -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
Technoboy10
22dc55c030 change verbiage, begin work on responsive nav/footer 2016-07-20 16:53:50 -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