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
|
95099d1a46
|
add preload trial
|
2021-02-17 11:10:34 -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
|
47d2f40cd6
|
Merge pull request #1523 from jspsych/feature-objects-arrays-in-data
Merge branch feature-objects-arrays-in-data - fixes #670
|
2021-02-16 19:07:34 -08:00 |
|
Becky Gilbert
|
762ee56042
|
update docs to reflect change from JSON strings to JS object/arrays in data #670
|
2021-02-16 19:00:32 -08:00 |
|
Becky Gilbert
|
538b9cb3b6
|
remove comment re JSON encoding in data
|
2021-02-16 18:59:03 -08:00 |
|
Becky Gilbert
|
2d845a45af
|
add test for instructions view_history data JSON conversion - #670
|
2021-02-16 16:51:15 -08:00 |
|
Becky Gilbert
|
62db853317
|
add tests for change from JSON strings to objects/arrays in data
|
2021-02-16 15:25:16 -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
|
599d1f5c72
|
Merge pull request #1516 from jspsych/feature-plugin-extensions
Plugin Extensions and Eye Tracking via WebGazer
|
2021-02-16 09:37:16 -05:00 |
|
Josh de Leeuw
|
d0a9a7c6c1
|
update webgazer image example
|
2021-02-16 09:34:33 -05:00 |
|
Josh de Leeuw
|
9a2c22a8b5
|
change validation instructions in demo
|
2021-02-16 09:24:52 -05:00 |
|
Josh de Leeuw
|
01ee2d02f5
|
add tests for extensions
|
2021-02-16 09:22:26 -05:00 |
|
Josh de Leeuw
|
00a02e9022
|
remove old comment header
|
2021-02-15 21:57:06 -05:00 |
|
Josh de Leeuw
|
c70af691e4
|
add webgazer back in
|
2021-02-15 21:53:49 -05:00 |
|
Josh de Leeuw
|
0701d44594
|
fix missing extensions module
|
2021-02-15 21:53:41 -05:00 |
|
Josh de Leeuw
|
a69a355e9e
|
step version in package.json
|
2021-02-15 21:46:48 -05:00 |
|
Josh de Leeuw
|
5a1acb90d2
|
fix missing default value
|
2021-02-15 21:46:42 -05:00 |
|
Josh de Leeuw
|
e5a8a77ef3
|
Merge branch 'master' into feature-plugin-extensions
|
2021-02-15 21:44:45 -05:00 |
|
GEJ1
|
a9bbc9664a
|
I remove: all the jQuery code, the mouse_adjustment option because use the jQuery slider.
|
2021-02-15 15:47:25 -03:00 |
|
GEJ1
|
99925639e0
|
Comments with jqueryToVanilla lines of code, but without change it
|
2021-02-14 15:53:20 -03: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 |
|
Josh de Leeuw
|
af8ce43784
|
push tutorial updates
|
2021-02-13 09:12:22 -05:00 |
|
Josh de Leeuw
|
7f5870d55e
|
update RT docs
|
2021-02-13 08:56:57 -05:00 |
|
Becky Gilbert
|
6436230760
|
add raw data comparison to values test
|
2021-02-12 16:32:04 -08:00 |
|
Becky Gilbert
|
62db19826e
|
remove video tests (console error when plugin tries to pause video)
|
2021-02-12 16:30:50 -08:00 |
|
Becky Gilbert
|
5ea70030be
|
remove unnecessary JSON.parse
|
2021-02-12 16:28:57 -08:00 |
|
Becky Gilbert
|
5e58f6b952
|
add response scoring test for serial-reaction-time
|
2021-02-12 16:14:22 -08:00 |
|
Becky Gilbert
|
0e5264fa72
|
remove redundant test
|
2021-02-12 16:05:27 -08:00 |
|
Becky Gilbert
|
ca0c427e8f
|
add a few more JSON and CSV conversion tests with plugins that uses objects and arrays in the data #670
|
2021-02-12 15:59:35 -08:00 |
|
Becky Gilbert
|
94d72ddf82
|
merge changes from master and fix merge conflicts #670
|
2021-02-12 15:58:48 -08:00 |
|
Becky Gilbert
|
ad8b3097f9
|
Merge pull request #1512 from jspsych/feature-timeline-events
Merge the feature timeline events branch
|
2021-02-12 11:16:47 -08:00 |
|
Becky Gilbert
|
9442b0cbcc
|
edit docs to clarify when on_timeline_start/finish run relative to conditional/loop functions
|
2021-02-12 11:14:57 -08:00 |
|
Becky Gilbert
|
080b2955da
|
Merge branch 'master' into feature-timeline-events
|
2021-02-12 10:58:01 -08:00 |
|
Becky Gilbert
|
8c85707107
|
tweak docs and examples for on_timeline_start and on_timeline_finish
|
2021-02-12 10:53:05 -08:00 |
|
Becky Gilbert
|
f84539309a
|
add case_sensitive jsPsych.init parameter to experiment-options docs page
|
2021-02-12 10:15:58 -08:00 |
|
Becky Gilbert
|
446ebe5870
|
change last heading text in dynamic params docs
|
2021-02-12 09:49:26 -08:00 |
|
Josh de Leeuw
|
a5fc7af7e8
|
minor edits to preload docs
|
2021-02-12 11:45:45 -05:00 |
|
Josh de Leeuw
|
2fece8c7b2
|
Merge pull request #1509 from jspsych/preload-docs
Merging preload docs
|
2021-02-12 11:38:22 -05:00 |
|
Josh de Leeuw
|
dcca2a47af
|
show list of plugins
|
2021-02-12 11:38:10 -05:00 |
|
Josh de Leeuw
|
969484f0e6
|
Merge branch 'master' into preload-docs
|
2021-02-12 11:28:47 -05:00 |
|
Josh de Leeuw
|
2f7e5cce62
|
some minor docs edits
|
2021-02-12 11:00:45 -05:00 |
|