HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-11 16:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,399 Commits 14 Branches 506 Tags 58 MiB
5e83cf0871
Commit Graph

2399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becky Gilbert
5e83cf0871 remove duplicate plugin import 2021-02-21 14:03:05 -08:00
Becky Gilbert
19fc9e35c9 minor edit to text 2021-02-21 13:51:45 -08:00
Becky Gilbert
a713c5a1fc fix placeholder pretty name 2021-02-21 13:45:52 -08:00
Becky Gilbert
5fbc74b869
Merge pull request #672 from alexanderrobertson/patch-1 
Fix placeholder param name error in jspsych-survey-text.md
 2021-02-21 13:40:42 -08:00
Becky Gilbert
5b0dcfd801
Merge pull request #1401 from pablobernabeu/patch-4 
Update style.md
 2021-02-21 13:37:17 -08:00
Becky Gilbert
919524b5c8
Merge pull request #1555 from jspsych/feature-params-in-data 
Adds save_trial_parameters parameter - fixes #823
 2021-02-20 15:52:52 -08:00
Becky Gilbert
8a3c6fa7ea add save_trial_parameters to docs, add sections/examples for save_trial_parameters and css_classes #823 2021-02-20 15:43:25 -08:00
Becky Gilbert
4b5c90fdf1 tweak example and comments 2021-02-20 15:10:04 -08:00
Becky Gilbert
96bdaceefc add save-trial-parameters example #823 2021-02-20 14:57:29 -08:00
Becky Gilbert
101508863c remove numeric keyCodes from tests (missed one) 2021-02-20 14:25:45 -08:00
Becky Gilbert
c6e09d7578 remove numeric keyCodes from tests 2021-02-20 14:24:36 -08:00
Becky Gilbert
17090f1562 Merge branch 'master' of https://github.com/jspsych/jsPsych 2021-02-20 14:11:33 -08:00
Josh de Leeuw
f2d2ced2a6 fix test to expect non-stringified data 2021-02-20 17:10:39 -05:00
Josh de Leeuw
3713be80f4 Merge branch 'master' into feature-params-in-data 2021-02-20 17:09:33 -05:00
Josh de Leeuw
1c8774b935 fix virtual chinrest when viewing_distance_report is 'none' 2021-02-20 17:00:58 -05:00
Becky Gilbert
e0beed63aa minor edits to text 2021-02-20 12:19:32 -08:00
Becky Gilbert
da297ba0bb tweak text for clarity 2021-02-20 12:11:24 -08:00
Becky Gilbert
c803baec86 remove unused blindspot_start_prompt param, minor edits to text for clarity 2021-02-20 11:53:59 -08:00
Becky Gilbert
ece12d9c22
Merge pull request #1553 from jspsych/readme-update 
Readme update
 2021-02-19 22:08:05 -08:00
Becky Gilbert
546753e8fa fix bug that caused preload plugin to stop experiment when there are no files to load 2021-02-19 18:23:59 -08:00
Becky Gilbert
4c9bd25f5c remove unused CSS 2021-02-19 18:22:36 -08:00
Becky Gilbert
0675af8fff remove unused CSS 2021-02-19 18:22:12 -08:00
Becky Gilbert
91fc6205fc switch to css_classes parameter for stim font sizes 2021-02-19 18:21:40 -08:00
Becky Gilbert
0820abd2c0 remove unused plugin file 2021-02-19 18:20:58 -08:00
Becky Gilbert
c033d31643 add/fix preload trials in examples 2021-02-19 18:20:26 -08:00
Becky Gilbert
90468887d7 minor edits to text, fix section header 2021-02-19 14:42:53 -08:00
Becky Gilbert
af05ce78f7 add more text and links to readme, fix old GH links 2021-02-19 14:28:53 -08:00
Josh de Leeuw
2e50b1319e
Merge pull request #1442 from GEJ1/master 
virtual-chinrest plugin, with resizing ability
 2021-02-19 17:26:33 -05:00
Josh de Leeuw
93022f59fa add virtual chinrest to list of plugins 2021-02-19 17:21:38 -05:00
Becky Gilbert
223152c43a
Merge pull request #1546 from jspsych/freesort 
Merge freesort touchscreen updates from #1228
 2021-02-19 14:19:30 -08:00
Josh de Leeuw
0ed04b412a break when incompatible parameters 2021-02-19 17:17:52 -05:00
Josh de Leeuw
14a1891f13 fix distance calculation 2021-02-19 17:03:33 -05:00
Josh de Leeuw
25ee508ea1 add test stimulus at the end of the trial 2021-02-19 16:53:42 -05:00
Josh de Leeuw
89ad34c8ea fix admonition format 2021-02-19 16:47:18 -05:00
Becky Gilbert
e117dba964 remove unnecessary parentheses 2021-02-19 12:14:39 -08:00
Becky Gilbert
2f3e6170f7 add freesort column_spread_factor parameter to control compression/expansion of image columns along x-axis 2021-02-19 12:07:44 -08:00
Becky Gilbert
d8b80fbe0e update docs with column_spread_factor parameter and mobile compatibility 2021-02-19 12:06:16 -08:00
Becky Gilbert
4c07502371 remove quotes from keys in trial data (#670) 2021-02-19 11:10:19 -08:00
Becky Gilbert
42e4908dd1 Merge branch 'master' into freesort 2021-02-19 10:39:36 -08:00
Becky Gilbert
8325cbd4d9
Merge pull request #1540 from jspsych/feature-key-code-update 
merge feature-key-code-update: modify compareKeys to use appropriate case sensitive/insensitive comparison, use compareKeys instead of direct comparison
 2021-02-19 10:29:09 -08:00
Becky Gilbert
0800497060
Merge branch 'master' into feature-key-code-update 2021-02-19 10:24:21 -08:00
Becky Gilbert
d22bdf1021 default to case-insensitive in compareKeys and getKeyboardResponse if called before jsPsych.init, add tests #396 2021-02-19 10:18:52 -08:00
GEJ1
8f5c21d647 SVGjs dependency added to documentation 2021-02-19 15:00:39 -03:00
Josh de Leeuw
3df3d64712 fix representation of key 2021-02-19 12:21:49 -05:00
Josh de Leeuw
d9008dde43 fix broken links in webgazer plugin docs 2021-02-19 12:10:11 -05:00
Josh de Leeuw
ee3c5d1aef add babySTEP to video tutorials 2021-02-19 12:08:41 -05:00
Josh de Leeuw
ff7db2f353
Merge pull request #1543 from jspsych/fix-audio-preload 
fix-audio-preload
 2021-02-18 22:45:56 -05:00
Josh de Leeuw
f6b731a441 update getAudioBuffer docs 2021-02-18 22:41:23 -05:00
Josh de Leeuw
5cdca4f8ad update audio plugins to use new getAudioBuffer strategy 2021-02-18 22:32:50 -05:00
Josh de Leeuw
1b4b9d7e3b switch getAudioBuffer to a Promise 2021-02-18 21:48:19 -05:00