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
568 Commits 14 Branches 506 Tags 58 MiB
3ef2f16f22
Commit Graph

11 Commits

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