1782 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Vijay Marupudi	9c4e26173e	Removed closing </link> tag	2020-05-26 20:20:03 -05:00
Josh de Leeuw	83980085ef	Update README.md	2020-05-21 11:35:25 -04:00
Josh de Leeuw	9de501e9da	Merge pull request #667 from hrcn/patch-1 ... Variable name error?	2020-01-29 16:06:01 -05:00
Rui Han	a5650993ed	Variable name error?	2020-01-29 16:02:24 -05:00
Josh de Leeuw	87571e9cc9	fixes #659	2019-10-17 15:46:26 -04:00
Josh de Leeuw	d3094bb088	Merge pull request #658 from becky-gilbert/master ... Added Code of Conduct	2019-10-17 10:15:10 -04:00
Becky Gilbert	9a75d5f5f1	revert changes to video plugins	2019-10-17 15:00:15 +01:00
Becky Gilbert	854f91a378	added BG to contributors	2019-10-17 10:09:16 +01:00
Becky Gilbert	5a95b8dee4	modified CoC text	2019-10-17 10:08:05 +01:00
Becky Gilbert	8b18d2c43d	fixed formatting issue	2019-08-30 14:56:03 +01:00
Becky Gilbert	ce12eb8858	fixed bug in video-* plugin data	2019-08-30 14:40:25 +01:00
Becky Gilbert	7f40db7de7	added CoC	2019-08-30 14:33:06 +01:00
Josh de Leeuw	542a6b1734	Merge pull request #643 from cthorey/fix-rdk-fixation-cross-color ... [FIX] fixation_cross_color in the rdk plugin	2019-07-22 17:13:37 -04:00
clement thorey	173aa28d64	[FIX] typo	2019-07-22 20:16:41 +01:00
Josh de Leeuw	ef5b1f53ff	minor docs updates	2019-07-16 11:39:39 -04:00
Josh de Leeuw	c5bc9023e3	video tests, step package version	2019-07-16 11:00:04 -04:00
Josh de Leeuw	83f3a17024	docs tweaks	2019-07-15 16:39:27 -04:00
Josh de Leeuw	e714214fc4	check TOC; make necessary changes #617	2019-07-15 14:55:36 -04:00
Josh de Leeuw	5a56431f8d	add name option for survey plugins #608	2019-07-15 12:06:10 -04:00
Josh de Leeuw	c83e115f9b	add name option to survey-text #608	2019-07-15 10:54:26 -04:00
Josh de Leeuw	4c5c4af92c	adding documentation for #636	2019-07-15 10:25:06 -04:00
Josh de Leeuw	6cf949766a	adding documentation for video plugins #636	2019-07-12 17:02:06 -04:00
Josh de Leeuw	68d8c40ea6	remove old video plugin #636	2019-07-12 11:39:20 -04:00
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