scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 09:11:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2588 commits 221 branches 1 tag 508 MiB
Commit graph

2588 commits

This branch
This branch
All branches
Author SHA1 Message Date
cwillaim
487b6cd152 Add utils for reused strings in teacher registration tests, and update tests to import them. Add tests for the organization step. 2017-01-03 12:16:15 -05:00
cwillaim
871bb4b52d Use a different username when filling in first slide, ladybug was taken. 2017-01-03 12:16:15 -05:00
cwillaim
2fe8dbb490 Add tests for the educator registration flow, up to the phone number step. 2017-01-03 12:16:15 -05:00
Matthew Taylor
6c589e1dc7 remove test ref 
whoopsie :)
 2016-12-28 10:03:11 -05:00
Matthew Taylor
5da9514f4d Don’t validate username server side if error 
Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.
 2016-12-28 09:54:46 -05:00
morantsur
e763f8a9bf Merge pull request #1095 from morantsur/microworlds_projects 
Add a microworlds homepage, and point microworlds pages at the new microworlds projects.
 2016-12-22 12:36:03 -05:00
chrisgarrity
1ba27684c8 Update wording of Animate a Name TTT 
Don’t encourage scratchers to share personal info
 2016-12-21 14:37:33 -05:00
The_Grits
4595377ed8 Remove spaces from other strings 2016-12-21 14:23:17 -05:00
morantsur
0df1eec3e0 Merge pull request #1122 from morantsur/fix_fashion 
Fix #1118 - broken link to fashion microworld video
 2016-12-21 12:13:05 -05:00
morant
66f8ee201f Remove bannerUrl, as it’s only used in the modal. 2016-12-21 12:06:48 -05:00
The_Grits
66c9e14c15 Remove spaces 2016-12-21 11:18:29 -05:00
morantsur
e95caef368 Merge branch 'develop' into microworlds_projects 2016-12-20 13:02:46 -05:00
morant
012321721c Remove isRequired from description and onGuideClick, and fix naming on l10n strings. 2016-12-20 12:58:16 -05:00
Ray Schamp
9e1c985ae5 Merge pull request #1134 from LLK/release/2.2.16 
[Develop] Release 2.2.16
 2016-12-20 12:27:25 -05:00
Ray Schamp
023d0d6368 Merge pull request #1135 from LLK/release/2.2.16 
[Master] Release 2.2.16
 2016-12-20 12:27:14 -05:00
morant
485d3903e0 - Fix routes 
- move functions to inline rendering in ttt-tile and mw homepage
 2016-12-20 12:06:58 -05:00
Matthew Taylor
14b7892335 Merge pull request #1133 from mewtaylor/issue/faq-update 
Update bulk account creation faq string
 2016-12-20 09:09:56 -05:00
Matthew Taylor
dbee423814 Update bulk account creation faq string 
/cc @kaschm
 2016-12-20 09:07:16 -05:00
The_Grits
5cc8b2c124 Update Flash Link 
As per #1130
 2016-12-20 00:27:37 -05:00
Matthew Taylor
7755429cb4 Merge pull request #1131 from mewtaylor/issue/school-faq-copy 
Update bulk creation faq content
 2016-12-19 17:59:25 -05:00
Matthew Taylor
967b2beb42 Update bulk creation faq content 2016-12-19 17:50:45 -05:00
Ray Schamp
afe63af707 Provide intl to TeacherRegistration 2016-12-19 17:02:03 -05:00
Ray Schamp
cfc962adc1 Merge pull request #1129 from rschamp/bugfix/1124 
Allow empty response, again
 2016-12-19 15:56:36 -05:00
Ray Schamp
c901675b41 Allow empty response, again 
Missed in #1128, this fixes the rest of the handler to not expect a body from the request. Fixes #1124 again.
 2016-12-19 15:41:32 -05:00
Ray Schamp
9c8a7d5401 Merge pull request #1128 from rschamp/bugfix/1124 
Allow empty responses
 2016-12-19 13:49:30 -05:00
Ray Schamp
3b396019ab Allow empty responses 
Fixes #1124 by not assuming there is any body associated with the response.  That we don't send one is news to me, but we should cover this possibility in any case.
 2016-12-19 13:43:33 -05:00
Matthew Taylor
d38a2d89c9 Merge pull request #1127 from mewtaylor/issue/gh-1125 
Fix GH-1125: get `formatMessage` from props
 2016-12-18 22:18:41 -05:00
Matthew Taylor
ccd6713ef1 get formatMessage from props 
Fixes #1125. I had fixed this last iteration, not sure how it got re-introduced.
 2016-12-18 22:08:17 -05:00
morant
647bc74ec3 Fix #1118 - broken link to fashion microworld video 2016-12-16 14:03:51 -05:00
morant
7bbb498a4f - Stop using ttt cscc files, and remove all references to ttt that are not needed. 
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
 2016-12-16 12:18:16 -05:00
Matthew Taylor
e54b521cfd Merge pull request #1119 from mewtaylor/issue/gh-1100-fallout 
Remove `routeAlias` from splash redirect
 2016-12-16 10:59:02 -05:00
Matthew Taylor
134dbbd3a8 Remove routeAlias from splash redirect 
It’s not necessary, and I believe is causing confusion for the faslty config.
 2016-12-16 10:41:45 -05:00
Matthew Taylor
34ff8fc50f Merge pull request #1116 from mewtaylor/issue/remove-hoc-banner 
Remove HOC Banner
 2016-12-16 10:33:57 -05:00
morant
e3025ea3e9 Added a microworlds homepage, based on the ttt page, at /microworlds/go. 
Changed ttt-tile to only show “see guides…” if they exist.
 2016-12-15 16:59:48 -05:00
Matthew Taylor
1b37ec232c Merge pull request #1115 from mewtaylor/issue/gh-1112 
Fix GH-1112: Update id string for general error message strings
 2016-12-15 15:58:49 -05:00
Matthew Taylor
3c3f1c2f8f Remove HOC Banner 
Reverts #1073
 2016-12-15 15:58:29 -05:00
Matthew Taylor
0111278fa5 Update id string for general error message strings 
Fixes #1112, which was created by moving the error message into `general`
 2016-12-15 15:32:40 -05:00
Ray Schamp
2539c4cf63 Merge pull request #1110 from rschamp/bugfix/fallback-registration-error 
Provide fallback error messages
 2016-12-13 15:08:42 -05:00
Matthew Taylor
985dfd60ca Merge pull request #1111 from mewtaylor/issue/gh-1101 
Fix GH-1101: only apply right margin to radio input
 2016-12-13 13:55:44 -05:00
Ray Schamp
64ceb2ae56 Provide fallback error messages 
In case the response does not supply `msg` or `errors`, provide a default. If `registrationError(s)` is empty, we do not show the error card, which causes "silent" failures.
 2016-12-13 12:12:23 -05:00
Matthew Taylor
ba50840809 only apply right margin to radio input 
fixes #1101. I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
 2016-12-13 12:11:24 -05:00
chrisgarrity
3f1c9dcccb Merge pull request #1105 from chrisgarrity/gh1047-belarusian 
Add Belarusian to the menu
 2016-12-13 09:01:06 -05:00
chrisgarrity
4d06911576 Add Belarusian to the menu 
Fixes #1047
 2016-12-13 08:52:07 -05:00
Matthew Taylor
cbd983baf8 Merge pull request #932 from TheGrits/patch-3 
Fix gh-678: Retain Search Term
 2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a Squish 2016-12-12 16:01:06 -05:00
Matthew Taylor
117dbcde3a Merge pull request #1100 from mewtaylor/issue/r2-4195 
Fix r2-4195: Handle double slash in splash pattern
 2016-12-12 15:04:19 -05:00
Matthew Taylor
83f6bc6892 add slash 
thanks @rschamp!
 2016-12-08 17:37:34 -05:00
Matthew Taylor
d3e6fd48cd Move out to redirect 2016-12-08 17:20:34 -05:00
Matthew Taylor
b1595caa95 Handle double slash in splash pattern 
This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.
 2016-12-08 10:19:17 -05:00
Matthew Taylor
11828d2d44 Merge pull request #1099 from mewtaylor/issue/gh-966 
Fix GH-966: Localize default “required” message
 2016-12-08 09:35:57 -05:00