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,160 Commits 14 Branches 506 Tags 58 MiB
9810dab604
Commit Graph

1160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
bf80a689d4 fix bug for html5 audio use in single-audio 2017-06-09 23:29:16 -04:00
Josh de Leeuw
0917379d9e fix missing comma 2017-06-09 22:51:21 -04:00
Josh de Leeuw
4184913b1e fixes #387 2017-06-07 22:44:33 -04:00
Josh de Leeuw
bfcf1a2fa9 docs changes 2017-06-07 22:24:54 -04:00
Josh de Leeuw
f57c0a9695 add button_label documentation #365 #360 2017-06-07 21:53:51 -04:00
Josh de Leeuw
517b9c01d1 docs for #361 2017-06-07 21:45:39 -04:00
Josh de Leeuw
8f9b16e47b add docs for #380 2017-06-07 21:40:32 -04:00
Josh de Leeuw
7eb4df67e9 documentation update for #384 2017-06-07 21:28:54 -04:00
Josh de Leeuw
9a01b5957f fixes #394 2017-06-07 21:14:40 -04:00
Josh de Leeuw
51a02b1eac fix example file 2017-06-07 13:06:46 -04:00
Josh de Leeuw
5183f46264 fix timeline variables example 2017-06-07 12:43:31 -04:00
Josh de Leeuw
8a6267a1a5 possible fix for #370, #288 ? 2017-06-06 23:16:56 -04:00
Josh de Leeuw
6ea68d556f add srt-mouse plugin #390 2017-06-05 21:56:43 -04:00
KristinDiep
e319a909b0 Added test for text plugin 2017-06-04 16:12:01 -04:00
KristinDiep
98239311bc fixed example 2017-06-02 14:28:50 -04:00
KristinDiep
a1b8e8e3cd fixed logic and tests 2017-06-02 14:27:14 -04:00
KristinDiep
cba01953f8 Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 
Need to update
 2017-06-02 09:17:37 -04:00
Josh de Leeuw
ac4bb0a818 cap range of setProgressBar #325 2017-06-01 15:47:04 -04:00
Josh de Leeuw
b09384929f add setProgressBar #325 2017-06-01 15:37:43 -04:00
Josh de Leeuw
3b47fe3bd8 show data after completed example 2017-06-01 14:55:42 -04:00
Josh de Leeuw
df5ebbc223 fix submit bug 2017-06-01 14:55:33 -04:00
Josh de Leeuw
c58d36b0c9 survey plugins should clear display 2017-06-01 14:34:32 -04:00
Josh de Leeuw
97a8db4ff4 Merge pull request #386 from eamoncaddigan/master 
Redundant demo using old fullscreen example code. #380
 2017-05-30 12:42:20 -04:00
eamoncaddigan
0a081f424d Redundant demo using old fullscreen example code. #380 2017-05-30 10:38:40 -04:00
Josh de Leeuw
f6adf2f8af adjust #384 style 2017-05-30 10:01:36 -04:00
Josh de Leeuw
934f394de0 first pass at #384 2017-05-27 18:09:28 -04:00
KristinDiep
0b460a9313 fix in example 2017-05-26 15:41:16 -04:00
KristinDiep
03cf890c5c Merge branch 'master' of https://github.com/kristiyip/jsPsych 
Need update
 2017-05-26 15:36:48 -04:00
KristinDiep
92ef82aac8 minor fixes 2017-05-26 15:36:33 -04:00
KristinDiep
87d2e42bdc snapshot update 2017-05-26 11:32:19 -04:00
KristinDiep
0ef858450c Merge branch 'master' of https://github.com/kristiyip/jsPsych 
Nee to update.
 2017-05-26 11:21:55 -04:00
KristinDiep
3272be54a6 Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 
Need to update local repo
 2017-05-26 11:09:46 -04:00
Josh de Leeuw
629f9915f7 update jest to version 20 2017-05-26 10:08:52 -04:00
Josh de Leeuw
a62a2e771e add example file for testing #288 , #370 2017-05-25 13:59:43 -04:00
Josh de Leeuw
ad1b887024 Merge pull request #342 from Ahoidal/enhanced_video_plugin 
Added start and stop parameters to video plugin
 2017-05-25 13:27:55 -04:00
Josh de Leeuw
d287f7a4d3 fixes #343 2017-05-25 11:17:56 -04:00
Josh de Leeuw
6b53fced9d reset variables when timeline loops #343 2017-05-25 10:51:08 -04:00
Josh de Leeuw
a0ecd6dc23 only preload unique files; fixes #377 2017-05-25 10:40:59 -04:00
Josh de Leeuw
2a900c7d3e add fullscreen partial test 2017-05-25 10:39:29 -04:00
Josh de Leeuw
87e064d9c9 adjust loading test 2017-05-25 10:39:13 -04:00
Josh de Leeuw
8be4e13cda implement testing for utils 2017-05-25 10:39:03 -04:00
Josh de Leeuw
41f6f4d8ed fix .unique bug 2017-05-25 10:38:55 -04:00
Josh de Leeuw
25b4f28f40 move utility functions to .utils module for better testing 2017-05-25 10:33:23 -04:00
Josh de Leeuw
930d5cdff9 fix typo in fullscreen plugin #380 2017-05-24 23:28:46 -04:00
Josh de Leeuw
90a17b82ec add timeline variables test shell 2017-05-24 23:28:11 -04:00
Josh de Leeuw
f2304c2b79 fixes #333 , adds same-different testing 2017-05-24 23:25:29 -04:00
Josh de Leeuw
5ed2d852bc Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 2017-05-24 22:23:57 -04:00
Josh de Leeuw
e129f832fc update docs for removing fullscreen from ini #380 2017-05-24 22:23:54 -04:00
Josh de Leeuw
6dc62aec0e remove fullscreen from jsPsych.init #380 2017-05-24 22:18:16 -04:00
Josh de Leeuw
db419ce714 Merge pull request #382 from wernersa/master 
Minor error corrected
 2017-05-19 08:58:59 -04:00