6085 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ben Wheeler	9539afd0e2	add birthdate header image	2019-07-18 21:18:33 -04:00
Ben Wheeler	d6c34f83ae	add birthdate month and year header labels, initial vals	2019-07-18 21:18:33 -04:00
Ben Wheeler	71baf3e802	birthdate month and year layout	2019-07-18 21:18:33 -04:00
Ben Wheeler	39fd6b07ea	added draft of birth date step; localize birth month string	2019-07-18 21:18:33 -04:00
BryceLTaylor	53fc6e57fd	Make npm run test run all unit tests	2019-07-18 16:18:27 -04:00
BryceLTaylor	755b26a578	Move testing README into the main README	2019-07-18 16:17:39 -04:00
picklesrus	13f3285b8e	Merge pull request #3151 from LLK/release/2019-07-18 ... [Develop] Release 2019-07-18	2019-07-18 16:12:42 -04:00
picklesrus	23fe3677ae	Merge pull request #3150 from LLK/release/2019-07-18 ... [Master] Release 2019-07-18	2019-07-18 15:47:25 -04:00
picklesrus	2e7f2c3d6a	Merge pull request #3155 from picklesrus/update-renderer-version ... Update gui with revert of scratch-svg-renderer version and scratch-paint version.	2019-07-18 14:55:47 -04:00
picklesrus	d52b65f6f8	Update gui version with revert of PR from scratch-svg-renderer	2019-07-18 14:43:20 -04:00
Benjamin Wheeler	5a175bc1af	Merge pull request #3133 from benjiwheeler/retry-join-flow-format-validation ... Format validation; redo of PR 3116	2019-07-18 12:45:53 -04:00
greenkeeper[bot]	71dfb050d5	chore(package): update lockfile package-lock.json	2019-07-18 13:00:01 +00:00
greenkeeper[bot]	9dbd789b86	chore(package): update url-loader to version 2.1.0	2019-07-18 12:59:56 +00:00
picklesrus	cae62e8d72	Merge pull request #3149 from LLK/develop ... Merge develop into release branch 2019-07-18	2019-07-17 18:45:15 -04:00
picklesrus	afc75f301c	Merge pull request #3148 from picklesrus/update-gui-version-7-18 ... Bump gui version for release. 2019-07-18.	2019-07-17 18:34:42 -04:00
picklesrus	7ca9c4bd69	Bump gui version for release. 2019-07-18.	2019-07-17 18:22:38 -04:00
picklesrus	15f52f926c	Merge pull request #3147 from picklesrus/update-package-lock ... update package lock to fix the build	2019-07-17 17:43:04 -04:00
picklesrus	4084a16826	update package lock to fix the build	2019-07-17 17:31:06 -04:00
BryceLTaylor	d8738c9a67	Update package-lock	2019-07-17 16:21:53 -04:00
BryceLTaylor	7f6a316224	remove enzyme since we don't use it yet	2019-07-17 16:20:11 -04:00
BryceLTaylor	126f3a34b2	Updeate integration test README	2019-07-17 15:59:34 -04:00
BryceLTaylor	b63d64d03e	Run Jest tests alongside Tap tests	2019-07-17 15:33:01 -04:00
BryceLTaylor	c56f488b33	Add Jest, Enzyme, and sample tests	2019-07-17 15:27:13 -04:00
BryceLTaylor	4a963dbfaa	remove tap tests from non-legacy folders	2019-07-17 15:12:55 -04:00
BryceLTaylor	dd6b7ba4e2	Move tap tests into legacy folders	2019-07-17 14:56:48 -04:00
Ben Wheeler	c8800d8663	After rebasing on develop, reintroduce changes	2019-07-17 12:58:50 -04:00
Ben Wheeler	faa37ae270	rename row-relative to row-with-tooltip	2019-07-17 12:52:42 -04:00
Ben Wheeler	911ecc8516	Format validation; redo of PR 3116	2019-07-17 12:52:42 -04:00
Benjamin Wheeler	62f30c7a8b	Merge pull request #3138 from benjiwheeler/join-flow-improve-css ... Improve formatting of join flow title, description, next step button	2019-07-17 00:02:05 -04:00
Ben Wheeler	681e7d9a74	move next step font size to next-step-button.scss	2019-07-17 00:00:31 -04:00
Benjamin Wheeler	9df814846f	Merge pull request #3096 from LLK/greenkeeper/react-modal-3.8.2 ... Update react-modal to the latest version 🚀	2019-07-16 23:52:22 -04:00
Benjamin Wheeler	88b3ea6698	Merge pull request #3140 from benjiwheeler/margin-collapse-use-padding-instead ... use padding to avoid margin collapse; drop approach that used `overflow: auto`	2019-07-16 15:29:17 -04:00
Ben Wheeler	a85ad87028	Improve formatting of join flow title, description, next step button	2019-07-15 17:29:09 -04:00
Ray Schamp	5e868575c6	Merge pull request #3137 from LLK/hotfix/remove-makefile ... Move Makefile into package.json, remove Docker config	2019-07-15 16:54:08 -04:00
Ben Wheeler	27cb6199b5	use padding rather than margin to avoid margin collapse; drop overflow clear approach	2019-07-15 16:07:39 -04:00
Benjamin Wheeler	96a1b89ccb	Merge pull request #3117 from benjiwheeler/join-flow-use-css ... Format join flow using ModalTitle, ModalInnerContent, NextStepButton components	2019-07-15 12:50:25 -04:00
Ray Schamp	cccb908221	Remove remaining references to Docker	2019-07-15 10:55:56 -04:00
Andrew Sliwinski	4483b6d5a2	Merge pull request #2918 from LLK/greenkeeper/lodash.range-3.2.0 ... Update lodash.range to the latest version 🚀	2019-07-15 10:23:06 -04:00
Ray Schamp	065b808815	Fix lint script	2019-07-15 10:10:52 -04:00
Ray Schamp	7e284ba6db	Fix deploy scripts	2019-07-15 10:03:43 -04:00
Ben Wheeler	2773495878	Format join flow using ModalTitle, ModalInnerContent, NextStepButton components	2019-07-15 09:58:41 -04:00
Benjamin Wheeler	92430584dc	Merge pull request #3121 from benjiwheeler/formik-select ... introduce formik select component	2019-07-15 09:52:17 -04:00