Commit graph

4751 commits

Author SHA1 Message Date
Ben Wheeler
16dd9e0b76 format next button, use correct strings 2019-08-01 22:27:47 -04:00
Chris Willis-Ford
d7f38e381e
Merge pull request #3206 from cwillisf/scratch-desktop-3.5.0
[Master] update download link for Scratch Desktop -> 3.5.0
2019-08-01 14:00:30 -07:00
Chris Willis-Ford
2871bbe4a1
Merge pull request #3205 from cwillisf/scratch-desktop-3.5.0
[Develop] update download link for Scratch Desktop -> 3.5.0
2019-08-01 14:00:28 -07:00
Ben Wheeler
bef6063373 add instructions text to join flow welcome step 2019-08-01 16:27:54 -04:00
Karishma Chadha
e5cd0a1c0f
Merge pull request #3198 from LLK/release/2019-08-01
[Develop] Release 2019-08-01
2019-08-01 16:21:30 -04:00
picklesrus
98a25068d6 Enable react linting and move test file to .jsx instead of .js. 2019-08-01 16:16:42 -04:00
Christopher Willis-Ford
f90358e2c7 update download link for Scratch Desktop -> 3.5.0 2019-08-01 12:02:15 -07:00
greenkeeper[bot]
95b84f8e4a chore(package): update lockfile package-lock.json 2019-08-01 17:18:09 +00:00
greenkeeper[bot]
ae04f20b75 chore(package): update scratch-gui to version 0.1.0-prerelease.20190801170416 2019-08-01 17:18:05 +00:00
Karishma Chadha
9b98d13181
Merge pull request #3197 from LLK/release/2019-08-01
[Master] Release/2019 08 01
2019-08-01 13:11:47 -04:00
picklesrus
0e09e29c80 Add Enzyme to www and add a test for the NextStepButton. This takes our enzyme helpers from gui and copies them here. It also requires a babel plugin to play nicely with jest. 2019-07-31 17:35:57 -04:00
Ben Wheeler
50e706efa8 country data, functions and tests 2019-07-31 17:21:32 -04:00
Karishma Chadha
0d4ff800fb
Merge pull request #3196 from LLK/develop
Update release branch with latest changes.
2019-07-31 15:47:12 -04:00
Karishma Chadha
452ce99891
Merge pull request #3195 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190731192641
Update scratch-gui to the latest version 🚀
2019-07-31 15:44:48 -04:00
greenkeeper[bot]
94ba7b7e98 chore(package): update lockfile package-lock.json 2019-07-31 19:40:56 +00:00
greenkeeper[bot]
5859b28c06 chore(package): update scratch-gui to version 0.1.0-prerelease.20190731192641 2019-07-31 19:40:52 +00:00
Paul Kaplan
afd7efdbec
Merge pull request #3194 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190731154138
Greenkeeper/scratch gui 0.1.0 prerelease.20190731154138
2019-07-31 12:12:49 -04:00
greenkeeper[bot]
9ee4cc39fb chore(package): update lockfile package-lock.json 2019-07-31 16:06:09 +00:00
greenkeeper[bot]
5b870fdf02 chore(package): update scratch-gui to version 0.1.0-prerelease.20190731154138
Closes #3193
2019-07-31 16:06:05 +00:00
Ray Schamp
46af442541
Merge pull request #3191 from LLK/hotfix/registration-recaptcha
[Master] Adjust height when displaying reCAPTCHA challenge
2019-07-31 09:19:40 -04:00
Ray Schamp
1da17e4035
Merge pull request #3192 from LLK/hotfix/registration-recaptcha
[Develop] Adjust height when displaying reCAPTCHA challenge
2019-07-31 09:03:25 -04:00
Eric Rosenbaum
bbedabce45
Merge pull request #3189 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190730192808
Update scratch-gui to the latest version 🚀
2019-07-30 16:20:55 -04:00
greenkeeper[bot]
18839497fb chore(package): update lockfile package-lock.json 2019-07-30 19:47:02 +00:00
greenkeeper[bot]
96c6a9c546 chore(package): update scratch-gui to version 0.1.0-prerelease.20190730192808 2019-07-30 19:46:58 +00:00
Benjamin Wheeler
511ea16516
Merge pull request #3188 from benjiwheeler/readme-translate
update translation command to npm run translate
2019-07-30 14:34:54 -04:00
Benjamin Wheeler
4182df88f6
Merge pull request #3184 from benjiwheeler/join-flow-stub-email-welcome
added stubs for email step, welcome step
2019-07-30 14:29:20 -04:00
Ben Wheeler
db3c73c267 removed errant birth_month and birth_year variables 2019-07-30 14:21:19 -04:00
Ben Wheeler
a2bf6ff27b update translation command to npm run translate 2019-07-30 14:13:42 -04:00
Ben Wheeler
a435626ae1 added stubs for email step, welcome step 2019-07-29 22:29:04 -04:00
Benjamin Wheeler
099cde71b8
Merge pull request #3131 from benjiwheeler/fix-comment-key
provide key to comments
2019-07-29 19:36:37 -04:00
Benjamin Wheeler
687130eacf
Merge pull request #3181 from benjiwheeler/join-flow-validation-positioning
better validation positioning on birthdate step
2019-07-29 18:57:36 -04:00
Ben Wheeler
651807438a better validation positioning on birthdate step 2019-07-29 16:32:20 -04:00
Benjamin Wheeler
4d5232bec5
Merge pull request #3179 from benjiwheeler/join-flow-missing-strings
added missing strings to join flow
2019-07-29 16:25:34 -04:00
DD Liu
868fd994fb
Merge pull request #3183 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190729162318
Update scratch-gui to the latest version 🚀
2019-07-29 13:04:34 -04:00
greenkeeper[bot]
02a118b4de chore(package): update lockfile package-lock.json 2019-07-29 16:39:13 +00:00
greenkeeper[bot]
02c2f44b34 chore(package): update scratch-gui to version 0.1.0-prerelease.20190729162318 2019-07-29 16:39:09 +00:00
Ray Schamp
fe15a89486 Adjust height when displaying reCAPTCHA challenge 2019-07-29 12:03:59 -04:00
Benjamin Wheeler
986707ccf8
Merge pull request #3180 from benjiwheeler/join-flow-design-tweaks
Join flow design tweaks
2019-07-29 10:09:09 -04:00
Ben Wheeler
1cd0713bb9 added missing strings to join flow 2019-07-26 22:10:21 -04:00
Ben Wheeler
e5b80bb8c3 better line spacing for join flow descriptions 2019-07-26 13:39:33 -04:00
Ray Schamp
3a7d427659
Merge pull request #3172 from LLK/release/2019-07-24
[Develop] Release for 2019-07-24
2019-07-25 14:00:02 -04:00
Ray Schamp
3ea3999bd8
Merge pull request #3171 from LLK/release/2019-07-24
[Master] Release for 2019-07-24
2019-07-25 13:59:47 -04:00
Ray Schamp
8d5c840f72
Merge pull request #3176 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190725155313
Update scratch-gui to version 0.1.0-prerelease.20190725155313
2019-07-25 13:36:30 -04:00
greenkeeper[bot]
1b2a8107ce chore(package): update lockfile package-lock.json 2019-07-25 16:07:04 +00:00
greenkeeper[bot]
a65fc35545 chore(package): update scratch-gui to version 0.1.0-prerelease.20190725155313
Closes #3175
2019-07-25 16:06:59 +00:00
Ray Schamp
ea3243b8a2
Merge pull request #3170 from LLK/develop
Merge develop to release branch
2019-07-24 15:52:16 -04:00
Ray Schamp
50d426fe89
Merge pull request #3169 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190724175453
Update scratch-gui to version 0.1.0-prerelease.20190724175453
2019-07-24 15:39:15 -04:00
greenkeeper[bot]
60ce706502 chore(package): update lockfile package-lock.json 2019-07-24 18:16:34 +00:00
greenkeeper[bot]
3d0c445138 chore(package): update scratch-gui to version 0.1.0-prerelease.20190724175453
Closes #3168
2019-07-24 18:16:30 +00:00
chrisgarrity
b2a2b92270
Merge pull request #3166 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190723203336
Greenkeeper/scratch gui 0.1.0 prerelease.20190723203336
2019-07-23 20:17:05 -04:00