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
1533 commits 217 branches 1 tag 473 MiB
Commit graph

1533 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
41a0ef73ba Add missing strings for translation 
1. Explore page header
2. “by” in the project thumbnail
 2016-08-16 08:55:32 -04:00
Matthew Taylor
b893c5c657 Merge pull request #845 from mewtaylor/issue/new-languages 
Add fur, sq and te to language list
 2016-08-16 08:45:28 -04:00
Matthew Taylor
54e9980808 Merge pull request #847 from mewtaylor/issue/gh-835 
For GH-835: eliminate max height of validation messsage
 2016-08-16 08:14:09 -04:00
Matthew Taylor
bb37d4be57 eliminate max height of validation messsage 
now that it’s not centered but rather top/down, we don’t need this anymore
 2016-08-16 08:08:48 -04:00
Matthew Taylor
ac4d1b51d6 Merge pull request #846 from mewtaylor/issue/gh-835 
For GH-835: Update max length copy
 2016-08-15 16:47:10 -04:00
Matthew Taylor
2a18c381f4 Update max length copy 
thanks @kaschm and @jwzimmer !
 2016-08-15 16:40:01 -04:00
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
f4d7cbd235 Merge pull request #819 from mewtaylor/issue/gh-546 
Fix GH-546: Update faq language
 2016-08-15 13:30:29 -04:00
Matthew Taylor
59d558116e Merge pull request #836 from mewtaylor/issue/gh-760 
Fix GH-760: Add username `not equals` to password validation
 2016-08-15 13:29:46 -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
9afb4b6563 Merge pull request #829 from mewtaylor/hotfix/gh-828 
[Master] Fix GH-828: check street number range for address
 2016-08-12 17:13:41 -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
f8de61f067 Update from feedback 
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
 2016-08-12 10:11:14 -04:00
Matthew Taylor
cbf76ec636 Clean up a few lint warnings 2016-08-12 08:10:42 -04:00
Matthew Taylor
537104c56b Add username validation to student complete registration 
Fixes #760
 2016-08-12 08:10:20 -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
b1f7d9666e Update faq language 
Fixes #546
 2016-08-08 16:28:48 -04:00