HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 19:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
965 Commits 14 Branches 506 Tags 58 MiB
262fd06e3c
Commit Graph

37 Commits

Author SHA1 Message Date
Josh de Leeuw
262fd06e3c docs updates 2017-02-02 16:47:35 -05: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
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
Josh de Leeuw
590f5880fe more jquery removal 2016-11-28 14:59:32 -05:00
Wolfgang Walther
7a6ab3504d on_trial_finish callback is passed the trial_data 2016-10-23 16:53:16 +02:00
Josh de Leeuw
4c8881d9c2 docs updates 2016-10-12 16:48:10 -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
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
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
38574f639a fixes #258 2016-05-16 13:46:28 -04:00
Josh de Leeuw
ded7896208 fix docs #219 2016-01-11 10:42:17 -05:00
Josh de Leeuw
465d6f6ca8 looping and conditional timeline docs 2016-01-07 10:37:03 -05:00
Josh de Leeuw
8bc8075026 update all features pages in docs 2016-01-07 09:08:36 -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
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
e99fb56fd3 implement fullscreen option (#199) 2015-12-08 11:46:31 -05:00
Josh de Leeuw
d2741c65f8 fixes docs #182 2015-12-07 16:51:45 -05:00
Josh de Leeuw
6b9973208a data.addProperties in docs (fixes #178) 2015-12-07 15:43:29 -05: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
7051e3354f implements #121 2015-05-28 13:46:02 -04:00
Josh de Leeuw
9acb625d21 fixes #132 2015-05-15 16:33:34 -04:00
Josh de Leeuw
22748866b3 update example php 
issue #110
 2015-02-18 11:22:43 -05:00
Josh de Leeuw
1887be0dd4 add info about callback functions 2014-10-20 12:02:44 -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
be2ead4cd6 clean up pages without content 2014-10-16 13:01:53 -04:00
Josh de Leeuw
a3cd98921c adding documentation files 2014-10-15 17:44:41 -04:00