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 |
|
Josh de Leeuw
|
a70d016844
|
Merge pull request #1508 from jspsych/docs-reorg
Docs reorg
|
2021-02-12 10:30:05 -05:00 |
|
Becky Gilbert
|
d9648d3dcd
|
fix broken links in docs
|
2021-02-11 18:20:25 -08:00 |
|
Becky Gilbert
|
f833a4a794
|
add dynamic-params page, rename trials page as plugins, add content from plugins/overview and creating-a-plugin and remove those pages from plugins section
|
2021-02-11 18:06:26 -08:00 |
|
Becky Gilbert
|
b112ec4d6f
|
move repetitions parameter out of timeline_vars subheading
|
2021-02-11 15:47:52 -08:00 |
|
Becky Gilbert
|
aa588c28d2
|
add preload plugin to plugin overview page
|
2021-02-11 15:13:50 -08:00 |
|
Becky Gilbert
|
5331b5c123
|
change numeric keyCodes to key strings, change valid keys to lowercase in examples/docs (missed these out in the earlier keyCode->key change)
|
2021-02-11 15:06:03 -08:00 |
|
Becky Gilbert
|
470c0d4c5f
|
remove auto_preload: false in jsPsych.init from tests because preloading is moved to plugin
|
2021-02-11 14:25:31 -08:00 |
|
Becky Gilbert
|
9729cd99ef
|
video tests just check that register preload is called, no longer test for auto-preloading
|
2021-02-11 14:24:29 -08:00 |
|
Becky Gilbert
|
301b4cb788
|
tweak plugin parameter descriptions
|
2021-02-11 14:22:01 -08:00 |
|
Becky Gilbert
|
4758d55f68
|
add preload plugin to docs structure
|
2021-02-11 13:53:47 -08:00 |
|
Becky Gilbert
|
3694d756f0
|
initial commit for preload plugin docs
|
2021-02-11 13:53:22 -08:00 |
|
Becky Gilbert
|
f1ee56973a
|
switch to preloading via preload plugin in example files
|
2021-02-11 12:12:53 -08:00 |
|
Becky Gilbert
|
b5211be302
|
tweak plugin descriptions to reflect switch to preload plugin
|
2021-02-11 12:12:19 -08:00 |
|
Becky Gilbert
|
fea41a71f6
|
remove references to preloading via jsPsych.init in experiment options docs page
|
2021-02-11 12:03:08 -08:00 |
|
Becky Gilbert
|
8238d9a9e3
|
update docs with preload plugin changes
|
2021-02-11 12:01:56 -08:00 |
|
Becky Gilbert
|
e67c75c092
|
update docs for preload plugin
|
2021-02-11 12:00:10 -08:00 |
|
Becky Gilbert
|
b4a174bd85
|
preload plugin changes: add getAutoPreloadList, remove autoPreload, preloadAudioFiles -> preloadAudio, update parameters and descriptions
|
2021-02-11 11:59:03 -08:00 |
|
Becky Gilbert
|
145d3e50fe
|
remove preload params from jsPsych.init docs
|
2021-02-11 11:54:48 -08:00 |
|
Josh de Leeuw
|
1b2f1a2699
|
fix the on_timeline_start issue
|
2021-02-10 17:58:45 -05:00 |
|
Josh de Leeuw
|
dea4b13354
|
added prolific intergration guide to docs
|
2021-02-10 12:38:40 -05:00 |
|
Josh de Leeuw
|
a2c124531f
|
add page on video tutorials
|
2021-02-10 10:02:16 -05:00 |
|
Josh de Leeuw
|
418e15db3d
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2021-02-10 09:05:06 -05:00 |
|
Josh de Leeuw
|
8c4d17d675
|
fix a few test console.log and console.error messages
|
2021-02-10 09:05:02 -05:00 |
|
Becky Gilbert
|
68c4a466ed
|
Merge pull request #1497 from jspsych/feature-nested-function-parameters
Merge feature-nested-function-parameters branch - fixes #988
|
2021-02-09 17:42:52 -08:00 |
|
Becky Gilbert
|
c51d30485a
|
add minor comment to example in docs
|
2021-02-09 17:35:52 -08:00 |
|
Becky Gilbert
|
92eb7d90dc
|
add note about protected functions
|
2021-02-09 17:30:31 -08:00 |
|
Becky Gilbert
|
45f5331156
|
add docs for nested function parameters
|
2021-02-09 17:17:33 -08:00 |
|
Becky Gilbert
|
d465c20b05
|
add tests
|
2021-02-09 17:17:08 -08:00 |
|
Josh de Leeuw
|
a1fe96d9eb
|
tutorial edits
|
2021-02-09 19:35:53 -05:00 |
|
Becky Gilbert
|
7e288d4481
|
change keyCodes to keys in calls to utils.pressKey()
|
2021-02-09 15:29:02 -08:00 |
|
Becky Gilbert
|
d01881c692
|
merge changes from master and fix merge conflict
|
2021-02-09 15:23:40 -08:00 |
|