GitLab

Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow

* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits)
  Add serverside email validation
  Clean up
  Move registration step to main component
  Submit the rest of the fields when registering
  This help text is redundant now
  Fix organization "other" field enablement
  Get the form creating regular accounts
  Add method to api for submitting forms
  Update language chooser for formsy
  Add missing string
  Add progress indicators
  Style pass
  Remove unused label component
  Remove unused mixin factory
  Fixup api refactor
  Add serverside username validation
  L10n pass
  Explain the GeneralError component
  Add help text when a field is not required
  L10n WIP
  ...

# Conflicts:
#	src/l10n.json
#	src/views/splash/splash.jsx

Fix GH-554: Localize FAQ title

Fix GH-[571,563] – updates to the conference site

Add a placeholder error step

Fix GH-541: Add "schools" section to faq

Some of our legacy endpoints expect this style rather than json.

Also clean up the way useCsrf works — don't always set json attribute to an empty object.

1. new collaborators
2. new sold out language
3. some copy edits

Add teacher faq page

Fix gh-555: Squished News Icons

thanks @technoboy10!

Fix GH-556: Add "For Developers" to the footer

Fix GH-573: center align grid while left aligning projects

Fix GH-543: Add teacher banner to splash page

* 'develop' of https://github.com/LLK/scratch-www: (29 commits)
  Add explore redirects
  Allow access to 2014 and 2015 pages
  use route aliases for generalizable route patterns
  remove `/components` from `routes.json`
  Remove Make it Fly banner
  Fix issues in FAQ of /developers page.
  move shuffle to utility module
  fix error with shuffleArray function
  add shuffleArray function, shuffle most loved and most remixed
  use `image` to get studio thumbnail
  quick formatting fix for box header on search
  Fix merge issue
  Add localizations, minor style changes
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  ...

# Conflicts:
#	src/views/splash/splash.jsx
#	src/views/splash/splash.scss

Fix GH-574: Add explore redirects

Fixes #573

for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`

Updates after a rebase

With this we get cleanspeak for free

Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field