Commit Graph

  • 6927c290df bug fix categorize-feedback Josh de Leeuw 2013-10-10 12:28:19 -0400
  • 947b326706 bug fix categorize-feedback Josh de Leeuw 2013-10-10 12:26:47 -0400
  • 80e9753123 bug fix categorize-feedback Josh de Leeuw 2013-10-10 12:12:26 -0400
  • b0986a1a19 bug fix utils Josh de Leeuw 2013-10-10 12:05:21 -0400
  • 48d8685157 added the ability to display html content instead of an image in the categorize-feedback plugin Josh de Leeuw 2013-10-10 11:36:29 -0400
  • e76c1e36ee added utility function to draw svg version of palmer stim Josh de Leeuw 2013-10-10 10:43:02 -0400
  • cf3e135646 palmer plugin bug fix Josh de Leeuw 2013-10-09 21:46:55 -0400
  • 39311fd6f3 palmer plugin bug fix Josh de Leeuw 2013-10-09 21:41:12 -0400
  • 8ad8ae923f palmer plugin bug fix Josh de Leeuw 2013-10-09 21:35:48 -0400
  • 9bc94f4415 Added jspysch-palmer plugin Josh de Leeuw 2013-10-08 13:03:57 -0400
  • dffff5f334 adding trial_index as a default data type v1.53 Josh de Leeuw 2013-09-26 21:36:52 -0400
  • 4f8b71c7e9 fixing bugs in staircase-categorize Josh de Leeuw 2013-09-18 14:42:49 -0400
  • bb0a4c913f fixing bugs in staircase-categorize Josh de Leeuw 2013-09-18 14:41:42 -0400
  • 080b510bb9 fixing bugs in staircase-categorize Josh de Leeuw 2013-09-18 14:02:41 -0400
  • fc10f0e79b fixing bugs in staircase-categorize Josh de Leeuw 2013-09-18 13:45:10 -0400
  • 5de8e9b42d fixing length bug in staircase-categorize Josh de Leeuw 2013-09-18 13:40:50 -0400
  • 239d6f8069 adding staircase plugin take 2 Josh de Leeuw 2013-09-17 13:53:36 -0400
  • 66a4fdce13 adding staircase plugins Josh de Leeuw 2013-09-17 13:49:14 -0400
  • 61a4a60c61 fix trial type bug in animation plugin v1.52 Josh de Leeuw 2013-03-25 14:48:56 -0400
  • 5a81648c05 add likert and survey text Josh de Leeuw 2013-03-20 21:12:28 -0400
  • 4150f682f4 ignore ds_store Josh de Leeuw 2013-03-06 13:42:42 -0500
  • a4bfaf65d0 adding common data to plugins Josh de Leeuw 2013-03-06 13:42:17 -0500
  • 79cb5911bc added likert scale plugin, modified categorization plugin Josh de Leeuw 2013-03-06 12:56:27 -0500
  • 6b71893068 updating xab plugin to have more options for presentation v1.51 Josh de Leeuw 2013-02-19 17:22:20 -0500
  • 04b981f3a9 bug fix v1.50 Josh de Leeuw 2013-01-24 15:54:58 -0500
  • c43247eae6 tidying up plugins Josh de Leeuw 2013-01-24 15:24:03 -0500
  • 9651f983a2 1/21/2013 Josh de Leeuw 2013-01-21 18:45:03 -0500
  • 25509c9f86 replaced all references to $this with display_element Josh de Leeuw 2013-01-18 14:26:08 -0500
  • 42d78b3510 added options to si-kr plugin Josh de Leeuw 2013-01-18 14:24:09 -0500
  • a08dbc7029 created jspsych-utils.js Josh de Leeuw 2013-01-18 13:00:33 -0500
  • 34cffa2b14 moved plugins to /plugins Josh de Leeuw 2013-01-18 12:41:41 -0500
  • d5598e3fff v1.08 v1.08 Josh de Leeuw 2013-01-14 11:01:14 -0500
  • d073e8834b added twoimage-keyresponse Josh de Leeuw 2012-11-01 14:40:05 -0400
  • be236ba383 renamed categorize-unknown to singleimage-keyresponse Josh de Leeuw 2012-11-01 14:11:33 -0400
  • 4d24a107a8 added ballistic-match-2, experimental plugin v1.07 Josh de Leeuw 2012-10-18 20:35:28 -0400
  • dcaeb9b65e bug fix to ballistic-match v1.06 Josh de Leeuw 2012-10-01 18:13:07 -0400
  • beb94dd459 changed timing options for xab, sim v1.05 Josh de Leeuw 2012-09-28 14:38:17 -0400
  • dd7b4a4a77 Update index.html Josh de Leeuw 2012-09-27 15:55:11 -0300
  • 9007a6a996 Create gh-pages branch via GitHub Josh de Leeuw 2012-09-27 11:26:03 -0700
  • eddc53f91a update to 1.04 v1.04 Josh de Leeuw 2012-09-25 18:43:19 -0400
  • ef9007fbcd changed score data to sim_score data v1.03 Josh de Leeuw 2012-09-13 17:28:23 -0400
  • 236f7ce4c5 custom labels option for similarity plugin Josh de Leeuw 2012-09-13 17:26:16 -0400
  • 3d17d5c2ee changed similarity label to "identical" Josh de Leeuw 2012-09-13 17:24:30 -0400
  • 3aeae053a0 changed data storage for free-sort to use JSON encoding Josh de Leeuw 2012-09-13 17:23:25 -0400
  • 4c7463273b started work on freepick touch plugin Josh de Leeuw 2012-09-11 13:11:05 -0400
  • ca38b559f1 Added extensive commenting to text plugin Josh de Leeuw 2012-09-11 13:10:40 -0400
  • 817c9f4118 bug fix active-match Josh de Leeuw 2012-09-06 17:18:29 -0400
  • fc6321de8a minor commenting Josh de Leeuw 2012-09-06 16:35:05 -0400
  • 691e8086ff call-func fix; added active-match v1.02 Josh de Leeuw 2012-08-22 12:09:06 -0400
  • 9086cf59ce Update README.md v1.01 Josh de Leeuw 2012-07-26 17:52:35 -0300
  • 4ea424b465 added variables option to jspsych-text Josh de Leeuw 2012-07-26 16:02:11 -0400
  • 15cc690a9f added force_refresh option to -html plugin Josh de Leeuw 2012-07-25 15:13:11 -0400
  • f7bc23c741 fixed bug in call-function Josh de Leeuw 2012-07-24 13:23:51 -0400
  • 711959ce83 ensure that user defined prompt is removed in XAB Josh de Leeuw 2012-07-24 12:43:10 -0400
  • a0f0eb367e added default repetitions=1 to jspsych-animation Josh de Leeuw 2012-07-23 17:38:00 -0400
  • d2d06d0772 added prompt option to XAB Josh de Leeuw 2012-07-23 17:14:50 -0400
  • 8b7e9f0aa9 bug fix in call-function v1.0 Josh de Leeuw 2012-07-20 13:30:18 -0400
  • caaab0b84f added options to categorize-animation Josh de Leeuw 2012-07-20 12:02:42 -0400
  • 871ba7a897 added jspsych-free-sort Josh de Leeuw 2012-07-19 14:18:50 -0400
  • 2f0d6c7e1e bug fix - moved where on_trial_finish is called to ensure it is called at the end of every trial Josh de Leeuw 2012-07-17 18:49:46 -0400
  • 946f1aeea0 bug fixes for callback methods in previous commit Josh de Leeuw 2012-07-17 18:13:52 -0400
  • 19983090a8 Added optional callback methods for tiral start and trial finish events in core library. Josh de Leeuw 2012-07-17 18:05:09 -0400
  • b33ab88b22 Added core.progress Josh de Leeuw 2012-07-17 17:51:17 -0400
  • b8a72862cf added keys option to XAB Josh de Leeuw 2012-07-17 16:24:25 -0400
  • 39846f1754 recommit of previous commit since nothing was changed... Josh de Leeuw 2012-07-12 13:22:06 -0400
  • ef9a605cd8 misc changes / additions (see extended description) Josh de Leeuw 2012-07-12 13:18:35 -0400
  • fbe4b3ea3e html plugin accepts an check function now, that is called before proceeding. Erik Weitnauer 2012-07-11 11:07:33 -0400
  • 41519c5079 added plugin that can load and display an html page Erik Weitnauer 2012-07-10 15:52:11 -0400
  • dc6a9761f3 plugin changes Josh de Leeuw 2012-07-05 12:31:13 -0400
  • 3c04677878 added core.data() Josh de Leeuw 2012-07-05 12:30:36 -0400
  • 17b9f5bd6d remove json Josh de Leeuw 2012-06-29 13:21:00 -0400
  • 338a21d199 breaking change Josh de Leeuw 2012-06-29 13:16:08 -0400
  • de1087dc26 Update README.md Josh de Leeuw 2012-06-01 12:48:47 -0300
  • ed5034bbd0 Minor bug corrections Josh de Leeuw 2012-05-24 16:51:03 -0400
  • 8bd466c18f Merge branch 'HEAD' of git@github.com:jodeleeuw/jsPsych.git Josh de Leeuw 2012-05-23 12:19:40 -0400
  • 94610dbccc Fixing some bugs due to change in the plugin structure. Josh de Leeuw 2012-05-23 12:18:57 -0400
  • 90c3780a17 Update README.md jodeleeuw 2012-05-17 15:20:46 -0300
  • befdcfc1cd Rescoped everything so that jsPsych is not a jQuery plugin. Josh de Leeuw 2012-05-17 09:19:04 -0400
  • 1d1a9c7e34 Merge branch 'HEAD' of git@github.com:jodeleeuw/jsPsych.git Josh de Leeuw 2012-05-15 18:20:42 -0400
  • f108daddb9 md fix? Josh de Leeuw 2012-05-15 18:19:41 -0400
  • 4f31bb928c Update README jodeleeuw 2012-05-15 19:18:56 -0300
  • be43a59267 editing readme Josh de Leeuw 2012-05-15 18:02:36 -0400
  • a056b6e69c missed the animation and touch plugins in previous changes. Josh de Leeuw 2012-05-15 16:10:10 -0400
  • 9c94b4d0b6 Reworking the plugin structure to use the Module javascript design pattern. Josh de Leeuw 2012-05-15 16:03:26 -0400
  • 9c8884f356 removed showImage and showImages from jspsych.js Josh de Leeuw 2012-05-14 15:41:15 -0400
  • 6656564b63 Fixed IE bugs in animation, categorization, and xab versions. Josh de Leeuw 2012-05-14 15:28:20 -0400
  • c3a42dc358 Lots of changes: Josh de Leeuw 2012-05-14 15:11:48 -0400
  • 5ffc885139 added a touch version of the xab task (click on the target instead of pressing a key) Josh de Leeuw 2012-04-23 20:56:18 -0400
  • 78317f4f9f Merge branch 'HEAD' of https://jodeleeuw@bitbucket.org/dhendrickson/jspsych.git Josh de Leeuw 2012-04-19 14:12:47 -0400
  • e556be06c9 Two changes: Josh de Leeuw 2012-04-19 14:11:12 -0400
  • dea7cac8e2 spelling corrections. Drew Hendrickson 2012-04-18 15:00:13 -0400
  • 93e8b899da added README file. Drew Hendrickson 2012-04-18 14:46:10 -0400
  • cf073155b6 minor changes Josh de Leeuw 2012-04-05 17:14:27 -0400
  • e88a1b052f Suite of bugfixes and changes related to same-different and animation plugin. Animation plugin is a complete redesign that removes dependency on the canimate.js library. Josh de Leeuw 2012-04-05 14:00:20 -0400
  • 6969fbcdc9 Added jspsych-animation, a plugin for trials that involve animation. Given a set of images, the plugin will show an animation of those images at a user specified rate. Josh de Leeuw 2012-03-30 12:11:10 -0400
  • dfb0642ec2 verifying git setup Josh de Leeuw 2012-03-30 10:15:53 -0400
  • ee8de223d5 code directly from Josh Drew Hendrickson 2012-03-26 23:32:21 -0400