HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,186 Commits 14 Branches 506 Tags 58 MiB
969484f0e6
Commit Graph

2186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becky Gilbert
887dcbd627 move img width from <style> to parameter 2020-12-08 14:13:09 -08:00
Becky Gilbert
6aa5641bb5 improve description, fix missing param and incorrect default 2020-12-08 12:46:47 -08:00
Becky Gilbert
444b54e13f fix missing/incorrect defaults, mention response allowed while playing param 2020-12-08 12:32:27 -08:00
Becky Gilbert
c55c2b3592 add link to params available in all plugins 2020-12-08 12:21:54 -08:00
Becky Gilbert
aa7629f6d2 fix formatting and broken link 2020-12-08 11:32:17 -08:00
Becky Gilbert
1c6037f249 update links to CORS section, add message_progress_bar param 2020-12-08 11:30:24 -08:00
Becky Gilbert
9c711416b8 update link to CORS section 2020-12-08 11:28:06 -08:00
Becky Gilbert
4f568a93a3 add manual update example and custom message option 2020-12-08 11:26:42 -08:00
Becky Gilbert
a4e809dac4 fix incorrect plugin order and typo 2020-12-08 11:25:09 -08:00
Becky Gilbert
d87fd2a6cf fix out-of-date links, add links, tweak wording 2020-12-08 11:24:04 -08:00
Becky Gilbert
8c50d15a21 update example labels 2020-12-08 11:22:01 -08:00
Becky Gilbert
d4cf29ca54 fix exclude-browser link 2020-12-08 11:19:15 -08:00
Becky Gilbert
02f31ec6e7 change collecting-data to running-experiments in nav 2020-12-08 11:17:53 -08:00
Becky Gilbert
0e2745c79d improve preloading test based on console.warn 2020-12-07 16:57:01 -08:00
Becky Gilbert
c70c36cbbe add missing var to startTime definition 2020-12-07 16:22:23 -08:00
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