HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-11 16:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,441 Commits 14 Branches 506 Tags 58 MiB
3c0f557d13
Commit Graph

158 Commits

Author SHA1 Message Date
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
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
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
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
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
45af5158e9 fixes #311 2017-01-06 12:10:04 -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
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
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
Josh de Leeuw
6286c1192e implements #287 2016-08-22 22:55:42 -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
6d9458f746 add missing param for likert - #249 2016-08-10 13:22:46 -04:00
Josh de Leeuw
3b910469d3 standardize ALL_KEYS and NO_KEYS (#252) 2016-06-30 13:20:34 -04:00
Josh de Leeuw
e17882c46a minor doc fix 2016-06-27 16:28:53 -04:00
Josh de Leeuw
093c58cebb documentation error - fixes #263 2016-06-15 10:09:27 -04:00
Josh de Leeuw
5bd6756ba6 adds video plugin (#162) 2016-06-15 10:05:36 -04:00
Josh de Leeuw
faea546f94 implements #248 2016-05-21 17:22:36 -04:00
Josh de Leeuw
8aa1641d9f Fixes #246 2016-05-21 17:18:05 -04:00
Josh de Leeuw
2d60aa2071 fixes #245 2016-05-21 16:42:55 -04:00
Josh de Leeuw
560907b0a1 docs updates 2016-01-07 12:08:44 -05:00
Josh de Leeuw
9a85fc3392 updating plugin docs to 5.0 2016-01-07 10:18:54 -05:00
Josh de Leeuw
28be553dd0 lots of docs updates to get plugin pages to 5.0 2016-01-06 23:15:02 -05:00
Josh de Leeuw
77a29acfd7 siphon plugins into .plugins namespace (#184) 2016-01-05 10:16:58 -05:00
Josh de Leeuw
fbc1fa2a9c various docs updates, especially converting to new mkdocs format 2016-01-05 10:06:36 -05:00
Josh de Leeuw
59d2e0b451 update plugins to match timeline node method 2015-12-14 16:56:20 -05:00
Josh de Leeuw
82ce051210 Merge pull request #167 from vergenzt/same-different-self-pacing 
Improvements to same-different plugin
 2015-12-08 16:44:25 -05:00
Josh de Leeuw
a96d927629 add multi-choice plugin, modify multi-stim-multi-response 
supersedes #174 & #177
 2015-12-08 15:13:16 -05:00
Josh de Leeuw
1a99f966be major changes for likert scale (#169) 2015-12-08 12:44:29 -05:00
Josh de Leeuw
14a6f0e1f2 update docs for #176 2015-12-07 16:49:49 -05:00
Josh de Leeuw
234173d090 wrong plugin name (#186) 2015-12-07 15:51:36 -05:00
Josh de Leeuw
1698c6ac71 fix bad links (#171) 2015-12-07 15:45:14 -05:00
Josh de Leeuw
f1c7d39630 implements #191 2015-10-19 11:56:43 -04:00
Shane Martin
370c60ef0e Merge branch 'feature-1' into develop 2015-09-23 10:18:43 -04:00
Shane Martin
e8cc6a5686 Add HTML5-based validation parameter 2015-09-23 10:18:30 -04:00
Shane Martin
b555b93577 Revert "Revert "Update docs"" 
This reverts commit f0fdde1cfe.
 2015-09-11 11:34:28 -04:00
Shane Martin
f0fdde1cfe Revert "Update docs" 
This reverts commit 3ba7edd124.
 2015-09-10 14:21:41 -04:00
Shane Martin
2b0dcebd24 Add documentation 2015-09-10 14:16:33 -04:00
Shane Martin
3ba7edd124 Update docs 2015-08-28 15:51:19 -04:00
Tim Vergenz
aabf545cd7 same-different: Add answer field to collected data 2015-08-08 08:29:36 -04:00
Tim Vergenz
ec01a356b7 same-different: Fix docs inconsistency issue 2015-08-08 08:29:36 -04:00
Tim Vergenz
6171a8bfcd same-different: Allow self-pacing for first stimulus 2015-08-08 08:29:36 -04:00
Josh de Leeuw
3fa2e3def0 button-response plugin #161 2015-07-17 10:17:11 -04:00
Josh de Leeuw
9074c42e63 implements #148 2015-06-26 15:52:15 -04:00
Josh de Leeuw
cfe8c17c19 implements #145 
includes docs update
 2015-06-04 15:55:49 -04:00
Josh de Leeuw
c575d03bdf Merge branch 'dev' 
Conflicts:
	docs/markdown_docs/features/data.md
	docs/markdown_docs/plugins/jspsych-survey-likert.md
 2015-05-28 14:44:25 -04:00
Josh de Leeuw
98f99782ee minor docs updates 2015-05-28 14:41:18 -04:00
Josh de Leeuw
7051e3354f implements #121 2015-05-28 13:46:02 -04:00
Josh de Leeuw
ba9f1bcb9c docs for #130 2015-05-28 09:31:48 -04:00
Josh de Leeuw
723052b578 add instructions plugin 2015-05-27 12:10:33 -04:00
Josh de Leeuw
13906d27c8 fixes #141 2015-05-27 09:33:33 -04:00
Josh de Leeuw
d95b884c5a fixes #129 2015-05-27 09:06:41 -04:00
Josh de Leeuw
744308e763 Merge remote-tracking branch 'origin/dev' into dev 
Conflicts:
	docs/markdown_docs/plugins/jspsych-survey-likert.md
	docs/markdown_docs/plugins/jspsych-survey-text.md
 2015-05-27 09:02:40 -04:00
Josh de Leeuw
13b4d48cb4 fixes #139 2015-05-27 09:01:39 -04:00
Josh de Leeuw
c56cb5581d Fixes #120 2015-05-20 22:29:55 -04:00
Josh de Leeuw
d3e14230d5 Fixes #138 2015-05-20 22:25:19 -04:00
dgromer
53e88f22e2 Set link protocol in docs to https 2015-03-29 15:41:11 +02:00
Josh de Leeuw
dafb64fbd8 resolve merge conflict 2015-02-19 12:31:29 -05:00
Josh de Leeuw
49f1c09282 add examples 2015-02-19 11:45:41 -05:00
Josh de Leeuw
a6df7ee289 fix typo 2015-02-18 15:08:29 -05:00
Josh de Leeuw
be74b923ec modify docs for snapsvg 
issue #113
 2015-02-18 11:16:35 -05:00
Josh de Leeuw
f952f5ccf7 html plugin check_fn returns true by default 
issue #106
 2015-02-05 17:03:31 -05:00
Josh de Leeuw
e00b60c570 fix documentation 
issue #97
 2014-11-13 08:43:02 -05:00
Josh de Leeuw
ae6c9febda add multi-tim-multi-response docs 2014-11-10 09:10:57 -05:00
Josh de Leeuw
5728668ce5 lots of docs 2014-10-21 13:07:41 -04:00
Josh de Leeuw
16a91b8113 Update jspsych-visual-search-circle.md 2014-10-20 16:04:48 -04:00
Josh de Leeuw
7684463cd7 Update jspsych-survey-text.md 2014-10-20 15:25:02 -04:00
Josh de Leeuw
9043e05e87 Update jspsych-survey-likert.md 2014-10-20 15:17:48 -04:00