Commit graph

6279 commits

Author SHA1 Message Date
Karishma Chadha
2d7a560ff0
Merge pull request #3471 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191021202911
Greenkeeper/scratch gui 0.1.0 prerelease.20191021202911
2019-10-22 09:59:56 -04:00
greenkeeper[bot]
0786f9f402
chore(package): update lockfile package-lock.json 2019-10-22 05:20:40 +00:00
greenkeeper[bot]
1bcd4f9f34
chore(package): update scratch-gui to version 0.1.0-prerelease.20191021202911
Closes #3451
2019-10-22 05:20:34 +00:00
Ray Schamp
6631bbafb2
Merge pull request #3469 from rschamp/fix-dev-server
Fix dev server by splitting up redirect regex
2019-10-21 16:28:33 -04:00
Benjamin Wheeler
a85c1c3f78
Merge pull request #3468 from benjiwheeler/country-data-name-fix
fixed country options to use full country name string as option value
2019-10-21 16:12:25 -04:00
rschamp
21a8f4d5be Fix dev server by splitting up redirect regex
This pattern works for building/deploying, but not for running locally. Split it up to deal with what express expects a path to look like.
2019-10-21 13:51:50 -04:00
Ben Wheeler
f8986c437c added test for country option value being string 2019-10-21 13:47:57 -04:00
Ben Wheeler
f26a83423c fixed country options 2019-10-21 12:33:34 -04:00
Benjamin Wheeler
d9bd2baf15
Merge pull request #3424 from benjiwheeler/join-flow-splash-join-button
splash page join button works with new join flow
2019-10-21 12:18:01 -04:00
Benjamin Wheeler
fdbbc5e632
Merge pull request #3423 from benjiwheeler/join-flow-select-text
make text selectable, so users can copy errors
2019-10-21 11:17:02 -04:00
Benjamin Wheeler
e0658585cc
Merge pull request #3462 from benjiwheeler/join-flow-error-state-limit-one-retry
Join flow error state limit one retry
2019-10-21 10:44:18 -04:00
Benjamin Wheeler
0fb41cddba
Merge pull request #3285 from LLK/greenkeeper/react-modal-3.10.1
Update react-modal to the latest version 🚀
2019-10-18 17:46:16 -04:00
Ben Wheeler
564c5fb2d7 added package-lock.json 2019-10-18 17:45:34 -04:00
greenkeeper[bot]
490010c564 chore(package): update lockfile package-lock.json 2019-10-18 17:44:58 -04:00
greenkeeper[bot]
51c6fc4e61 chore(package): update react-modal to version 3.10.1 2019-10-18 17:44:06 -04:00
Ben Wheeler
c499624345 make text selectable, so users can copy errors 2019-10-18 13:54:59 -04:00
Ben Wheeler
0ac6aee937 mock window.location.assign 2019-10-18 11:54:34 -04:00
Ben Wheeler
cd5f3b5437 change method of redirecting user to join flow page 2019-10-18 11:53:31 -04:00
Ben Wheeler
6d3a379d57 revise registration error tests 2019-10-18 11:40:31 -04:00
Ben Wheeler
80ab13d32f added tests for whether registration modal shows up 2019-10-17 23:38:55 -04:00
Ben Wheeler
c1b3efe572 corrected mocked function name 2019-10-17 23:38:55 -04:00
Ben Wheeler
8c30051bdc mocked event in simulated click 2019-10-17 23:38:54 -04:00
Ben Wheeler
a6cca54647 revise navigation.jsx test 2019-10-17 23:38:54 -04:00
Ben Wheeler
4474b4bc8c add navigation reducer test 2019-10-17 23:38:54 -04:00
Ben Wheeler
baa4e0e2c3 refactor intro.jsx and navigation.jsx to use new navigation reducer single registration open request action 2019-10-17 23:38:54 -04:00
Ben Wheeler
d4676ec990 redo navigation reducer to handle registration request with single action 2019-10-17 23:38:54 -04:00
Ben Wheeler
ed99e410f5 splash page join button works with new join flow 2019-10-17 23:38:54 -04:00
Ben Wheeler
0dfd1cf9fc added comment about setting initial state 2019-10-17 23:34:31 -04:00
Ben Wheeler
16a1fccc27 several tests of join-flow changes 2019-10-17 23:32:26 -04:00
Ben Wheeler
eeb9f03887 use initialState to set, reset state of join-flow component 2019-10-17 23:32:06 -04:00
Ben Wheeler
3469f17bfe error step can show try again, or start over; limits to one retry 2019-10-17 22:25:00 -04:00
Ben Wheeler
1c3eca3e06 add start over string, make capitalization consistent in make a project 2019-10-17 22:23:14 -04:00
Ben Wheeler
8b78fcb8db always load captcha on email step 2019-10-17 22:22:44 -04:00
Ray Schamp
699bd84190
Merge pull request #3459 from LLK/hotfix/hoc-redirects
[Develop] Add redirects for Make it Fly and Imagine If tutorials
2019-10-17 16:58:08 -04:00
Ray Schamp
a4f28b451b
Merge pull request #3458 from LLK/hotfix/hoc-redirects
[Master] Add redirects for Make it Fly and Imagine If tutorials
2019-10-17 16:57:15 -04:00
Paul Kaplan
d125528c46
Merge pull request #3460 from LLK/hotfix/video-motion
[Master] Hotfix video motion fixes
2019-10-17 14:02:26 -04:00
Paul Kaplan
73630f3438 Update scratch-gui for hotfixing video 2019-10-17 11:50:05 -04:00
rschamp
82e6e2c412 Add redirects for Make it Fly and Imagine If tutorials
Resolves #3390
2019-10-17 10:49:27 -04:00
Benjamin Wheeler
3e6e87c3a4
Merge pull request #3417 from benjiwheeler/join-flow-cache-remote
Join flow cache remote
2019-10-17 08:23:47 -04:00
Benjamin Wheeler
f271a4f0c3
Merge pull request #3444 from benjiwheeler/join-flow-sentry-wrap
Add Sentry to Join Flow; set Sentry tags on various ErrorBoundaries
2019-10-16 16:34:43 -04:00
Benjamin Wheeler
6b6b415069
Merge pull request #3434 from benjiwheeler/join-flow-responsive-more
Join flow responsive changes for input, button and select widths
2019-10-16 16:19:50 -04:00
Benjamin Wheeler
e23bcdbc4c
Merge pull request #3450 from LLK/greenkeeper/google-libphonenumber-3.2.5
Greenkeeper/google libphonenumber 3.2.5
2019-10-16 11:17:49 -04:00
greenkeeper[bot]
298a11e2d2 chore(package): update lockfile package-lock.json 2019-10-15 14:16:10 -04:00
greenkeeper[bot]
e259e7c8ca chore(package): update google-libphonenumber to version 3.2.5
Closes #3314
2019-10-11 17:45:04 -04:00
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Benjamin Wheeler
757ac80677
Merge pull request #3427 from benjiwheeler/join-flow-autocomplete-3
turn off automplete and autocorrect for join-flow inputs
2019-10-11 16:28:25 -04:00
Benjamin Wheeler
14c6211614
Merge pull request #3435 from benjiwheeler/join-flow-image-bg-color
Join flow image preview using background color
2019-10-11 16:27:48 -04:00
DD Liu
3cc4af7105
Merge pull request #3440 from LLK/release/2019-10-10
[DEVELOP] Release 2019-10-10
2019-10-10 16:49:36 -04:00
DD Liu
5822da1b2f
Merge branch 'develop' into release/2019-10-10 2019-10-10 16:28:47 -04:00
DD Liu
c8475d5a3c
Merge pull request #3441 from LLK/release/2019-10-10
[MASTER] Release 2019-10-10
2019-10-10 16:23:23 -04:00