scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1370 commits 217 branches 1 tag 473 MiB
Commit graph

1370 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
f3de2d1d28 re-order languages 
and also get language for dropdown from `IntlProvider` rather than the window, so that we have one point of truth
 2016-08-15 14:53:31 -04:00
Matthew Taylor
0f93d32666 Move up Friulian 2016-08-15 11:41:57 -04:00
Matthew Taylor
a46f6da150 Add fur, sq and te to language list 2016-08-15 11:19:22 -04:00
Matthew Taylor
e791c0a8ff Merge branch 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 into develop 
* '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
 2016-08-12 17:23:32 -04:00
Matthew Taylor
61ef3c2c69 Switch ordering 
so `intl` comes first
 2016-08-12 16:43:56 -04:00
Matthew Taylor
0d9493de12 Remove option warning in console 
`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.
 2016-08-12 15:47:44 -04:00
Matthew Taylor
6d5bb4f850 Add maxLength validations where needed 
fixes #835
 2016-08-12 15:39:39 -04:00
Matthew Taylor
2db7097b9b Merge pull request #839 from mewtaylor/hotfix/gh-828 
[Develop] Fix GH-828: check street number range for address
 2016-08-12 15:15:53 -04:00
Matthew Taylor
ccfde96f67 use new match option instead of header 
so that it works in IE9 too.
 2016-08-12 14:40:26 -04:00
Matthew Taylor
ea91b3d885 Remove declaration of defaultsDeep 
Got lost in the merge, apologies.
 2016-08-11 15:55:58 -04:00
Matthew Taylor
e18e320231 Merge branch 'hotfix/gh-828' into develop 
* 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
 2016-08-11 15:45:05 -04:00
Matthew Taylor
d6d5fa0f8a Make X-Requested-With overridable 
thanks @rschamp!
 2016-08-11 15:20:54 -04:00
Matthew Taylor
4dc85b1bc4 use defaults again 
deep is no longer necessary with the `headers` change
 2016-08-11 15:20:54 -04:00
Matthew Taylor
fa2c326955 Only apply X-Requested-With to same domain 
it breaks on cross domain
 2016-08-11 15:20:54 -04:00
Matthew Taylor
9c88f92f44 check street number range for address 
rather than exact address, so that we can more flexibly allow outdate post office data
 2016-08-11 15:20:54 -04:00
Ray Schamp
5001d3a12d Merge pull request #833 from rschamp/bugfix/3937 
[Master] Update teacher FAQ copy
 2016-08-11 14:32:12 -04:00
Ray Schamp
1df251ca2a Merge pull request #832 from rschamp/bugfix/3937 
[Develop] Update teacher FAQ copy
 2016-08-11 14:22:46 -04:00
Ray Schamp
46b23beda5 Update teacher FAQ copy 
Resolves LLK/scratchr2#3937
 2016-08-11 13:00:45 -04:00
Matthew Taylor
2fc62cba13 Merge pull request #830 from mewtaylor/hotfix/gh-828 
[Develop] Fix GH-828: check street number range for address
 2016-08-11 08:46:07 -04:00
Matthew Taylor
4d9fe86f40 check street number range for address 
rather than exact address, so that we can more flexibly allow outdate post office data
 2016-08-10 15:33:17 -04:00
Ray Schamp
47d0cca883 Merge pull request #824 from St19Galla/patch-1 
Fix GH-806: Teacher Account Video Embded
 2016-08-10 12:15:56 -04:00
St19_Galla
ecd1963bbe Update faq.jsx 2016-08-10 12:14:08 -04:00
Matthew Taylor
00920e7da6 Merge pull request #826 from mewtaylor/hotfix/gh-816 
[Master] Hotfix: Remove `phoneLength` validation
 2016-08-10 10:59:07 -04:00
Matthew Taylor
d639d17d85 Merge pull request #827 from mewtaylor/issue/gh-816 
[Develop] Hotfix: Remove `phoneLength` validation
 2016-08-10 09:51:35 -04:00
Matthew Taylor
6e3a18a574 only look for empty phone on submit 
thanks @rschamp!
 2016-08-10 09:45:21 -04:00
Matthew Taylor
56e88685b5 Check for empty phone number on submit 
Thanks @rschamp!
 2016-08-10 09:38:43 -04:00
Matthew Taylor
30945bc078 Remove phoneLength validation 2016-08-10 07:53:49 -04:00
Matthew Taylor
56481c797e Remove phoneLength validation 
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.
 2016-08-10 07:47:12 -04:00
Matthew Taylor
e8543f0745 Merge pull request #820 from mewtaylor/hotfix/gh-673 
[Master] Hotfix: Bind the banner api method to the splash page
 2016-08-09 16:58:26 -04:00
Connor Hudson
f49d6e6a83 Merge pull request #767 from technoboy10/mobile-nav-footer 
Fix GH-217: Implement responsive nav and footer (woohoo!)
 2016-08-09 15:09:01 -04:00
Matthew Taylor
20f944c70f Merge pull request #823 from TheGrits/patch-1 
Fix gh-822: Missing Email Address
 2016-08-09 10:42:22 -04:00
St19_Galla
8b18629264 amend text 2016-08-09 10:22:48 -04:00
St19_Galla
fd5be4bf8d Embed Video 2016-08-09 10:16:08 -04:00
Technoboy10
c009497b6b use scss in navbar instead of react-responsive 2016-08-09 09:55:20 -04:00
The_Grits
722b7ec20c Add email address link 
Fixes #822
 2016-08-08 19:37:58 -04:00
Matthew Taylor
68042b056b Merge pull request #821 from mewtaylor/hotfix/gh-673 
[Develop] Hotfix: Bind the banner api method to the splash page
 2016-08-08 16:39:39 -04:00
Matthew Taylor
7cb14c17b9 Bind the api method to the splash page 
otherwise, `this` is undefined. Fixes #673.
 2016-08-08 16:31:03 -04:00
Matthew Taylor
f3c4276d0f Merge pull request #814 from St19Galla/patch-1 
Fix GH-812 / Enhance Checkbox Display
 2016-08-08 10:20:09 -04:00
Matthew Taylor
b553b3f25f Merge pull request #817 from mewtaylor/issue/gh-658 
Fix GH-658: remove link to “My Classes” from faq
 2016-08-08 09:58:56 -04:00
Matthew Taylor
967e5b6d3f remove link to “My Classes” from faq 
so that it doesn’t 403 for people without educator accounts. Fixes #658
 2016-08-08 08:34:20 -04:00
Matthew Taylor
606e3600ba Merge pull request #803 from mewtaylor/issue/gh-683 
Fix GH-[683,705,712,797]: Updates to registration UX for teachers
 2016-08-08 08:10:24 -04:00
St19_Galla
a7ea6d7fd9 whoops, don't need that anymore 2016-08-05 15:51:48 -04:00
St19_Galla
ef55f20ff3 now i finally understand scss variables 2016-08-05 15:50:51 -04:00
St19_Galla
3ff81296a7 test 2016-08-05 15:43:15 -04:00
St19_Galla
dd85de22e6 Enhance Checkbox Display 2016-08-05 15:24:33 -04:00
Matthew Taylor
371aab1e26 Merge pull request #811 from mewtaylor/hotfix/js-types 
[Develop] Fall back to doing it the svg way
 2016-08-04 08:36:39 -04:00
Matthew Taylor
dc209f466a Fall back to doing it the svg way 2016-08-04 08:35:30 -04:00
Matthew Taylor
4bfb4e197d Merge pull request #810 from mewtaylor/hotfix/js-types 
[Develop] Hotfix: Don’t use mime magic to guess
 2016-08-04 08:24:52 -04:00
Matthew Taylor
3a6ed90e72 Don’t use mime magic to guess 
hopefully just using file extensions works
 2016-08-04 08:24:02 -04:00
Matthew Taylor
04524c8d91 Merge pull request #809 from mewtaylor/hotfix/js-types 
[Develop] Set mime types on deploy
 2016-08-04 08:09:40 -04:00