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
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
Josh de Leeuw
b9a5ffde2f organize tests 2017-01-15 15:43:00 -05:00
Josh de Leeuw
24798f8b3a Merge pull request #321 from oddballio/master 
multiple choice plugin fixup
 2017-01-13 21:59:59 -05:00
Xiaolu bai
e6c5fcf01c clears console.log 2017-01-13 18:06:15 -08:00
Robert Wilkinson
1230ed2e1a Merge pull request #2 from oddballio/next_button_rewire 
show nav false
 2017-01-13 17:50:38 -08:00
Rob Wilkinson
15016febc6 cleaned up console logs 2017-01-13 17:49:27 -08:00
Xiaolu Bai
784751b3a3 show nav false 2017-01-13 17:17:07 -08:00
Robert Wilkinson
e78fa7f688 Merge pull request #1 from oddballio/next_button_rewire 
Next button rewire
 2017-01-13 17:15:24 -08:00
Xiaolu Bai
e2566c6089 Removes extra text on submit button 2017-01-13 16:58:10 -08:00
Xiaolu Bai
5cb6b31943 next button rework 2017-01-13 13:30:20 -08:00
Xiaolu Bai
467dcb0460 bugfix_multiple_choice_module 2017-01-13 01:57:04 -08:00
Josh de Leeuw
c602a70116 clarify when on_data_update is called 2017-01-12 14:49:23 -05:00
Josh de Leeuw
729eadedea change .displayData test 2017-01-12 14:49:06 -05:00
Josh de Leeuw
a4ad32af66 docs updates; better RT tutorial 2017-01-12 14:44:03 -05:00
Josh de Leeuw
f40214066b pretty print json; fix #318; adjust timelineVaribale to return function by default 2017-01-12 14:43:38 -05:00
Josh de Leeuw
489298fea1 uncomment margin: auto - fixes #319 2017-01-12 14:42:49 -05:00
Josh de Leeuw
accc619352 trial finish events get passed a modifiable copy of the raw data object 2017-01-09 11:30:23 -05:00
Josh de Leeuw
a9ed50f5d2 mkdocs config 2017-01-06 13:02:18 -05:00
Josh de Leeuw
6301cb139d fix #315 docs 2017-01-06 12:18:43 -05:00
Josh de Leeuw
45af5158e9 fixes #311 2017-01-06 12:10:04 -05:00
Josh de Leeuw
3520ba3c4c fixes #312 2017-01-06 12:05:23 -05:00
Josh de Leeuw
ceeca6d4e8 update readme 2017-01-04 21:55:23 -05:00
Josh de Leeuw
fd765347b8 update contributors doc 2017-01-04 21:54:14 -05:00
Josh de Leeuw
f3668df9d8 move from tests&examples --> examples 2017-01-04 16:07:56 -05:00
Josh de Leeuw
8b425c9a45 Merge pull request #310 from GavinQ1/master 
jspsych-form-plugin
 2017-01-04 16:05:02 -05:00
GavinQ1
52660ffef2 Create .gitignore 2017-01-04 16:03:08 -05:00
Josh de Leeuw
a89b993efe Merge pull request #317 from jodeleeuw/no-jquery 
Remove all jQuery, implement testing framework
 2017-01-04 15:42:47 -05:00
Josh de Leeuw
0240b9f6c9 Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery 
# Conflicts:
#	plugins/jspsych-html.js
 2017-01-04 15:38:17 -05:00
Josh de Leeuw
053fc1bcd1 test join method of DataCollection 2017-01-04 15:25:28 -05:00
Josh de Leeuw
552a86c2a7 one innerHTML call per plugin write. 2017-01-04 15:25:14 -05:00
Josh de Leeuw
4fc383cab1 manual preloading from init method 2017-01-04 15:25:01 -05:00
Josh de Leeuw
354ff1dc94 add DataCollection.first and .last 2016-12-31 14:39:53 -05:00
Josh de Leeuw
e821ae6bb0 add DataColumn.all 2016-12-31 14:19:51 -05:00
Josh de Leeuw
c5a6414477 adding tests 2016-12-28 22:44:25 -05:00
GavinQ1
ee4755fcaa Add some comment 2016-12-27 23:04:06 -05:00
GavinQ1
a30088fe48 Merge branch 'master' of https://github.com/GavinQ1/jsPsych 2016-12-27 22:47:41 -05:00
GavinQ1
1d36cdaaa3 fix bug: checkbox/radio/switch/.values 2016-12-27 22:46:58 -05:00
Josh de Leeuw
789ce325b7 just use node 6.6 for now 2016-12-22 17:20:14 -05:00
Josh de Leeuw
a932a50e02 try different node version 2016-12-22 17:13:05 -05:00
Josh de Leeuw
7a966c2248 add ConvertKeyCodeToKeyCharacter, variance, min, max 2016-12-22 17:00:48 -05:00
Josh de Leeuw
658b1db363 implement pluginapi tests 2016-12-20 13:21:13 -05:00