310 Commits

Author	SHA1	Message	Date
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