Commit graph

4810 commits

Author SHA1 Message Date
picklesrus
d2cb0818c8 Maybe setup captcha site keys properly? 2019-08-29 11:22:55 -04:00
picklesrus
9d4d2f3c67 Put the captcha badge in the bottom right. 2019-08-29 11:22:55 -04:00
picklesrus
3daba3b907 Initial work for captcha in new join flow.
TODOS:
- handle error states
- Setup keys for different environments.
- Make sure remote validators are run before captcha.
2019-08-29 11:22:55 -04:00
Paul Kaplan
ba519e7a0f
Update microbit.jsx 2019-08-29 11:21:10 -04:00
Paul Kaplan
9ce54b88e4
Merge pull request #3318 from LLK/paulkaplan-patch-2
Use new tab for PDF download button
2019-08-29 11:02:52 -04:00
Paul Kaplan
b15229f19f
Update microbit.jsx 2019-08-29 11:01:53 -04:00
Paul Kaplan
1f704a4d4d
Use new tab for PDF download button 2019-08-29 10:58:05 -04:00
Ben Wheeler
80849fec65 update gui 2019-08-29 09:11:37 -04:00
Ben Wheeler
5893ccfef1 Merge branch 'develop' into llk-release-2019-08-29 2019-08-28 21:49:51 -04:00
Benjamin Wheeler
6f88f71c54
Merge pull request #3312 from benjiwheeler/update-gui
update to release version of GUI for 2019-08-28
2019-08-28 21:28:34 -04:00
Ben Wheeler
7422efd202 update to release version of GUI for 2019-08-28 2019-08-28 21:25:31 -04:00
Eric Rosenbaum
d5977d4e2b
Merge pull request #3308 from LLK/hotfix/add-marian-sprite
[develop] Hotfix to add marian sprite
2019-08-28 16:53:25 -04:00
Eric Rosenbaum
e579bcdc7a
Merge pull request #3309 from LLK/hotfix/add-marian-sprite2
[master] Hotfix add Marian sprite
2019-08-28 15:50:58 -04:00
Eric Rosenbaum
c31596dfa6 update GUI 2019-08-28 14:27:24 -04:00
Eric Rosenbaum
c2525ddbb6 Update GUI 2019-08-28 14:13:44 -04:00
Paul Kaplan
28621c809f Update scratch-gui to hotfix renderer 2019-08-28 14:12:24 -04:00
Benjamin Wheeler
5ab2bf100b
Merge pull request #3303 from benjiwheeler/join-flow-misc-fixes
Join flow misc fixes
2019-08-28 10:28:15 -04:00
Ben Wheeler
2a78723ce4 restyle next button to remove border, add hover color 2019-08-28 10:23:15 -04:00
Benjamin Wheeler
0937b40857
Merge pull request #3302 from benjiwheeler/join-flow-password-font-size
make password font size large, if password hidden
2019-08-28 10:10:59 -04:00
Benjamin Wheeler
38766307ec
Merge pull request #3304 from benjiwheeler/restore-validation-bg
restore default orange background color for validation tooltips
2019-08-28 10:02:04 -04:00
Ben Wheeler
b5d71af4c3 restore default orange background color for validation tooltips 2019-08-27 23:01:08 -04:00
Ben Wheeler
9f5dc9928f make password font size large, if password hidden 2019-08-27 16:07:31 -04:00
Ben Wheeler
2c56c8b4cc shift info button down, in alignment with text 2019-08-27 16:06:14 -04:00
Ben Wheeler
81323f755f set validation info box shadow, font weight 2019-08-27 15:25:10 -04:00
Ben Wheeler
606421615a make long strings wrap, so they don’t bleed outside bounds 2019-08-27 15:21:31 -04:00
Ben Wheeler
65b6475ed6 smarter handling of handleCompleteRegistration 2019-08-27 12:15:49 -04:00
Benjamin Wheeler
f8b901844b
Merge pull request #3277 from benjiwheeler/join-flow-gender-validation-positioning
Join flow birthdate validation positioning
2019-08-27 11:45:18 -04:00
Benjamin Wheeler
6d78342e08
Merge pull request #3282 from benjiwheeler/join-flow-fix-tooltip-error
fix toolTip error by accepting bool as toolTip type
2019-08-27 11:44:46 -04:00
Ben Wheeler
c4712128d5 added test with error, toolTip false 2019-08-27 11:44:18 -04:00
Ben Wheeler
12631a6c64 also accept error false 2019-08-27 11:44:17 -04:00
Ben Wheeler
425675e760 accept bool as toolTip type 2019-08-27 11:44:02 -04:00
Benjamin Wheeler
de5297bf9a
Merge pull request #3294 from benjiwheeler/join-flow-unit-test-which
add tests for navigation reducer
2019-08-27 11:42:50 -04:00
Benjamin Wheeler
9b2e7153ba
Merge pull request #3298 from benjiwheeler/join-flow-auto-focus
Join flow auto focus on first input
2019-08-27 11:37:46 -04:00
Ben Wheeler
0ebc168f21 comment prop for eslint
# Conflicts:
#	src/components/registration/scratch3-registration.jsx
2019-08-26 17:29:33 -04:00
Ben Wheeler
8a19b7067f added tests for navigation reducer 2019-08-26 16:06:57 -04:00
Ben Wheeler
19a15988b2 in email step, auto-focus on first input 2019-08-26 16:02:07 -04:00
Ben Wheeler
ea9d62129a in username step, auto-focus on first input 2019-08-26 16:01:59 -04:00
Ben Wheeler
daeed19dc5 use onSetRef instead of setRef in formik-input 2019-08-26 16:01:42 -04:00
Ben Wheeler
b0bc59f9bd use more user-friendly error message if api call fails 2019-08-26 15:48:16 -04:00
Benjamin Wheeler
110ce59cc7
Revert "Revert "on complete join flow, take user to new project"" 2019-08-26 15:41:32 -04:00
Benjamin Wheeler
358f30c656
Merge pull request #3296 from LLK/revert-3295-join-flow-create-project
Revert "on complete join flow, take user to new project"
2019-08-26 15:41:07 -04:00
Benjamin Wheeler
607a314189
Revert "on complete join flow, take user to new project" 2019-08-26 15:40:41 -04:00
Benjamin Wheeler
008f600d99
Merge pull request #3295 from benjiwheeler/join-flow-create-project
on complete join flow, take user to new project
2019-08-26 15:40:29 -04:00
Ben Wheeler
4270fa4b53 on complete join flow, take user to new project 2019-08-26 15:35:40 -04:00
Benjamin Wheeler
e4d9e72e2c
Merge pull request #3273 from benjiwheeler/join-flow-in-editor
Able to use scratch3 join flow in editor
2019-08-26 14:32:07 -04:00
Ben Wheeler
925f2de024 be safer with arrow-border-width 2019-08-26 14:30:52 -04:00
Ben Wheeler
37c2112a3e remove redundant use of redux registrationOpen 2019-08-26 14:19:08 -04:00
Benjamin Wheeler
f8e7176f97
Merge pull request #3292 from benjiwheeler/add-africa-website
added website for kenya conference
2019-08-26 14:18:37 -04:00
Ben Wheeler
8139901973 added website for kenya conference 2019-08-26 14:14:53 -04:00
Benjamin Wheeler
1ec4a10e49
Merge pull request #3287 from benjiwheeler/update-africa-conf
Update Kenya conference
2019-08-26 14:11:04 -04:00