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

73 Commits

Author SHA1 Message Date
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