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
1,919 Commits 14 Branches 506 Tags 58 MiB
af8d531259
Commit Graph

1919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
3137eaaf13 add documentation of timelineVariable(..., true) (#607) 2019-06-04 11:02:19 -04:00
Josh de Leeuw
8eb344fbf1
Merge pull request #609 from retowyss/patch-1 
Enable language option for progress bar
 2019-06-03 16:47:16 -04:00
Josh de Leeuw
627b4b2d50
Merge pull request #555 from sprengholz/master 
Cloze Test
 2019-05-31 16:46:53 -04:00
Josh de Leeuw
05461d7949 change .variance and .sd to samples (#601) 2019-05-30 17:04:09 -04:00
Josh de Leeuw
6661e2b713 whitespace 2019-05-30 17:00:38 -04:00
Josh de Leeuw
8c998ef249 add test for nested timelines and endCurrentTimeline (#600) 2019-05-30 16:50:02 -04:00
Josh de Leeuw
4a5a310e79 fixes #597 2019-05-24 17:26:42 -04:00
Josh de Leeuw
7686082446 tentative fix for #603; need to add testing 2019-05-24 15:26:29 -04:00
Josh de Leeuw
e0fc3497ca avoid implicit event parameter 2019-05-24 13:55:23 -04:00
Josh de Leeuw
d1fabcb0d7
Merge pull request #613 from nabsul/fix-survey-text-submit-issue 
Add missing preventDefault() call to survey-text plugin submit
 2019-05-24 13:17:44 -04:00
Josh de Leeuw
e5c1c85eaf documentation for #604 2019-05-24 11:27:25 -04:00
Nabeel Sulieman
6fd5cc2f76 Add missing preventDefault() call to survey-text plugin submit 2019-05-07 20:43:35 -07:00
Josh de Leeuw
c506f35683 update survey-text example to test multi page issue 2019-04-14 19:49:22 -04:00
Reto Wyss
51155ea3ba
document progress bar message 2019-04-13 02:39:35 +02:00
Reto Wyss
9a1714fbe2
Enable language option for progress bar 2019-04-12 06:23:14 +02:00
Jan Simson
40d50e89a2 html-form-plugin: Return JS Object instead of JSON String 2019-04-04 10:43:57 -04:00
Jan Simson
e2aac619a7 Use proper type for html parameter in survey-html-form plugin 2019-03-20 17:49:48 -04:00
Jan Simson
5462dc200d Added test & basic documentation for jspsych-surve-html-form plugin 2019-03-20 15:27:57 -04:00
Jan Simson
f4b4e7301c imrpoved example code for jspsych-survey-html-form plugin 2019-03-20 15:07:22 -04:00
Jan Simson
1b36f56daa Added jspsych-survey-html-form plugin 2019-03-14 16:17:51 -04:00
Josh de Leeuw
e2b73655e6 add custom sampling tests 2019-03-07 12:09:49 -05:00
Josh de Leeuw
133a61ccfb
Merge pull request #594 from alisdt/master 
external-html example: Replace jQuery with vanilla JS
 2019-02-04 13:18:34 -05:00
alisdt
4651b5d3c2
Replace jQuery in example with vanilla JS 2019-02-04 12:21:36 +00:00
Josh de Leeuw
219aed23b9
Merge pull request #592 from r-b-g-b/master 
Bug in video trial when video is preloaded
 2019-01-31 22:02:49 -05:00
Robert Gibboni
f935aa8172 Variable not defined, potential bug. Use 2019-01-31 16:56:56 -08:00
Josh de Leeuw
d6f7002497
Merge pull request #590 from r-b-g-b/master 
Option to set video playback rate
 2019-01-24 14:39:27 -05:00
Robert Gibboni
560a655c64 option to set video playback rate 2019-01-23 15:23:25 -08:00
Josh de Leeuw
74fee77f4b
Merge pull request #586 from zhanwenchen/patch-1 
Update jspsych-same-different-image.md
 2019-01-05 13:26:53 -05:00
Zhanwen "Phil" Chen
fc7f7cc9e8
Update jspsych-same-different-image.md 
Type "same-different" is undefined.
 2019-01-05 11:05:46 -06:00
Josh de Leeuw
bc03aebfb1 allow functions in data params (#562) 2018-12-14 12:12:50 -05:00
Josh de Leeuw
5741bd83e9 fix survey-text bug (#576) 2018-12-14 11:26:43 -05:00
Josh de Leeuw
248c5dcaab fix lexical decision example 2018-12-11 10:35:28 -05:00
Josh de Leeuw
0fcc566228 fix formatting bug #578 2018-11-30 14:48:57 -05:00
Sivananda Rajananda
1d46025e97
Rename plugin-RDK.test.js to plugin-rdk.test.js 2018-11-27 16:53:09 -08:00
Sivananda Rajananda
99ef8a149f
Rename jspsych-RDK.js to jspsych-rdk.js 2018-11-27 16:49:09 -08:00
CML2
a02664ec64 fixed test 2018-11-27 16:42:42 -08:00
Sivananda Rajananda
e49ba9d0ab
Rename jspsych-RDK.md to jspsych-rdk.md 2018-11-27 16:36:27 -08:00
CML2
dd64b0a00e changed RDK to lowercase 2018-11-27 16:26:32 -08:00
CML2
8408f59746 Changed to lowercase rdk and fixed border bug 2018-11-27 16:19:53 -08:00
Josh de Leeuw
e284a57bc6 skip required test because jsdom doesn't implement 2018-11-09 14:29:42 -05:00
Josh de Leeuw
4df4f5e1ec add test for required text 2018-11-09 14:14:10 -05:00
Josh de Leeuw
8c5d83b258 implement required parameter for survey-text plugin (#460) 2018-11-09 14:10:09 -05:00
CML2
5fe2a5f97e Fixed opposite_coherence function 2018-11-01 19:45:59 -07:00
Josh de Leeuw
d27f52618f update docs for video preload 2018-10-12 11:58:01 -04:00
Josh de Leeuw
e59895cb8e updates for video preloading 2018-10-12 11:48:01 -04:00
Josh de Leeuw
e36195dcd6
Merge pull request #535 from andytwoods/master 
preloading video
 2018-10-12 11:21:32 -04:00
Josh de Leeuw
b551f99f12
Merge branch 'master' into master 2018-10-12 11:19:51 -04:00
Josh de Leeuw
0bcf6b856a update Jest, configure URL 2018-10-09 16:17:28 -04:00
Josh de Leeuw
501a5be52a update all to performance.now() - #492 2018-10-09 16:13:59 -04:00
Josh de Leeuw
6eeed765af make default progress bar amount 0 2018-10-09 13:51:24 -04:00