scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-20 20:42:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11467 commits 221 branches 1 tag 521 MiB
Commit graph

11467 commits

This branch
This branch
All branches
Author SHA1 Message Date
The_Grits
e42cf6f25b Fix FormattedHTMLMessage 2017-02-01 09:41:19 -05:00
Matthew Taylor
ca0985571e Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092" 
This reverts commit 8e82398255, reversing
changes made to e1a0e9fece.
 2017-01-31 11:38:50 -05:00
Ray Schamp
624bdde84c Merge pull request #1160 from TheGrits/patch-3 
Fix gh-1159: Add 2017 to Teacher Registration
 2017-01-31 11:08:16 -05:00
The_Grits
32bd01ab88 Automagic Year 2017-01-31 11:01:22 -05:00
The_Grits
d19d0844a9 Add 2017 
Resolves #1159
 2017-01-31 10:10:05 -05:00
The_Grits
79639cb454 Change Search Term and Add "Tutorials" String 2017-01-26 10:10:49 -05:00
The_Grits
4fa2d24601 Add join section 2017-01-23 07:38:58 -05:00
The_Grits
6bc8dc5947 Update l10n.json 2017-01-23 07:34:28 -05:00
Matthew Taylor
6363a16b47 Merge pull request #1151 from mewtaylor/issue/r2-4219 
For r2-4451: Change password reset anchor text
 2017-01-20 07:49:34 -05:00
Matthew Taylor
b2c32c465a Merge pull request #1138 from mewtaylor/issue/gh-1097 
Fix GH-1097: Don’t validate username server side unless it passes client-side checks
 2017-01-20 07:48:49 -05:00
Matthew Taylor
8e82398255 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-01-19 18:37:11 -05:00
Matthew Taylor
7cfc29f2dc Update content 
Thanks @kaschm!
 2017-01-19 18:36:28 -05:00
chrisgarrity
e1a0e9fece Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150) 
* Don’t allow duplicate strings in a single l10n file

Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’

* revised test case for safer file reads
 2017-01-19 18:23:56 -05:00
Matthew Taylor
e1665c2b34 Change password reset anchor text 
This is part of https://github.com/LLK/scratchr2/pull/4451
 2017-01-19 11:12:54 -05:00
Matthew Taylor
4c6522ff9d Merge pull request #1132 from TheGrits/patch-3 
Fix gh-1130: Update Flash Link
 2017-01-19 10:42:14 -05:00
chrisgarrity
9e4ef5fb1b Tx import (#1143) 
* Transifex transition

Scripts and configuration for transition to Transifex for translation.

* Transifex transition update

changed the name of the place where translations are saved from ‘translations’ to localizations so that we can have a consistent name in both scratchr2, and scratch-www.

A couple of other little clean-ups to make sure that it’s ES5 compliant.
- don’t use const
- don’t use template strings (backticks)
 2017-01-18 12:57:14 -05:00
Matthew Taylor
313f267cfe Add checkbox to opt-in to teacher emails 2017-01-17 15:57:15 -05:00
The_Grits
3f4e40ef5c Localize Credits Page 2017-01-14 00:38:16 -05:00
The_Grits
4eb3287c0e FormattedMessage and FormattedHTMLMessage 2017-01-13 23:46:26 -05:00
chrisgarrity
0b857892d2 Merge pull request #1137 from chrisgarrity/issue/gh1113-tttwording 
Update wording of Animate a Name TTT
 2017-01-04 08:55:17 -05:00
cwillaim
38bdc78d8a Update tests with the right xpath for error messages (nested span for translation) 2017-01-03 12:16:17 -05:00
cwillaim
fe2ce902e6 Update tests to use an environment value for the url, and consolidate the slide advancement functions. Update utils with better xpath for error messages 2017-01-03 12:16:16 -05:00
cwillaim
e357a62c2c Rename tests for the demographic and organization steps for consistency. Clean up teacher_registration_utils 2017-01-03 12:16:16 -05:00
cwillaim
60565d22c6 Remove unused variable in one of the address step tests 2017-01-03 12:16:16 -05:00
cwillaim
432fd1a81b Test the address and 'use scratch' steps. 2017-01-03 12:16:16 -05:00
cwillaim
29a38ca917 Finish up tests for the organization step. 2017-01-03 12:16:16 -05:00
cwillaim
4ef6dc193d Move code for filling in slides to utils, and update tests accordingly. 2017-01-03 12:16:16 -05:00
cwillaim
69c9cdba17 Update reference to the utils where each test imports them (educator...utils to teacher...utils) 2017-01-03 12:16:15 -05:00
cwillaim
3d6b89ac67 Rename tests to follow proper naming - 'teacher' instead of 'educator.' Move teacher registration tests into subfolder. 2017-01-03 12:16:15 -05:00
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