803 Commits

Author	SHA1	Message	Date
Becky Gilbert	42e4908dd1	Merge branch 'master' into freesort	2021-02-19 10:39:36 -08:00
Becky Gilbert	0800497060	Merge branch 'master' into feature-key-code-update	2021-02-19 10:24:21 -08:00
Josh de Leeuw	5cdca4f8ad	update audio plugins to use new getAudioBuffer strategy	2021-02-18 22:32:50 -05:00
Becky Gilbert	0812c52bcb	minor refactoring and renaming for clarity	2021-02-18 17:06:56 -08:00
Becky Gilbert	bb7b3f0570	Merge pull request #1228 from kurokida/freesort ... for using the free-sort plugin with a touch device.	2021-02-18 16:40:28 -08:00
Becky Gilbert	2c28278ad5	change direct key comparisons to use jsPsych.pluginAPI.compareKeys to allow for case sensitive or insensitive comparison #396	2021-02-18 12:52:10 -08:00
Becky Gilbert	5c354e3d7c	change responses to response in vsl-animate-occlusion plugin #638	2021-02-17 16:12:13 -08:00
Becky Gilbert	3f9a4e96d7	change key_press to response in visual-search-circle plugin #638	2021-02-17 16:09:15 -08:00
Becky Gilbert	5b7884e585	change key_press to response in video-keyboard-response plugin #638	2021-02-17 16:05:39 -08:00
Becky Gilbert	0dd813af6e	change button_pressed to response in video-button-response plugin #638	2021-02-17 16:02:34 -08:00
Becky Gilbert	8a9e1a655a	change responses to response in survey-text plugin #638	2021-02-17 15:58:54 -08:00
Becky Gilbert	db2a2dc6bc	change responses to response in survey-multi-select plugin #638	2021-02-17 15:51:14 -08:00
Becky Gilbert	19a6485068	change responses to response in survey-multi-choice plugin #638	2021-02-17 15:46:04 -08:00
Becky Gilbert	967f546bfd	change responses to response in survey-likert plugin #638	2021-02-17 15:41:50 -08:00
Becky Gilbert	56bf9c68e7	change responses to response in survey-html-form plugin #638	2021-02-17 15:38:22 -08:00
Becky Gilbert	5ae6f61dfc	change response_row and response_column to be a response array as [row,col] in serial-reaction-time-mouse plugin, add missing data params to docs #638	2021-02-17 15:29:58 -08:00
Becky Gilbert	d2f64ada1c	change key_press to response in serial-reaction-time plugin #638	2021-02-17 15:12:01 -08:00
Becky Gilbert	a4bdfc8e5f	change key_press to response and key_press_stim1 to response_stim1 in same-different-image plugin #638	2021-02-17 15:03:29 -08:00
Becky Gilbert	6254aa1aaf	change key_press to response and key_press_stim1 to response_stim1 in same-different-html plugin #638	2021-02-17 15:00:49 -08:00
Becky Gilbert	477182d482	remove quotes from data object keys	2021-02-17 14:45:50 -08:00
Becky Gilbert	17d66404d5	remove quotes from data object keys	2021-02-17 14:44:24 -08:00
Becky Gilbert	a8a1ffac2f	change key_press to response in rdk plugin #638	2021-02-17 14:42:55 -08:00
Becky Gilbert	efdd0eace3	change left/right data properties to a response object with left/right keys in maxdiff plugin #638	2021-02-17 14:21:09 -08:00
Becky Gilbert	da5407a3f8	remove quotes from data object keys	2021-02-17 14:10:49 -08:00
Becky Gilbert	7c551ec96a	change key_press to response in image-keyboard-response plugin #638	2021-02-17 14:09:51 -08:00
Becky Gilbert	9c65ff19b7	change button_pressed to response in image-button-response plugin #638	2021-02-17 14:06:37 -08:00
Becky Gilbert	79edaad804	change key_press to response in iat-image plugin #638	2021-02-17 14:03:01 -08:00
Becky Gilbert	c81d28ae7d	change key_press to response in iat-html plugin #638	2021-02-17 14:00:40 -08:00
Becky Gilbert	f0c91fbd32	remove quotes from data object keys	2021-02-17 13:56:43 -08:00
Becky Gilbert	3580b29767	change key_press to response in html-keyboard-response plugin #638	2021-02-17 13:55:55 -08:00
Becky Gilbert	fe5f14dae4	change button_pressed to response in html-button-response plugin #638	2021-02-17 13:52:21 -08:00
Becky Gilbert	b85ced4f0a	change answers to response in cloze plugin #638	2021-02-17 13:45:33 -08:00
Becky Gilbert	c812e8dbc3	change key_press to response in categorize-image plugin #638	2021-02-17 13:40:55 -08:00
Becky Gilbert	7475bf85a5	change key_press to response in categorize-html plugin #638	2021-02-17 13:38:29 -08:00
Becky Gilbert	f348944054	change key_press to response in categorize-animation plugin #638	2021-02-17 13:34:53 -08:00
Becky Gilbert	64e71b5d28	remove quotes from data object keys	2021-02-17 13:27:23 -08:00
Becky Gilbert	c9cbe39448	change key_press to response in canvas-keyboard-response plugin #638	2021-02-17 13:26:54 -08:00
Becky Gilbert	118aeffd3c	change button_pressed to response in canvas-button-response plugin #638	2021-02-17 13:23:14 -08:00
Becky Gilbert	e0f6f5d0dc	remove quotes from object keys in trial data	2021-02-17 10:49:13 -08:00
Becky Gilbert	abf3e19a29	change key_press to response in audio-keyboard-response plugin #638	2021-02-17 10:34:24 -08:00
Becky Gilbert	b82eb9a503	change button_pressed to response in audio-button-response plugin #638	2021-02-16 19:49:28 -08:00
Becky Gilbert	64a66b812d	change responses to response in animation plugin #638	2021-02-16 19:46:19 -08:00
Becky Gilbert	538b9cb3b6	remove comment re JSON encoding in data	2021-02-16 18:59:03 -08:00
Becky Gilbert	2312550127	Merge branch 'master' into feature-objects-arrays-in-data	2021-02-16 14:37:07 -08:00
Josh de Leeuw	e5a8a77ef3	Merge branch 'master' into feature-plugin-extensions	2021-02-15 21:44:45 -05:00
Josh de Leeuw	8efc628891	Merge pull request #1354 from klanderson/patch-1 ... Check fullscreen is active before exiting fullscreen	2021-02-13 21:39:45 -05:00
Becky Gilbert	94d72ddf82	merge changes from master and fix merge conflicts #670	2021-02-12 15:58:48 -08:00
Becky Gilbert	c8298e226f	merge master into preload plugin branch and fix merge conflict	2021-02-09 10:57:46 -08:00
Josh de Leeuw	bb0b84d86a	add samples_per_sec to validation plugin	2021-02-08 23:00:19 -05:00
Josh de Leeuw	b10c69eb21	Merge branch 'master' into feature-key-code-update	2021-02-08 22:00:09 -05:00