325 Commits

Author	SHA1	Message	Date
Josh de Leeuw	a62a2e771e	add example file for testing #288 , #370	2017-05-25 13:59:43 -04:00
Werner Sævland	588786abf6	Minor error corrected	2017-05-19 14:42:10 +02:00
Josh de Leeuw	fb8b7d2200	show text input instead of textarea when rows=1	2017-05-18 11:28:06 -04:00
Josh de Leeuw	d5fd16be7c	working example of fullscreen	2017-05-01 16:35:41 -04:00
KristinDiep	4b8d332762	Merge remote-tracking branch 'upstream/master' ... Need to update fork with upstream.	2017-04-17 17:11:10 -04:00
KristinDiep	3881da6df8	created tests	2017-04-12 22:58:36 -04:00
KristinDiep	0b2e14781f	moved age folder to imgand removed container div	2017-04-11 08:59:36 -04:00
KristinDiep	0d3b935bb1	Now works and allows users to press any key to continue	2017-04-06 02:03:20 -04:00
KristinDiep	b7d43b3280	added 'other key' option	2017-04-01 16:14:57 -04:00
KristinDiep	64f8fc7f9f	transferred iat plugin to forked repo of jsPsych	2017-03-30 23:45:23 -04:00
Josh de Leeuw	84de9aed7e	add resize plugin #352	2017-03-20 13:58:41 -04:00
Josh de Leeuw	47f4e61ac4	allows required for all questions on page #348	2017-03-14 13:09:31 -04:00
Josh de Leeuw	05fb12982e	check multiple questions	2017-03-04 09:45:38 -05:00
Josh de Leeuw	7a65ab9aaf	fix paths, add css	2017-03-04 09:33:55 -05:00
Xiaolu bai	7ee52ffa34	Adds new line at the end	2017-02-13 14:48:23 -08:00
Xiaolu bai	896fba4b4f	Adds new line at the end	2017-02-13 14:48:02 -08:00
Xiaolu Bai	58ae31511c	Merge branch 'master' of github.com:jodeleeuw/jsPsych into multi_picture_multi_select_plug_in_docs_example	2017-02-13 14:21:36 -08:00
Xiaolu Bai	3b9160f8f7	survey-multi-select survey-multi-picture plug-ins ... -examples included -docs included	2017-02-13 14:12:47 -08:00
Josh de Leeuw	065fd8d4b0	change jsPsych.data.getData() to jsPsych.data.get()	2017-02-02 16:47:35 -05:00
Josh de Leeuw	a4ad32af66	docs updates; better RT tutorial	2017-01-12 14:44:03 -05:00
Josh de Leeuw	6301cb139d	fix #315 docs	2017-01-06 12:18:43 -05:00
Josh de Leeuw	f3668df9d8	move from tests&examples --> examples	2017-01-04 16:07:56 -05:00
Josh de Leeuw	0240b9f6c9	Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery ... # Conflicts: # plugins/jspsych-html.js	2017-01-04 15:38:17 -05:00
Josh de Leeuw	698bba5fee	modify examples	2016-12-15 11:10:13 -05:00
Josh de Leeuw	df49035118	first jest test runs!	2016-12-09 21:25:56 -05:00