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,050 Commits 14 Branches 506 Tags 58 MiB
e129f832fc
Commit Graph

1050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xiaolu bai
4d6e253896 Changes wording in comment 2017-02-13 14:43:26 -08:00
Xiaolu bai
08e47a68f3 Changes wording in introduction 2017-02-13 14:39:31 -08:00
Xiaolu bai
47b0f1b328 Changes wording in introduction 2017-02-13 14:36:35 -08:00
Xiaolu Bai
d94876e5ad multiple choice plugin is now same with origin/master multiple choice plug in 2017-02-13 14:24:25 -08:00
Xiaolu Bai
58ae31511c Merge branch 'master' of github.com:jodeleeuw/jsPsych into multi_picture_multi_select_plug_in_docs_example 2017-02-13 14:21:36 -08:00
Xiaolu Bai
3b9160f8f7 survey-multi-select survey-multi-picture plug-ins 
-examples included
-docs included
 2017-02-13 14:12:47 -08:00
Xiaolu bai
55106fe85e Changes prependChild() to insertBefore() 
/*change log*/
prependChild is now insertBefore due to compatibility issue for older browsers.
 2017-02-13 14:05:27 -08:00
Josh de Leeuw
7abacf7a1c add color option 2017-02-09 16:56:50 -05:00
Josh de Leeuw
72e54a2173 modify how buttons display to get proper bounding box 2017-02-09 16:26:33 -05:00
Josh de Leeuw
c5317e926c Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 2017-02-08 14:24:48 -05:00
Josh de Leeuw
b916e62d88 fix survey-likert plugin 2017-02-08 14:24:45 -05:00
Josh de Leeuw
0c50fb5f86 Merge pull request #335 from mvdoc/bf/likert 
BF: fix query to response button for survey-likert
 2017-02-06 22:19:08 -05:00
Matteo Visconti dOC
2c89131fc2 BF: fix query to response button for survey-likert 2017-02-06 14:37:09 -05:00
Josh de Leeuw
f941731a5b #334 add data collection method .uniqueNames 2017-02-04 16:05:22 -05:00
Josh de Leeuw
262fd06e3c docs updates 2017-02-02 16:47:35 -05:00
Josh de Leeuw
b01f4039f3 add tests for data parameter 2017-02-02 16:47:35 -05:00
Josh de Leeuw
065fd8d4b0 change jsPsych.data.getData() to jsPsych.data.get() 2017-02-02 16:47:35 -05:00
Xiaolu Bai
0d88edb465 merged with upstream master removed blank space 2017-01-30 19:42:35 -08:00
Josh de Leeuw
a25351de60 Merge pull request #330 from madebyafox/iss329 
fix spelling error xmlHttp to xmlhttp
 2017-01-27 10:05:16 -05:00
Amy Fox
8b4e452d54 fix spelling error xmlHttp to xmlhttp 2017-01-26 21:34:47 -08:00
Xiaolu Bai
011cb1ec5d center multi picture images 2017-01-26 14:50:56 -08:00
Josh de Leeuw
9622ad3676 Merge pull request #328 from lbai001/patch-1 
String concatenation issue
 2017-01-26 09:34:44 -05:00
Xiaolu Bai
9710e88d94 cleans up comments 2017-01-25 21:47:53 -08:00
Xiaolu bai
a348b85c3f String concatenation issue 
https://github.com/jodeleeuw/jsPsych/issues/327

/change log/
append child instead of setting innerHTML
 2017-01-25 21:15:56 -08:00
Xiaolu Bai
e2d1337baf prepend input to label instead of append to form 2017-01-25 20:22:34 -08:00
Xiaolu Bai
747cad020f multi select plug in double quoted string no value issue fixed 2017-01-25 19:23:41 -08:00
Xiaolu Bai
e68d8bf088 fixes value empty issue with quoted string 2017-01-25 19:14:51 -08:00
Xiaolu Bai
c6827b6f87 removes console.log 2017-01-25 12:35:21 -08:00
Xiaolu Bai
497c0a6c94 add id to questions 2017-01-24 17:45:46 -08:00
Xiaolu Bai
ce7da0789a minor css changes on multi picture plug in 2017-01-24 17:32:55 -08:00
Xiaolu Bai
6a930c6a80 Merge branch 'master' of github.com:oddballio/jsPsych into multi_picutre_multi_select_plug_in 2017-01-24 17:02:28 -08:00
Xiaolu Bai
3a9d8c3300 multi select questions cant go on with no value selected 2017-01-24 17:00:52 -08:00
Xiaolu Bai
bf0cb2bb13 Merge branch 'multi_picutre_multi_select_plug_in' of github.com:oddballio/jsPsych into multi_picutre_multi_select_plug_in 2017-01-23 18:06:23 -08:00
Xiaolu Bai
220c603c16 minor css fixes on submit button 2017-01-23 18:05:15 -08:00
Robert Wilkinson
42ed1d83e5 Merge pull request #4 from oddballio/multi_picutre_multi_select_plug_in 
Multi picture multi select plug in
 2017-01-18 15:06:47 -08:00
Robert Wilkinson
3eaf3ceaeb Merge branch 'master' into multi_picutre_multi_select_plug_in 2017-01-18 15:06:28 -08:00
Robert Wilkinson
964c659ea9 Merge pull request #3 from jodeleeuw/master 
Update fork
 2017-01-18 14:53:44 -08:00
Josh de Leeuw
12043f2ffc Merge pull request #289 from rivasd/parallelport 
Changes for supporting parallel port triggers with our Chrome extension
 2017-01-18 12:55:52 -05:00
Josh de Leeuw
5a45dd2294 Update .gitignore 2017-01-18 12:53:17 -05:00
Josh de Leeuw
94f61537c4 Update .gitignore 2017-01-18 12:52:43 -05:00
Xiaolu Bai
237025845a Multi-select plug in complete 2017-01-17 13:29:39 -08:00
Josh de Leeuw
d837794426 Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 2017-01-17 15:07:25 -05:00
Josh de Leeuw
ba356b6588 change execution order of finishExperiment 2017-01-17 15:07:23 -05:00
Xiaolu Bai
8c241daca1 created multi-select plugin 2017-01-17 12:01:33 -08:00
Xiaolu Bai
646320ac9e cleans up console.logs 2017-01-16 18:59:04 -08:00
Xiaolu Bai
3352805984 change name from test -> multi picture 2017-01-16 18:29:47 -08:00
Xiaolu Bai
6b0f5ebd90 click pic go plug_in 2017-01-16 18:23:10 -08:00
Josh de Leeuw
9c31f9afb2 Merge pull request #322 from aucuparia/patch-1 
Update creating-a-plugin.md
 2017-01-16 14:03:47 -05:00
aucuparia
4c2cf09b1a Update creating-a-plugin.md 
Missing word.
 2017-01-16 16:32:51 +01:00
Josh de Leeuw
00ff20b50c fix attachEventListener -> addEventListener 2017-01-16 09:34:45 -05:00