Commit graph

5954 commits

Author SHA1 Message Date
Ray Schamp
e4021821c4
Merge pull request #3231 from rschamp/bump-gui
Bump scratch-gui version
2019-08-08 12:02:38 -04:00
rschamp
a731484bdf Bump scratch-gui version 2019-08-08 12:00:13 -04:00
Ray Schamp
df30112b75
Merge pull request #3230 from LLK/fix-locale-data
Fix locale data
2019-08-08 11:48:30 -04:00
Chris Garrity
a25e7d5e8e update package lock 2019-08-08 16:32:59 +01:00
Chris Garrity
24f06f275b Use localeData from l10n
Remove old tech debt.

www had always imported every react-intl defined locale, and then added our custom locales.

scratch-l10n defines localeData based on the currently supported languages, and it includes any necessary custom-locales, so we should use that instead of maintaining two custom locale lists.
2019-08-08 16:32:40 +01:00
Ben Wheeler
bca11b1191 pass disabled prop to formik-select 2019-08-08 09:56:12 -04:00
Ben Wheeler
7a4925ddba add join flow country step 2019-08-08 00:29:04 -04:00
Colby Gutierrez-Kraybill
78bb1c4420
Merge pull request #3226 from LLK/release/2019-08-07-update-package
Update scratch-gui to new release
2019-08-08 00:20:07 -04:00
Colby Gutierrez-Kraybill
026292ad83
Merge pull request #3225 from LLK/develop
Develop → Merge → Release 2019-08-07
2019-08-08 00:19:21 -04:00
Colby Gutierrez-Kraybill
74ac93c8c5 Update scratch-gui to new release 2019-08-08 00:12:37 -04:00
Ray Schamp
3269565079
Merge pull request #3224 from LLK/hotfix/remove-deploy-enslowening
Revert "Merge pull request #3217 from LLK/hotfix/fastly-concurrency"
2019-08-07 15:54:26 -04:00
Ray Schamp
6275b516fc
Merge pull request #3199 from benjiwheeler/join-flow-country-data
Consolidate country lists, fix country field in teacher account registration
2019-08-07 15:00:50 -04:00
Paul Kaplan
5ac67cc033 Revert "Merge pull request #3217 from LLK/hotfix/fastly-concurrency"
This reverts commit fecf3a81d7, reversing
changes made to 76473c97fe.
2019-08-07 14:03:48 -04:00
DD Liu
b55d879162
Merge pull request #3223 from LLK/updateGui
update gui
2019-08-07 13:13:53 -04:00
DD Liu
8a73af0878
update gui 2019-08-07 12:21:06 -04:00
Ben Wheeler
167a70f437 simplify adding common countries to top of list 2019-08-06 20:42:03 -04:00
Paul Kaplan
9ff3efac00
Merge pull request #3212 from LLK/hotfix/report-project-thumbnails
[Develop] Hotfix/report project thumbnails
2019-08-06 15:28:32 -04:00
Ben Wheeler
564baf2ebc handle error when teacher country selection fails to resolve to country name 2019-08-06 15:00:18 -04:00
Paul Kaplan
7ac4ce99c4
Merge pull request #3211 from LLK/hotfix/report-project-thumbnails
[Master] Fix project thumbnails for reporting
2019-08-06 12:20:43 -04:00
Ben Wheeler
51aa38fb34 consolidated country-data and contry-list 2019-08-06 00:00:37 -04:00
Paul Kaplan
706ba78879 Fix project thumbnails for reporting 2019-08-05 16:25:41 -04:00
Ray Schamp
47754c03ae
Merge pull request #3218 from LLK/hotfix/fastly-concurrency
[Master] Add concurrency limits to async Fastly API requests
2019-08-05 16:20:32 -04:00
Ray Schamp
fecf3a81d7
Merge pull request #3217 from LLK/hotfix/fastly-concurrency
[Develop] Add concurrency limits to async Fastly API requests
2019-08-05 16:20:19 -04:00
rschamp
21dccf60fe Rename and make concurrency limit configurable 2019-08-05 15:58:17 -04:00
picklesrus
a100438db6 Add unittest for JoinFlowStep. 2019-08-05 15:47:47 -04:00
rschamp
802c6bff22 Add concurrency limits to async requests of 2019-08-05 15:33:46 -04:00
rschamp
5e79449334 Add concurrency limits to async requests 2019-08-05 15:09:36 -04:00
Benjamin Wheeler
76473c97fe
Merge pull request #3178 from benjiwheeler/join-flow-gender-step
Join flow gender step
2019-08-03 00:15:53 -04:00
Ben Wheeler
aca45d4032 replaced id with name in formik-radio-button 2019-08-03 00:08:18 -04:00
Ben Wheeler
c4d7ba0350 changed naming of user-provided radio input from other to custom 2019-08-03 00:08:18 -04:00
Ben Wheeler
8725cee6a1 replaced gender l10n strings with existing ones 2019-08-03 00:08:18 -04:00
Ben Wheeler
a2b96e9bac fixed linting errors 2019-08-03 00:08:18 -04:00
Ben Wheeler
0be2f463c3 removed unnecessary validation code 2019-08-03 00:08:18 -04:00
Ben Wheeler
29ea00ab3c correct proptype 2019-08-03 00:08:18 -04:00
Ben Wheeler
150201f8d0 add padding to top of gender step 2019-08-03 00:08:18 -04:00
Ben Wheeler
b7b65ec3ee remove formik input inline prop 2019-08-03 00:08:18 -04:00
Ben Wheeler
09ff758eee add gender step strings 2019-08-03 00:08:18 -04:00
Ben Wheeler
40c90e2d2e formik input can be made to appear inline 2019-08-03 00:08:18 -04:00
Ben Wheeler
bd83a282c5 gender step handles other option 2019-08-03 00:08:18 -04:00
Ben Wheeler
cf42b8b3a1 formik input accepts classname from radio option other 2019-08-03 00:08:17 -04:00
Ben Wheeler
26ab2b1366 validate gender step by defaulting to prefer not to say 2019-08-03 00:08:17 -04:00
Ben Wheeler
e22a848350 add GenderOption component to handle most gender radio options 2019-08-03 00:08:17 -04:00
Ben Wheeler
5de681fd68 remove header image and set height of overall gender step 2019-08-03 00:08:17 -04:00
Ben Wheeler
d70df3c91a add gender step to join flow sequence 2019-08-03 00:07:11 -04:00
Ben Wheeler
9e2a3eb3e3 add gender step draft, formik radio button draft 2019-08-03 00:07:11 -04:00
Benjamin Wheeler
56ce60fe86
Merge pull request #3207 from benjiwheeler/join-flow-welcome-text
add instructions text to join flow welcome step
2019-08-03 00:06:00 -04:00
Benjamin Wheeler
ab727a6d06
Merge pull request #3208 from benjiwheeler/join-flow-next-button
format next button, use correct strings
2019-08-03 00:05:30 -04:00
picklesrus
aba70c7dc4
Merge pull request #3200 from picklesrus/add-enzyme-and-button-test
Add Enzyme to www and add a test for the NextStepButton. This takes o…
2019-08-02 10:13:01 -04:00
picklesrus
f4774f229c
pin babel dependency
Co-Authored-By: Ray Schamp <rschamp@users.noreply.github.com>
2019-08-02 09:57:08 -04:00
chrisgarrity
4e8cdc67d7
Merge pull request #3209 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190802124055
Update scratch-gui to the latest version 🚀
2019-08-02 09:47:01 -04:00