Ben Wheeler
b6fcffd6f3
correct misspelled join flow intl id
2019-10-31 23:21:21 -04:00
Karishma Chadha
0fe4eaed03
Merge pull request #3492 from LLK/release/2019-10-30
...
[Develop] Release 2019-10-30
2019-10-31 13:29:45 -04:00
Benjamin Wheeler
1f4aabd9d0
Merge pull request #3495 from LLK/revert-3468-country-data-name-fix
...
Revert "fixed country options to use full country name string as option value"
2019-10-31 12:07:37 -04:00
Benjamin Wheeler
20d9ab64ac
Revert "fixed country options to use full country name string as option value"
2019-10-31 10:56:46 -04:00
Karishma Chadha
c2a2c0a0ac
Merge pull request #3490 from LLK/develop
...
Update release branch with latest changes from develop.
2019-10-30 16:54:30 -04:00
Karishma Chadha
b72450241f
Merge pull request #3489 from LLK/hotfixes-from-production
...
Merge changes from master (but not actually master) into develop to clean up previous release
2019-10-30 16:38:40 -04:00
Karishma Chadha
b5de9dcf78
Merge branch 'develop' into hotfixes-from-production
2019-10-30 16:36:57 -04:00
Ray Schamp
3bd92cf092
Merge pull request #3488 from kosiecki17/kosiecki17-HoC-Redirects
...
HoC Redirect to Talking Tales and Code a Cartoon
2019-10-30 15:28:34 -04:00
kosiecki17
3cd5e9679b
HoC Redirect to Talking Tales and Code a Cartoon
2019-10-30 15:23:20 -04:00
chrisgarrity
0be9b7636e
Merge pull request #3487 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191030020251
...
Greenkeeper/scratch gui 0.1.0 prerelease.20191030020251
2019-10-30 14:36:10 -04:00
chrisgarrity
1126e4d692
Merge pull request #3486 from chrisgarrity/add-missing-tx
...
Add translation resource mapping
2019-10-30 08:02:02 -04:00
greenkeeper[bot]
543c1a66f1
chore(package): update lockfile package-lock.json
2019-10-30 04:00:04 +00:00
greenkeeper[bot]
124fa9d062
chore(package): update scratch-gui to version 0.1.0-prerelease.20191030020251
...
Closes #3479
2019-10-30 03:59:58 +00:00
Chris Garrity
45d672ab30
Add translation resource mapping
...
When the name of the view in `routes.json` does not match the name of the resource in transifex there needs to be a mapping added to the script that generates translations. _Note: the resource name in transifex is usually based on the name of the source file in the `views` directory. Usually the name of the view in the routes file matches._
Since `routes.json` is a JSON file that does not support comments there’s no way to add a warning to the file when someone is adding a route.
The sympton was the message that there were no translations for ‘vernier’ or ‘embed’ when running translate. The `vernier` route is actually the `gdxfor` view, and `embed` is just another version of `preview`
2019-10-29 17:48:01 -04:00
Eric Rosenbaum
5b70f28ca5
Merge pull request #3477 from LLK/hotfix/hoc-2-tutorials-2019-v3
...
[Master] Update GUI to add 2 HoC tutorials
2019-10-24 13:10:08 -04:00
Eric Rosenbaum
c2957b5a56
Update GUI to add 2 HoC tutorials
2019-10-23 16:32:41 -04:00
Ray Schamp
9221b6f6b5
Merge pull request #3472 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191022134757
...
Update scratch-gui to the latest version 🚀
2019-10-22 11:50:38 -04:00
greenkeeper[bot]
562d53e3c6
chore(package): update lockfile package-lock.json
2019-10-22 14:11:06 +00:00
greenkeeper[bot]
de50e43794
chore(package): update scratch-gui to version 0.1.0-prerelease.20191022134757
2019-10-22 14:11:01 +00:00
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
