Commit graph

4525 commits

Author SHA1 Message Date
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
greenkeeper[bot]
a694beb871 chore(package): update lockfile package-lock.json 2019-07-23 20:47:05 +00:00
greenkeeper[bot]
9485ab9405 chore(package): update scratch-gui to version 0.1.0-prerelease.20190723203336
Closes #3165
2019-07-23 20:47:01 +00:00
Benjamin Wheeler
0ac7cc7ab0
Merge pull request #3136 from benjiwheeler/fix-add-to-studio-height
fix add-to-studio modal height, gradient interference
2019-07-23 12:14:27 -04:00
Ben Wheeler
1e9b9a537d correct select padding 2019-07-23 12:09:10 -04:00
Ben Wheeler
9b3c555078 provide key to comments 2019-07-22 21:54:45 -04:00
Benjamin Wheeler
421bac2756
Merge pull request #3156 from benjiwheeler/eslint-upgrade-many
updated several eslint-related packages, fixed lint errors
2019-07-22 21:46:53 -04:00
Ben Wheeler
3b2bb243d7 update package.lock 2019-07-22 21:45:53 -04:00
Ben Wheeler
10cb8512b6 set react version for eslint, to prevent lifecycle method errors 2019-07-22 21:24:37 -04:00
Ben Wheeler
77780bd94c whitespace fixes for linting 2019-07-22 21:24:37 -04:00
Ben Wheeler
1757f28a5e add missing props declarations 2019-07-22 21:24:37 -04:00
Ben Wheeler
87c1bc5858 add noopener noreferrer to fix lint errors 2019-07-22 21:24:37 -04:00
Ben Wheeler
f180d4f395 update eslint-related package versions 2019-07-22 21:24:37 -04:00
Benjamin Wheeler
32368a99be
Merge pull request #3162 from benjiwheeler/jest-validation-tests
rewrote validate legacy unit test from using tap, to using jest
2019-07-22 17:36:35 -04:00
Karishma Chadha
f97400e324
Merge pull request #3164 from LLK/hotfix/custom-proc-params
[Develop] - Hotfix/custom proc params
2019-07-22 16:02:49 -04:00
Karishma Chadha
cd2ec2a57f
Merge pull request #3163 from LLK/hotfix/custom-proc-params
[MASTER] - Hotfix regression with custom procedure parameters
2019-07-22 15:17:22 -04:00
Ben Wheeler
748e07d172 deleted template example of unit test 2019-07-22 15:14:28 -04:00
Ben Wheeler
a6dc573f30 rewrote validate legacy unit test from using tap, to using jest 2019-07-22 14:54:25 -04:00
Karishma Chadha
80ac3a774f Pull in gui hotfix reverting vm PR that introduces regression in custom procedure parameters. 2019-07-22 14:38:08 -04:00
Benjamin Wheeler
4ae69e1b49
Merge pull request #3144 from benjiwheeler/join-flow-add-birth-date-step
Join flow add birth date step
2019-07-22 14:18:53 -04:00
Bryce Taylor
5e2c3dd864
Merge pull request #3145 from BryceLTaylor/Add-Jest
Add jest
2019-07-22 10:05:51 -04:00
BryceLTaylor
d3b003c2bb Merge branch 'Add-Jest' into develop
# Conflicts:
#	package-lock.json
2019-07-22 09:54:15 -04:00
Ben Wheeler
740f1fb466 split join-flow-steps into separate files; simplify birth year options 2019-07-18 21:18:34 -04:00
Ben Wheeler
e33d7dd0ee Simplify birth month option generation 2019-07-18 21:18:34 -04:00
Ben Wheeler
55e7ada760 validate birthdate 2019-07-18 21:18:34 -04:00