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,063 Commits 14 Branches 506 Tags 58 MiB
6afe9ce086
Commit Graph

2063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
6afe9ce086 fixes #1380 2021-01-19 16:51:43 -05:00
Becky Gilbert
e32b299d56
Merge pull request #1378 from jspsych/feature-css-class-trial 
Add feature: css_classes trial parameter
 2021-01-18 12:19:50 -08:00
Becky Gilbert
188cb14e3d
Merge branch 'master' into feature-css-class-trial 2021-01-18 12:18:43 -08:00
Becky Gilbert
d1a876d280
Merge pull request #1376 from jspsych/feature-timeline-variable-simplify 
Merge feature-timeline-variable-simplify - fixes #883
 2021-01-18 09:52:35 -08:00
Becky Gilbert
519abbdb47
Merge pull request #1375 from jspsych/bugfix-image-canvas 
add img onload fn to draw image when loaded - fixes #1305
 2021-01-18 09:52:02 -08:00
Becky Gilbert
f539669203 first draft of new style docs page - #832 2021-01-15 15:44:30 -08:00
Becky Gilbert
4203a047f7 minor tweak to example 2021-01-15 15:42:05 -08:00
Becky Gilbert
9147a2dce5 use css_classes parameter instead of inline style for stim size #832 2021-01-13 12:02:54 -08:00
Becky Gilbert
62ab659981 add examples with specific CSS selectors, fix note about inheritance #832 2021-01-13 11:53:53 -08:00
Becky Gilbert
5c653f4bde remove uncessary true argument from jsPsych.timelineVariable in examples/tests #883 2021-01-13 10:08:38 -08:00
Becky Gilbert
a496871984 update docs for #883 2021-01-13 10:07:48 -08:00
Becky Gilbert
761491ed94 tweak example HTML file classes and add note about inheritance #832 2021-01-12 14:07:24 -08:00
Becky Gilbert
29d5aaa1c4 add css_classes to plugin overview docs, add example HTML file #832 2021-01-11 17:34:08 -08:00
Becky Gilbert
4610a7ac83 add img onload fn to draw image when loaded - fixes #1305 2021-01-09 11:18:57 -08:00
Josh de Leeuw
f39f394866 adds test and handles non-array #832 2020-12-29 22:06:28 -05:00
Josh de Leeuw
5881c4455e added tests for #883 2020-12-29 21:57:20 -05:00
Josh de Leeuw
76c5d02597 add additional testing for #832, fixes function declaration 2020-12-26 17:24:33 -05:00
Josh de Leeuw
f6ac098b4c first draft of #832 2020-12-23 09:56:40 -05:00
Josh de Leeuw
b6a28b0433 adds first pass at #883 2020-12-16 15:15:41 -05:00
Becky Gilbert
42962039af JSON stringify the stimulus array in the trial data 2020-12-08 15:31:44 -08:00
Becky Gilbert
e9d632cfc2 add example with custom button and page labels# 2020-12-08 15:13:36 -08:00
Becky Gilbert
f795f29cc9 add info to prompts, add post_trial_gap 2020-12-08 15:02:30 -08:00
Becky Gilbert
3d77e2f131 fix incorrect text_answer 2020-12-08 14:50:51 -08:00
Becky Gilbert
c026c62ea0 move img width from <style> to param 2020-12-08 14:44:24 -08:00
Becky Gilbert
a20d6f9e04 move img width from <style> to param, add pre_trial text 2020-12-08 14:40:03 -08:00
Becky Gilbert
5fc38b2a04 fix typo and formatting, remove unnecessary <style> 2020-12-08 14:22:10 -08:00
Becky Gilbert
fd8a048139 move img width from <style> to param 2020-12-08 14:18:32 -08:00
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