1912 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	7e33af85cb	add video-* plugins #636	2019-07-12 11:38:21 -04:00
Josh de Leeuw	6be86017c8	Merge pull request #622 from designatednerd/master ... Add video trial requiring a keyboard response	2019-07-11 10:40:38 -04:00
Josh de Leeuw	c126b58f0a	implement scale_width #633	2019-07-11 10:29:47 -04:00
Josh de Leeuw	b4ca37be1c	implement experiment_width #572	2019-07-11 10:21:50 -04:00
Josh de Leeuw	d120b3b470	implement alternating groups sample method (#528)	2019-07-08 21:53:40 -04:00
Josh de Leeuw	5172e6dddc	add shuffleAlternateGroups #528	2019-07-08 11:35:25 -04:00
Josh de Leeuw	5cd95bcb7e	fixes default iti bug (#632)	2019-07-08 10:26:28 -04:00
Josh de Leeuw	0a2f2cfaa6	fix all the broken test from changing image plugins style	2019-07-05 12:25:47 -04:00
Josh de Leeuw	02113068f9	delete temporary test	2019-07-05 11:50:49 -04:00
Josh de Leeuw	40f433651b	bump jest v22 -> v24	2019-07-05 11:49:30 -04:00
Josh de Leeuw	b4bfb1852d	fixes timeline vars in conditional functions #574	2019-07-05 11:43:40 -04:00
Josh de Leeuw	9a682bb260	fix semicolon bug	2019-07-05 11:20:59 -04:00
Josh de Leeuw	208ecf0365	some minor tweaks to survey-html-form plugin	2019-07-04 15:24:37 -04:00
Josh de Leeuw	7d01510a24	Merge pull request #602 from jansim/master ... Added very simple alternative jspsych-survey-html-form plugin	2019-07-04 15:19:13 -04:00
Josh de Leeuw	0fe7fe2cf4	fix div bug	2019-07-04 15:14:58 -04:00
Josh de Leeuw	9bed32fb0f	implements settable width for sliders (#631)	2019-07-04 15:10:52 -04:00
Josh de Leeuw	338b3d5351	add docs for #573	2019-07-03 12:27:30 -04:00
Josh de Leeuw	dda27c6bc8	implement require_movement in slider plugins #573	2019-07-03 12:26:20 -04:00
Josh de Leeuw	381d2778b1	Merge branch 'pr/575'	2019-07-02 22:15:50 -04:00
Josh de Leeuw	4ea7cef4cd	prettier margin on slider	2019-07-02 22:00:00 -04:00
Josh de Leeuw	9da8c452f2	implement image size settings for image plugins #560	2019-07-02 21:55:15 -04:00
Josh de Leeuw	45a307f4d5	mturk doc update - thanks @kachergis!	2019-07-02 17:31:37 -04:00
Josh de Leeuw	bde84139bf	implements randomize order for all survey plugins, including tests #305	2019-07-02 17:03:24 -04:00
Josh de Leeuw	c480d17743	update docs for #629	2019-07-02 16:41:34 -04:00
Josh de Leeuw	119b4701b7	fix required parameter #629	2019-07-02 16:40:13 -04:00
Josh de Leeuw	eafa1d3269	fixes #628	2019-07-02 11:47:59 -04:00
Josh de Leeuw	d8ce2dbd65	add test case for #628	2019-07-02 11:19:58 -04:00
Josh de Leeuw	637d87ecf6	fix placeholder implementation #627	2019-07-02 11:09:57 -04:00
Josh de Leeuw	fd52dcb481	change examples to use placeholder #627	2019-07-02 11:08:46 -04:00
Josh de Leeuw	cd82ddfc1d	implements #627	2019-07-02 11:06:41 -04:00
Josh de Leeuw	d094d1d6be	add random order for -text #305	2019-07-01 13:46:32 -04:00
Josh de Leeuw	e80ea04b04	working on randomization of survey orders #305	2019-07-01 13:33:07 -04:00
Ellen Shapiro	c37b9f77cf	Add video trial requiring a keyboard response	2019-06-20 21:52:51 +02:00
Josh de Leeuw	29645d540c	add docs for randomize_question_order (#305)	2019-06-20 09:37:09 -04:00
Josh de Leeuw	25357c33a0	adding random question order option to multi-choice #305	2019-06-19 22:14:32 -04:00
Josh de Leeuw	fd3c15c8ce	implementing random order for survey-likert (#305)	2019-06-19 17:03:27 -04:00
Josh de Leeuw	355eae8be2	add error message for randomization module (#389)	2019-06-19 10:14:29 -04:00
Josh de Leeuw	7e73a2fcbd	example of manual preloading	2019-06-18 16:57:11 -04:00
Josh de Leeuw	a056d40b2f	fixes #580	2019-06-18 12:16:28 -04:00
Josh de Leeuw	b850debcae	fixes #391	2019-06-18 12:02:17 -04:00
Josh de Leeuw	6356341944	remove old comment todo	2019-06-18 11:38:22 -04:00
Josh de Leeuw	89e9023460	update docs re: preloading audio (#524)	2019-06-04 13:52:50 -04:00
Josh de Leeuw	86e381c96b	Merge branch 'master' of https://github.com/jspsych/jsPsych	2019-06-04 11:02:27 -04:00
Josh de Leeuw	3137eaaf13	add documentation of timelineVariable(..., true) (#607)	2019-06-04 11:02:19 -04:00
Josh de Leeuw	8eb344fbf1	Merge pull request #609 from retowyss/patch-1 ... Enable language option for progress bar	2019-06-03 16:47:16 -04:00
Josh de Leeuw	627b4b2d50	Merge pull request #555 from sprengholz/master ... Cloze Test	2019-05-31 16:46:53 -04:00
Josh de Leeuw	05461d7949	change .variance and .sd to samples (#601)	2019-05-30 17:04:09 -04:00
Josh de Leeuw	6661e2b713	whitespace	2019-05-30 17:00:38 -04:00
Josh de Leeuw	8c998ef249	add test for nested timelines and endCurrentTimeline (#600)	2019-05-30 16:50:02 -04:00
Josh de Leeuw	4a5a310e79	fixes #597	2019-05-24 17:26:42 -04:00