Becky Gilbert
|
074aca788c
|
fix start_time/startTime typo, use WebAudio clock for RT
|
2020-12-07 16:19:34 -08:00 |
|
Becky Gilbert
|
633682b335
|
center the color divs in prompts
|
2020-12-07 16:14:22 -08:00 |
|
Becky Gilbert
|
6c6d686eda
|
Merge pull request #1268 from jspsych/safe-mode
Add CORS safe mode for file:// protocol, new and updated docs - fixes #1258
|
2020-12-07 13:51:37 -08:00 |
|
Becky Gilbert
|
82c0eeafb3
|
fix typo in localSave link
|
2020-12-07 13:46:14 -08:00 |
|
Becky Gilbert
|
4f81bc1f57
|
first draft of running expts page, replaces collecting data page (now the "online" section)
|
2020-12-07 13:16:47 -08:00 |
|
Becky Gilbert
|
455343c672
|
ref running experiments page in use_webaudio section, add min RT and override safe mode options
|
2020-12-07 13:15:14 -08:00 |
|
Becky Gilbert
|
3f8f5fe73f
|
ref running experiments page, update video stimulus param
|
2020-12-07 13:06:56 -08:00 |
|
Becky Gilbert
|
fbb38b0f01
|
clarify ovoerride_safe_mode param description
|
2020-12-04 13:00:30 -08:00 |
|
Becky Gilbert
|
79b5554897
|
fix incorrect default
|
2020-12-04 10:14:16 -08:00 |
|
Becky Gilbert
|
e007f398d0
|
update contributors based on https://github.com/jspsych/jsPsych/graphs/contributors
|
2020-12-04 10:05:12 -08:00 |
|
Becky Gilbert
|
918df9475f
|
add link to safe mode console.warn message
|
2020-12-03 16:40:49 -08:00 |
|
Becky Gilbert
|
a433d81c90
|
merge in the video parameter name changes from master
|
2020-12-03 15:43:15 -08:00 |
|
Becky Gilbert
|
63fc69c029
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-12-03 15:38:48 -08:00 |
|
Becky Gilbert
|
c3dd525bb7
|
tweak description
|
2020-12-03 15:32:21 -08:00 |
|
Becky Gilbert
|
e9bf43b29f
|
add new canvas and maxdiff plugins
|
2020-12-03 15:32:00 -08:00 |
|
Becky Gilbert
|
de9149c158
|
Merge pull request #1261 from jspsych/video-plugin-testing
video-* plugins: stim parameter name change and tests
|
2020-12-03 14:21:18 -08:00 |
|
Josh de Leeuw
|
66b1af85b6
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-12-03 14:04:40 -05:00 |
|
Josh de Leeuw
|
136cc5103c
|
fix #1265
|
2020-12-03 14:04:37 -05:00 |
|
Josh de Leeuw
|
28b8714c29
|
fix bullet list
|
2020-12-03 14:04:20 -05:00 |
|
Josh de Leeuw
|
99e70b6a91
|
replace logo type
|
2020-12-03 14:04:08 -05:00 |
|
Josh de Leeuw
|
ea74ed92aa
|
update for mkdocs material version 6
|
2020-12-03 14:04:01 -05:00 |
|
Becky Gilbert
|
7cd7fc65f4
|
remove HTML5 stalled event listener & check for progress bar before updating - fixes #1262
|
2020-12-03 11:01:19 -08:00 |
|
Becky Gilbert
|
c7b3762c0a
|
fix registerPreload test
|
2020-12-03 09:18:07 -08:00 |
|
Becky Gilbert
|
d75717ac5b
|
remove use_webaudio: false from audio examples
|
2020-12-02 17:46:13 -08:00 |
|
Becky Gilbert
|
91f774a50a
|
add protocol check and file_protocol flag to disable Web Audio and video preloading (CORS errors)
|
2020-12-02 17:44:34 -08:00 |
|
Becky Gilbert
|
2f73392370
|
add override_safe_mode parameter to jsPsych.init
|
2020-12-02 17:42:18 -08:00 |
|
Becky Gilbert
|
4f06465ba3
|
fix indentation
|
2020-12-02 17:11:04 -08:00 |
|
Becky Gilbert
|
b67d4a4881
|
add auto preload test
|
2020-12-02 12:11:38 -08:00 |
|
Becky Gilbert
|
ffc80a372e
|
add console warning when auto preload parameter not found
|
2020-12-02 12:11:03 -08:00 |
|
Becky Gilbert
|
d9437c1c11
|
change sources parameter name to stimulus
|
2020-12-01 16:56:12 -08:00 |
|
Becky Gilbert
|
df8c28f397
|
Merge pull request #1171 from mgorenstein/fix-video-plugin-preload
Fix stimulus parameter naming in video response plugins
|
2020-12-01 16:48:37 -08:00 |
|
Mark Gorenstein
|
d63012706f
|
video files stored in 'stimulus' var for consistency with other plugins
|
2020-11-25 14:47:32 -08:00 |
|
Becky Gilbert
|
6bcb624f7d
|
Merge pull request #1233 from jspsych/docs-6.2
Add docs-6.2 branch to master
|
2020-11-25 11:57:29 -08:00 |
|
Becky Gilbert
|
528a56c53e
|
Merge branch 'master' into docs-6.2
|
2020-11-25 11:51:23 -08:00 |
|
Becky Gilbert
|
39c128cddc
|
Merge pull request #1174 from becky-gilbert/fix-consecutive-images
add render_on_canvas option, fix maintain_aspect_ratio - #891 #969 #1172
|
2020-11-25 10:51:52 -08:00 |
|
Becky Gilbert
|
32cdeae645
|
Merge branch 'master' into fix-consecutive-images
|
2020-11-25 10:50:26 -08:00 |
|
Becky Gilbert
|
bbef9ef9d2
|
Merge pull request #1203 from jspsych/freesort
Updates to free-sort plugin
|
2020-11-25 09:48:05 -08:00 |
|
Becky Gilbert
|
6471e4bb4f
|
make button style consistent with other plugins, add space between button and sort area
|
2020-11-25 09:46:26 -08:00 |
|
Becky Gilbert
|
e94bc9fc3e
|
Merge pull request #1193 from becky-gilbert/slider-positions
fix slider label positioning with custom CSS - fixes #695
|
2020-11-25 09:26:55 -08:00 |
|
Becky Gilbert
|
8c81c9f420
|
Merge branch 'master' into slider-positions
|
2020-11-25 09:26:00 -08:00 |
|
Becky Gilbert
|
6673c9e903
|
add IDs to label/alternative text
|
2020-11-20 15:52:47 -08:00 |
|
Becky Gilbert
|
347005809a
|
minor tweaks to wording
|
2020-11-20 15:51:18 -08:00 |
|
Becky Gilbert
|
374814c56d
|
added awhug
|
2020-11-20 15:27:03 -08:00 |
|
Becky Gilbert
|
1aaee22324
|
Merge pull request #1136 from awhug/master
Add maxdiff plugin
|
2020-11-20 15:09:39 -08:00 |
|
Angus Hughes
|
bcb3b3653c
|
Fix error when required is false to return null response
|
2020-11-20 11:19:53 +08:00 |
|
Becky Gilbert
|
a7bed07cf4
|
add examples to demo new parameters
|
2020-11-19 18:25:48 -08:00 |
|
Becky Gilbert
|
dc00efd0ea
|
add counter text and stim_starts_inside params, fix missed hardcoded colors
|
2020-11-19 18:24:44 -08:00 |
|
Becky Gilbert
|
8cc2454cfd
|
add counter text and stim_starts_inside parameters
|
2020-11-19 18:22:08 -08:00 |
|
Becky Gilbert
|
4c0dab0122
|
add new border/background color parameters
|
2020-11-19 16:07:35 -08:00 |
|
Becky Gilbert
|
b1b3e7d973
|
remove dependency text
|
2020-11-19 15:43:37 -08:00 |
|