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,487 Commits 14 Branches 506 Tags 58 MiB
13b4f88786
Commit Graph

533 Commits

Author SHA1 Message Date
andrewheusser
13b4f88786 added event handler to end trial when a stop time is specified 2017-08-25 15:32:38 -04:00
Josh de Leeuw
8f4b42fa8c Merge branch 'master' of https://github.com/jspsych/jsPsych 2017-08-02 11:57:04 -04:00
Josh de Leeuw
7e2db2c1c8 fixes #458 2017-08-02 11:57:00 -04:00
KristinDiep
ec72fade4b pretty name in survey plugins 2017-07-28 13:34:54 -04:00
KristinDiep
5df6166473 Update survey plugin docs 2017-07-27 14:59:32 -04:00
KristinDiep
e537037af7 updated questions for survey plugins 2017-07-24 09:58:22 -04:00
KristinDiep
b7dca21ecf fix merge conflict 2017-07-23 13:06:37 -04:00
KristinDiep
bf1da9375d added nested params in survey plugins 2017-07-23 13:04:39 -04:00
Josh de Leeuw
1b9ed49eca multi-select example #449 2017-07-17 21:50:04 -04:00
Josh de Leeuw
f9682859c2 reconstruction example #449 2017-07-17 21:47:50 -04:00
KristinDiep
505121e455 edited examples 2017-07-17 10:19:41 -04:00
KristinDiep
41db219c89 pretty name and description, no_function taken out 2017-07-13 19:17:27 -04:00
KristinDiep
26d33b6ec8 tests pass 2017-07-12 14:55:57 -04:00
KristinDiep
c3d616283f added demos 2017-07-12 14:29:47 -04:00
KristinDiep
f21ad81d1e removed param block under plugin.trial 2017-07-12 14:29:47 -04:00
Josh de Leeuw
5d888912f9 starts #432 2017-07-12 09:58:27 -04:00
KristinDiep
496b2c8a37 all test suites(except for timeline-variables.test) working 2017-07-11 10:14:21 -04:00
KristinDiep
c46b9263aa iat plugin example works 2017-07-10 15:08:29 -04:00
KristinDiep
cbb0643a95 some changes 2017-07-10 14:43:43 -04:00
KristinDiep
670b691da2 implemented plugin.info, some examples not working 2017-07-10 14:43:04 -04:00
Josh de Leeuw
756c88a07f better timing parameter names #425 2017-07-10 14:00:24 -04:00
KristinDiep
6f1c409c54 html-slider-response test finished 2017-07-10 10:43:57 -04:00
KristinDiep
13930f9e40 added params to image-slider-response 2017-07-10 09:12:46 -04:00
Josh de Leeuw
74da90c320 remove palmer plugin 2017-07-09 23:31:44 -04:00
Josh de Leeuw
a55d0448f9 remove jquery comment from form plugin 2017-07-09 23:05:58 -04:00
Josh de Leeuw
a1567ceba7 remove array brackets from plugin types 2017-07-09 21:15:22 -04:00
Josh de Leeuw
7433638dc6 remove old merge conflict (??) stuff 2017-07-07 15:10:14 -04:00
Josh de Leeuw
4863f2e9c3 remove evaluateFunctionParameter 2017-07-07 14:54:47 -04:00
KristinDiep
225fbf7474 image-button response test 2017-07-07 14:46:33 -04:00
KristinDiep
9e715e2457 iat-image, iat-html, image-keyboard-response tests done 2017-07-07 14:46:33 -04:00
KristinDiep
598174d0a8 audio and html slider response 2017-07-07 14:46:33 -04:00
Josh de Leeuw
fd6b66063c remove ambiguity for xab/sd #422 2017-07-07 14:13:14 -04:00
Josh de Leeuw
d6d23133ab fix query string bug 2017-07-07 13:23:29 -04:00
Josh de Leeuw
cb90bde564 param clarification #422 2017-07-07 12:23:02 -04:00
Josh de Leeuw
55566c8b6f remove text plugin (redundant with html-keyboard-response) 2017-07-07 12:22:53 -04:00
Josh de Leeuw
a764ba75a4 More work on plugin ambiguity #422 2017-07-07 12:17:09 -04:00
Josh de Leeuw
35827773a2 fix bug when URL has query string 2017-07-07 11:08:54 -04:00
Josh de Leeuw
4473a77ad2 rename html -> external-html 2017-07-06 15:32:53 -04:00
Josh de Leeuw
eca09d89be remove single-stim #422 2017-07-06 15:32:53 -04:00
Josh de Leeuw
6ad1e0e2ab more plugin updating #422 2017-07-06 15:32:53 -04:00
Josh de Leeuw
6b3a49d33d rename plugin file to match plugin name 2017-07-06 15:32:49 -04:00
Josh de Leeuw
fcbb1fa523 remove multi-picture plugin #404 2017-07-06 15:32:25 -04:00
Josh de Leeuw
69db40965e slider plugin #403 2017-07-06 15:32:19 -04:00
Josh de Leeuw
97e2792b81 change default button label 2017-07-06 15:32:18 -04:00
Josh de Leeuw
950a501800 remove similarity plugin #403 2017-07-06 15:32:03 -04:00
Josh de Leeuw
7a1a81d087 update examples; tweak plugin fixes 2017-07-06 15:31:31 -04:00
Josh de Leeuw
a1fd2fcef4 change default button label 2017-07-06 15:31:16 -04:00
Josh de Leeuw
a4de99e19d fix backwards plugin 2017-07-06 15:29:32 -04:00
Josh de Leeuw
183d357b4a update srt mouse with extra option 2017-07-06 15:28:55 -04:00
Josh de Leeuw
7518cfb7ff fix CI build 2017-07-06 15:27:37 -04:00