GitLab

* 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1:
  Switch ordering
  Remove `option` warning in console
  Add `maxLength` validations where needed

# Conflicts:
#	src/components/registration/steps.jsx

so `intl` comes first

`option` throws an error in React if it’s not a string. `FormattedMessage` returns a `span` around strings, so any time this function was loaded/called, it was throwing >100 warnings in the console. use `intl` to return a string instead.

fixes #835

[Develop] Fix GH-828: check street number range for address

so that it works in IE9 too.

Got lost in the merge, apologies.

* hotfix/gh-828:
  Make `X-Requested-With` overridable
  use `defaults` again
  Only apply `X-Requested-With` to same domain
  check street number range for address

# Conflicts:
#	src/lib/api.js

thanks @rschamp!

deep is no longer necessary with the `headers` change

it breaks on cross domain

rather than exact address, so that we can more flexibly allow outdate post office data

[Master] Update teacher FAQ copy

[Develop] Update teacher FAQ copy

Resolves LLK/scratchr2#3937

[Develop] Fix GH-828: check street number range for address

rather than exact address, so that we can more flexibly allow outdate post office data

Fix GH-806: Teacher Account Video Embded

[Master] Hotfix: Remove `phoneLength` validation

[Develop] Hotfix: Remove `phoneLength` validation

thanks @rschamp!

Thanks @rschamp!

It appears that some valid phone numbers in some countries differ in length from what is specified in the util’s phone number format. Fixes #816.

[Master] Hotfix: Bind the banner api method to the splash page

Fix GH-217: Implement responsive nav and footer (woohoo!)

Fix gh-822: Missing Email Address

Fixes #822

[Develop] Hotfix: Bind the banner api method to the splash page

otherwise, `this` is undefined. Fixes #673.

Fix GH-812 / Enhance Checkbox Display

Fix GH-658: remove link to “My Classes” from faq

so that it doesn’t 403 for people without educator accounts. Fixes #658

Fix GH-[683,705,712,797]: Updates to registration UX for teachers