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
3,894 Commits 14 Branches 506 Tags 58 MiB
main
Commit Graph

1132 Commits

Author SHA1 Message Date
Josh de Leeuw
38574f639a fixes #258 2016-05-16 13:46:28 -04:00
Matteo Visconti dOC
4eb8fece3b DOC: minor fixes to tutorial 2016-05-03 16:44:23 -04:00
Jana Klaus
388829c287 Fixed typo in plugin links 2016-03-02 18:43:19 +01:00
Jana Klaus
9ed87db59d Rename tutorial.md to flanker.md 2016-03-02 18:15:53 +01:00
Jana Klaus
c844666446 Added tutorial for flanker task 2016-03-02 18:15:23 +01:00
Jana Klaus
3b9d23b1fb Added tutorial for flanker task 2016-03-02 18:13:23 +01:00
Josh de Leeuw
d465b13a8f fixes #226 2016-01-26 08:54:17 -05:00
Josh de Leeuw
6099145133 update main page docs 2016-01-23 22:38:29 -05:00
Josh de Leeuw
0e70316256 fix missing button-response doc 2016-01-15 15:23:12 -05:00
Josh de Leeuw
ded7896208 fix docs #219 2016-01-11 10:42:17 -05:00
Josh de Leeuw
560907b0a1 docs updates 2016-01-07 12:08:44 -05:00
Josh de Leeuw
465d6f6ca8 looping and conditional timeline docs 2016-01-07 10:37:03 -05:00
Josh de Leeuw
9a85fc3392 updating plugin docs to 5.0 2016-01-07 10:18:54 -05:00
Josh de Leeuw
8bc8075026 update all features pages in docs 2016-01-07 09:08:36 -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
260132a63c rt task tutorial docs update 2016-01-06 17:18:09 -05:00
Josh de Leeuw
0a894284eb docs updates for main page, theme, and timelines 2016-01-06 09:19:35 -05:00
Josh de Leeuw
e1d9d4fb14 change tutorial for 5.0 2016-01-05 22:39:35 -05:00
Josh de Leeuw
103eaf192d updating pluginAPI module docs 2016-01-05 16:06:46 -05:00
Josh de Leeuw
17cb2cd1f7 getting data docs renamed, renaming some data functions 2016-01-05 14:36:08 -05:00
Josh de Leeuw
84df6d3c62 docs for core functions 2016-01-05 14:14:44 -05:00
Josh de Leeuw
95419af8ae renaming chunks to timeline 2016-01-05 14:04:01 -05:00
Josh de Leeuw
5ff4e2666a add randomID method (#214) 2016-01-05 13:31:52 -05:00
Josh de Leeuw
b289e182d5 allow end_message in endExperiment (#213) 2016-01-05 13:16:56 -05:00
Josh de Leeuw
d917f74d3a implements URL variables (#192) 2016-01-05 12:09:17 -05:00
Josh de Leeuw
9a9b7bba7a adds dataAsJSON (#212) 2016-01-05 11:34:53 -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
a042a0d63d updating preloading docs 2015-12-17 15:24:00 -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
e99fb56fd3 implement fullscreen option (#199) 2015-12-08 11:46:31 -05:00
Josh de Leeuw
ccf69aaa3d document key code conversion (#149) 2015-12-08 09:48:11 -05:00
Josh de Leeuw
d2741c65f8 fixes docs #182 2015-12-07 16:51:45 -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
09a1f2c11a fix img path (#166) 2015-12-07 15:46:25 -05:00
Josh de Leeuw
1698c6ac71 fix bad links (#171) 2015-12-07 15:45:14 -05:00
Josh de Leeuw
6b9973208a data.addProperties in docs (fixes #178) 2015-12-07 15:43:29 -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
d568fb9b16 Update mkdocs index 2015-09-10 14:26:55 -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
ad6159d61c fix go/no-go docs; add example 2015-07-17 08:54:15 -04:00
Josh de Leeuw
8004f5ccea update icon 2015-07-08 09:20:55 -04:00
Josh de Leeuw
8500b18c87 add favicon 2015-07-08 09:16:21 -04:00
Josh de Leeuw
0c957d8705 update version info 2015-06-29 09:32:30 -04:00
Josh de Leeuw
1b37453a43 implements #153 2015-06-26 16:55:13 -04:00
Josh de Leeuw
9074c42e63 implements #148 2015-06-26 15:52:15 -04:00
Josh de Leeuw
3ef2f16f22 implements #144 2015-06-26 15:30:26 -04:00
Josh de Leeuw
81e1beeb0f docs for #152 2015-06-12 13:06:39 -04:00
Josh de Leeuw
b132e2a137 Merge pull request #151 from jodeleeuw/master 
merge master updates into dev
 2015-06-12 12:49:57 -04:00
Josh de Leeuw
c091cbaa28 fix bug in endExperiment 
caused on_finish handler to fire twice
 2015-06-08 12:39:33 -04:00
Josh de Leeuw
29fefd874a update docs url 2015-06-08 09:56:06 -04:00
Josh de Leeuw
cfe8c17c19 implements #145 
includes docs update
 2015-06-04 15:55:49 -04:00
Josh de Leeuw
3e9a945bbc update release info in docs 2015-06-02 09:32:26 -04:00
Josh de Leeuw
611280d40d reduce image size 2015-05-29 08:31:52 -04:00
Josh de Leeuw
c0e5a86d86 update download link in docs 2015-05-29 08:28:41 -04:00
Josh de Leeuw
fb20caeb27 update tutorial examples for 4.2 2015-05-29 08:27:54 -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
3d597a8f52 implements #107 2015-05-28 13:14:22 -04:00
Josh de Leeuw
eff15d8fa6 fixes #116 2015-05-28 12:45:43 -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
Josh de Leeuw
9acb625d21 fixes #132 2015-05-15 16:33:34 -04:00
Josh de Leeuw
d3f0c7d295 add docs for #137 2015-05-15 16:04:37 -04:00
Josh de Leeuw
bf9a0e9591 documenting changes from #136 2015-05-15 15:02:14 -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
0bd7a3f5d4 update version 2015-02-19 12:24:12 -05:00
Josh de Leeuw
49f1c09282 add examples 2015-02-19 11:45:41 -05:00
Josh de Leeuw
4a04c8bded add docs about auto loading audio 2015-02-19 10:19:41 -05:00
Josh de Leeuw
7f77cfe5b1 update cite info 2015-02-18 18:37:33 -05:00
Josh de Leeuw
7b471950a0 update cite info 2015-02-18 18:29:46 -05:00
Josh de Leeuw
a6df7ee289 fix typo 2015-02-18 15:08:29 -05:00
Josh de Leeuw
22748866b3 update example php 
issue #110
 2015-02-18 11:22:43 -05:00
Josh de Leeuw
be74b923ec modify docs for snapsvg 
issue #113
 2015-02-18 11:16:35 -05:00
Josh de Leeuw
c780dd4557 add sample method 
issue #102
 2015-02-05 17:19:08 -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
1850f94128 docs for randomization.shuffle 
issue #100
 2015-02-05 16:55:39 -05:00
Josh de Leeuw
e00b60c570 fix documentation 
issue #97
 2014-11-13 08:43:02 -05:00
Josh de Leeuw
115aac3a2c update version info 2014-11-10 09:20:19 -05:00
Josh de Leeuw
ae9877b8d1 Merge pull request #89 from jodeleeuw/dev 
Dev
 2014-11-10 09:14:53 -05:00
Josh de Leeuw
ae6c9febda add multi-tim-multi-response docs 2014-11-10 09:10:57 -05:00
Josh de Leeuw
bacaa87072 add go/no-go task tutorial to docs 2014-11-06 09:44:03 -05:00
Josh de Leeuw
3b824abb62 added hello world tutorial to docs 2014-10-24 15:04:49 -04:00
Josh de Leeuw
c8fffcea56 link fixes 2014-10-22 15:11:40 -04:00
Josh de Leeuw
0adca68901 add download link to docs index 2014-10-22 11:01:50 -04:00
Josh de Leeuw
5a61462c60 add analytics to docs 2014-10-21 13:23:50 -04: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
Josh de Leeuw
46792fddf5 Update and rename jspsych-suvey-likert.md to jspsych-survey-likert.md 2014-10-20 15:00:33 -04:00
Josh de Leeuw
8e6e0550bc Update contributing.md 2014-10-20 12:58:41 -04:00
Josh de Leeuw
1887be0dd4 add info about callback functions 2014-10-20 12:02:44 -04:00
Josh de Leeuw
ce9dd191ee more docs! 2014-10-17 16:46:42 -04:00
Josh de Leeuw
7ed0ba70c6 adding more plugin docs 2014-10-17 15:03:35 -04:00
Josh de Leeuw
8f33110def core doc update 2014-10-17 11:48:51 -04:00
Josh de Leeuw
92219b75d0 more docs updates 2014-10-17 10:48:39 -04:00
Josh de Leeuw
f5aa15348d Update randomization-repetition.md 2014-10-16 20:46:28 -04:00
Josh de Leeuw
08f77beca3 Update randomization-repetition.md 2014-10-16 20:45:59 -04:00
Josh de Leeuw
9ec7bf230c Update mturk.md 2014-10-16 20:43:05 -04:00
Josh de Leeuw
6e637de614 Update overview.md 2014-10-16 19:26:06 -04:00
Josh de Leeuw
0d131c26d1 Update jspsych-pluginAPI.md 2014-10-16 19:19:31 -04:00
Josh de Leeuw
ec5caa3c78 adding pluginAPI docs 2014-10-16 16:43:36 -04:00
Josh de Leeuw
bfed3e8cfa adding data module docs 2014-10-16 14:37:06 -04:00
Josh de Leeuw
be2ead4cd6 clean up pages without content 2014-10-16 13:01:53 -04:00
Josh de Leeuw
48ac399886 adding randomization and turk module docs 2014-10-16 12:42:15 -04:00
Josh de Leeuw
070dbf68c4 add support doc 2014-10-16 10:28:31 -04:00
Josh de Leeuw
7259badd35 add docs for categorize plugin 2014-10-16 10:11:02 -04:00
Josh de Leeuw
51716711d1 doc updates, rename reps -> sequence_reps 2014-10-16 09:32:21 -04:00
Josh de Leeuw
7beb851b7d add call-function doc 2014-10-16 08:41:59 -04:00
Josh de Leeuw
a3cd98921c adding documentation files 2014-10-15 17:44:41 -04:00