HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-13 09:08:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1,488 Commits 14 Branches 506 Tags 58 MiB
1885be8e36
Commit Graph

289 Commits

Author SHA1 Message Date
Josh de Leeuw
23397a0da7 finish separation of sample method #421 2017-07-06 15:48:33 -04:00
Josh de Leeuw
851467adb7 remove similarity plugin docs #403 2017-07-06 15:32:45 -04:00
Josh de Leeuw
97e2792b81 change default button label 2017-07-06 15:32:18 -04:00
kristiyip
e5228115e6 Create jspsych-iat-html.md 2017-07-06 13:59:09 -04:00
kristiyip
4ba25e3f4a Update and rename jspsych-iat.md to jspsych-iat-image.md 2017-07-06 13:59:09 -04:00
KristinDiep
d81ef7d192 Should show <p> and <span> tag in doc 2017-07-06 13:59:07 -04:00
KristinDiep
8e44f0a285 fixed doc 2017-07-06 13:59:07 -04:00
Josh de Leeuw
bd87503555 adds new plugin, fixes #409 2017-07-02 22:08:23 -04:00
Josh de Leeuw
53d98cc206 one more clarification 2017-07-01 00:26:13 -04:00
Josh de Leeuw
5964fa0c95 clarifying data handling in docs 2017-07-01 00:23:38 -04:00
Josh de Leeuw
584f702d85 remove similarity plugin docs #403 2017-06-30 23:25:49 -04:00
Josh de Leeuw
d9b3deb582 remove palmer plugin - fixes #401 
Snap library is not handling event listeners correctly, or some other
change to jsPsych broke compatibility. Either way, this plugin isn't
used enough to warrant the effort to make it compatible right now.
 2017-06-30 23:24:10 -04:00
Josh de Leeuw
bdb797f473 remove multi-picture plugin #404 2017-06-26 13:21:49 -04:00
Josh de Leeuw
47c890e429 change default button label 2017-06-26 11:46:31 -04:00
KristinDiep
b2fe7100df fixed IAT plugin and doc 2017-06-21 11:16:47 -04:00
Josh de Leeuw
48574dccab update iat to remove prompt parameter 2017-06-21 09:15:53 -04:00
Josh de Leeuw
c739dfcb3b add new sampling option, fixes #398 2017-06-20 11:40:05 -04:00
Josh de Leeuw
15c6ec4385 link to new plugins 2017-06-19 22:26:17 -04:00
Josh de Leeuw
e75004285d adding docs for #390 2017-06-19 22:26:06 -04:00
Josh de Leeuw
777446c1a7 docs and tests for #295 2017-06-19 21:49:14 -04:00
Josh de Leeuw
6cf245dd8a change text plugin interface for mouse events 2017-06-19 11:03:26 -04:00
Josh de Leeuw
c64dc38e30 fix link #227 2017-06-16 21:28:18 -04:00
Josh de Leeuw
085b53e691 update docs for data summary changes #227 2017-06-16 21:26:32 -04:00
Josh de Leeuw
4d571fee92 docs for #349 2017-06-13 10:00:58 -04:00
Josh de Leeuw
a16977e31f more docs for #325 2017-06-13 10:00:58 -04:00
Josh de Leeuw
32e9c8c803 document progress bar changes #325 2017-06-13 10:00:58 -04:00
Josh de Leeuw
4bc7920272 docs changes 2017-06-13 10:00:57 -04:00
Josh de Leeuw
ff8f006a7c add button_label documentation #365 #360 2017-06-13 10:00:57 -04:00
Josh de Leeuw
854a2d8368 docs for #361 2017-06-13 10:00:57 -04:00
Josh de Leeuw
fb7089d187 add docs for #380 2017-06-13 10:00:57 -04:00
Josh de Leeuw
149ed1eef9 documentation update for #384 2017-06-13 10:00:57 -04:00
Josh de Leeuw
7feb43c1f8 fixes #394 2017-06-13 10:00:57 -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
0ef858450c Merge branch 'master' of https://github.com/kristiyip/jsPsych 
Nee to update.
 2017-05-26 11:21:55 -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
e129f832fc update docs for removing fullscreen from ini #380 2017-05-24 22:23:54 -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
8539582705 created docs for IAT 2017-04-13 00:39:12 -04:00
KristinDiep
0b2e14781f moved age folder to imgand removed container div 2017-04-11 08:59:36 -04:00
Josh de Leeuw
84de9aed7e add resize plugin #352 2017-03-20 13:58:41 -04:00
Josh de Leeuw
f339d6d558 update docs on data storage 2017-03-20 09:44:11 -04:00
Josh de Leeuw
e5ec087990 fix preload_audio, preload_images 2017-03-06 14:58:14 -05:00
Josh de Leeuw
cbe1bb760e remove dead link 2017-03-04 09:42:38 -05:00
Josh de Leeuw
4406a6bad5 documenting new trial properties 2017-03-04 09:41:56 -05:00
Antonia Hoidal
9f515870e5 Added start and stop parameters to video plugin 2017-02-21 13:27:27 -05: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
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
Josh de Leeuw
262fd06e3c docs updates 2017-02-02 16:47:35 -05:00
aucuparia
4c2cf09b1a Update creating-a-plugin.md 
Missing word.
 2017-01-16 16:32:51 +01:00
Josh de Leeuw
c602a70116 clarify when on_data_update is called 2017-01-12 14:49:23 -05:00
Josh de Leeuw
a4ad32af66 docs updates; better RT tutorial 2017-01-12 14:44:03 -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
8b425c9a45 Merge pull request #310 from GavinQ1/master 
jspsych-form-plugin
 2017-01-04 16:05:02 -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
GavinQ1
c0a5a3ab4d support customized submit actions/better example for illustrating features 2016-12-14 15:39:58 -05:00
GavinQ1
450c923ab1 Add correct field regarding to suggestion from issue#305 2016-12-12 17:40:59 -05:00
GavinQ1
58fcd204e6 fix doc 2016-12-09 12:45:16 -05:00
GavinQ1
ce00de889c View modifications 2016-12-02 21:56:13 -05:00
Josh de Leeuw
590f5880fe more jquery removal 2016-11-28 14:59:32 -05:00
GavinQ1
ed9a6be58f Update jspsych-form.md 2016-11-25 15:59:54 -05:00
GavinQ1
a4821a4882 fix doc 2016-11-25 15:57:57 -05:00
GavinQ1
ed91a5849c fix doc 2016-11-25 15:55:47 -05:00
GavinQ1
fb4b6721af doc update 2016-11-25 15:53:51 -05:00
GavinQ1
8b0c541157 doc update 2016-11-25 15:52:35 -05:00
GavinQ1
e9a06443aa doc update 2016-11-25 15:50:39 -05:00
GavinQ1
a10e3cd7b0 doc update 2016-11-25 15:49:50 -05:00
GavinQ1
184c9f41e6 doc update 2016-11-25 15:48:50 -05:00
GavinQ1
253b6a0892 doc update 2016-11-25 15:47:18 -05:00
GavinQ1
483f2b85b4 add jspsych-form.js documentation 2016-11-25 15:36:27 -05:00
Wolfgang Walther
0bf0b6297a Copy missing plugin examples to docs 2016-10-26 14:07:08 +02:00
Wolfgang Walther
8512bee22c Docs: jspsych-survey plugins fixes 
Leftover from survey-text in survey-multi-choice
Grammar (responses / response)
 2016-10-23 18:19:45 +02:00
Wolfgang Walther
7a6ab3504d on_trial_finish callback is passed the trial_data 2016-10-23 16:53:16 +02:00
Josh de Leeuw
1b7f4f8aea documentation updates for version 6 2016-10-13 13:34:33 -04:00
Josh de Leeuw
4c8881d9c2 docs updates 2016-10-12 16:48:10 -04:00
Josh de Leeuw
c5fc6fdabf correct [ ] in docs 2016-09-01 16:56:01 -04:00
Josh de Leeuw
6286c1192e implements #287 2016-08-22 22:55:42 -04:00
Josh de Leeuw
546739bf35 change dataAsCSV and dataAsJSON to getDataAsCSV and getDataAsJSON #283 2016-08-15 18:14:41 -04:00
Josh de Leeuw
301ffbe3b3 remove doc links #283 2016-08-15 18:06:11 -04:00
Josh de Leeuw
3cfde8a504 remove data.getTrialsOfType and data.getDataByTrialIndex 2016-08-15 18:02:43 -04:00
Josh de Leeuw
2132163127 change cont_key to choices in text plugin for consistency 2016-08-12 17:01:16 -04:00
Josh de Leeuw
110b56d015 add info on repetitions for timelines 2016-08-12 10:21:31 -04:00
Josh de Leeuw
ad93ccd33a More docs on timeline variables #250 #281 2016-08-12 10:16:03 -04:00
Josh de Leeuw
15f75f6592 start documenting timeline variables #250 2016-08-11 23:32:25 -04:00
Josh de Leeuw
5fde5c27dd support exclusions for WebAudio API #253 2016-08-10 16:13:05 -04:00
Josh de Leeuw
237572c3ea first implementation of automatic exclusions #253. implements min_width and min_height. 2016-08-10 15:22:27 -04:00
Josh de Leeuw
da0ffc3b66 document central registration of timeouts #272 2016-08-10 14:17:15 -04:00
Josh de Leeuw
6d9458f746 add missing param for likert - #249 2016-08-10 13:22:46 -04:00
Josh de Leeuw
f3d36d80f9 grammar 2016-08-10 13:19:33 -04:00
Josh de Leeuw
45ffb876fd document #273 2016-08-10 13:13:52 -04:00
Josh de Leeuw
3b910469d3 standardize ALL_KEYS and NO_KEYS (#252) 2016-06-30 13:20:34 -04:00
Josh de Leeuw
bc7f0f0f1a fixes #254 2016-06-30 10:22:36 -04:00
Josh de Leeuw
2eac727b3f docs for #273 2016-06-29 23:17:27 -04:00
Josh de Leeuw
01f7782da6 Implements a solution for #228 2016-06-29 17:34:59 -04:00
Josh de Leeuw
a2e458615a implements data.ignore method (#264) 2016-06-27 22:55:35 -04:00