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,190 Commits 14 Branches 506 Tags 58 MiB
746f00e148
Commit Graph

1190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Werner Sævland
588786abf6 Minor error corrected 2017-05-19 14:42:10 +02:00
Josh de Leeuw
fb8b7d2200 show text input instead of textarea when rows=1 2017-05-18 11:28:06 -04:00
Josh de Leeuw
d5fd16be7c working example of fullscreen 2017-05-01 16:35:41 -04:00
Josh de Leeuw
6f032f189e modifying info method 2017-05-01 16:31:08 -04:00
Josh de Leeuw
57effeef1d initial implementation of fullscreen plugin #380 2017-05-01 15:32:39 -04:00
KristinDiep
4b8d332762 Merge remote-tracking branch 'upstream/master' 
Need to update fork with upstream.
 2017-04-17 17:11:10 -04:00
KristinDiep
4ecd4f4df2 updated snapshot 2017-04-13 13:15:38 -04:00
KristinDiep
8539582705 created docs for IAT 2017-04-13 00:39:12 -04:00
KristinDiep
3881da6df8 created tests 2017-04-12 22:58:36 -04:00
KristinDiep
0b2e14781f moved age folder to imgand removed container div 2017-04-11 08:59:36 -04:00
Josh de Leeuw
844ea6f1db add .endCurrentTimeline test 2017-04-10 21:04:05 -04:00
Josh de Leeuw
e4e03269fa Create README.md 2017-04-10 18:38:42 -04:00
Josh de Leeuw
71027fc07d add tests for conditional_function 2017-04-10 14:24:58 -04:00
Josh de Leeuw
e09f4749ef fixes #367 2017-04-08 17:32:45 -04:00
KristinDiep
0d3b935bb1 Now works and allows users to press any key to continue 2017-04-06 02:03:20 -04:00
Josh de Leeuw
5be7b122f3 Merge pull request #365 from hugueslacroix/master 
Follow up on issue #360 and pull request #362
 2017-04-04 11:26:48 -04:00
KristinDiep
b7d43b3280 added 'other key' option 2017-04-01 16:14:57 -04:00
Hugues Lacroix
4fefa624c5 Also added ID to checkbox and radio in jspsych-multi-select and jspsych-multi-choice as it allows the user to click on the label to toggle the checkbox or radio instead of just the input itself 2017-03-31 23:50:21 -04:00
Hugues Lacroix
4b0932303d added button_label parameter for all relevant plugins (except for jspsych-resize, as it already had a button_text parameter). 2017-03-31 23:50:08 -04:00
KristinDiep
64f8fc7f9f transferred iat plugin to forked repo of jsPsych 2017-03-30 23:45:23 -04:00