Commit Graph

  • 0663629a12 Merge pull request #55 from jodeleeuw/randomization Josh de Leeuw 2014-06-25 16:43:14 -0400
  • 0eea72adb1 add factorial method, rename simpleSample to repeat #55 Josh de Leeuw 2014-06-25 13:31:58 -0400
  • f3a514a20b add randomization module Josh de Leeuw 2014-06-25 12:27:03 -0400
  • 88b9caac91 Merge pull request #53 from jodeleeuw/centralize-key-responses Josh de Leeuw 2014-06-25 12:00:13 -0400
  • 5880398058 allow key string lookup #53 Josh de Leeuw 2014-06-25 08:58:06 -0400
  • 46bd26ed84 use getKeyboardResponse Josh de Leeuw 2014-06-24 18:42:00 -0400
  • 9469335344 a few small bugs Josh de Leeuw 2014-06-24 18:35:30 -0400
  • b913c7c9d0 bug fix in getKeyboardResponse Josh de Leeuw 2014-06-24 18:34:44 -0400
  • 85ea030ed0 wrong logical operator Josh de Leeuw 2014-06-24 16:59:39 -0400
  • f5bdd16095 update to work with new centralized keyboard response method Josh de Leeuw 2014-06-24 14:28:56 -0400
  • ba64349cb5 Adding getKeyboardResponse method to core Josh de Leeuw 2014-06-24 14:10:16 -0400
  • 8d2211b712 Add error message if plugin is not loaded Josh de Leeuw 2014-06-24 12:07:57 -0400
  • eaf6219fa5 update data saving to block.writeData Josh de Leeuw 2014-06-19 15:36:24 -0400
  • 12c527e0b4 typo fix in core.submitToTurk Josh de Leeuw 2014-06-16 09:44:51 -0400
  • ebfc6548f6 Add core.submitToTurk Josh de Leeuw 2014-06-15 12:56:03 -0400
  • decd0cf04b add jsPsych.totalTime method Josh de Leeuw 2014-06-11 23:15:17 -0400
  • b3b82db7f8 add class information to display element Josh de Leeuw 2014-06-11 16:10:35 -0400
  • cd1271b143 bug fix in example Josh de Leeuw 2014-05-23 11:37:08 -0400
  • 3dc5135f51 updating text example Josh de Leeuw 2014-05-23 11:35:37 -0400
  • 30bb35c7f0 change version to 2.4 Josh de Leeuw 2014-05-23 11:30:43 -0400
  • 7c6f4ff1a4 update example scripts to v2.4 Josh de Leeuw 2014-05-23 11:29:58 -0400
  • 4d5d5b7217 Update README.md v2.4 Josh de Leeuw 2014-05-22 09:11:05 -0400
  • 2533d9969b minor wording changes Josh de Leeuw 2014-05-21 16:41:11 -0400
  • d86c82f707 Merge pull request #47 from jodeleeuw/smart-arrays Josh de Leeuw 2014-05-21 13:31:42 -0400
  • 1f0df1f80e allow for text and data to be non-arrays for single trial block #47 Josh de Leeuw 2014-05-19 10:44:02 -0400
  • c0beee3221 handle multiple parameters with single call of enforce array Josh de Leeuw 2014-05-19 10:42:14 -0400
  • efed8009a1 delete files - from master merge Josh de Leeuw 2014-05-19 10:06:21 -0400
  • c5539da1a6 Merge branch 'master' into smart-arrays Josh de Leeuw 2014-05-19 10:05:58 -0400
  • d3d6acc4d8 remove variables option #46 Josh de Leeuw 2014-05-18 11:55:19 -0400
  • 3f25eac294 removing dev folder from master branch. see branch plugin-dev-old for recovery. Josh de Leeuw 2014-05-15 14:48:40 -0400
  • 3e36bd7b32 update to v2.3.2 Josh de Leeuw 2014-05-15 14:33:03 -0400
  • ab6c105dd1 make sure unprocessed functions get preserved in trial obj v2.3.2 Josh de Leeuw 2014-05-15 14:25:33 -0400
  • 55ebe2f413 protect check_fn in normalizeTrialVariables Josh de Leeuw 2014-05-14 15:14:08 -0400
  • a8f2a676e6 Allow for protected variables in normalizeTrialVariables Josh de Leeuw 2014-05-14 15:13:04 -0400
  • e743cd2762 add analytics code Josh de Leeuw 2014-05-14 14:55:15 -0400
  • 9c8a9acc5f removing jekyll usage Josh de Leeuw 2014-05-14 14:51:36 -0400
  • 8c16e6c422 testing jekyll version of google analytics code Josh de Leeuw 2014-05-14 14:46:38 -0400
  • 7000e656b2 update release version Josh de Leeuw 2014-05-14 12:54:23 -0400
  • b84df35eb0 Remove normalize trial variables method v2.3.1 Josh de Leeuw 2014-05-14 12:50:23 -0400
  • c88c07887c PreloadImages method will auto-flatten the input array Josh de Leeuw 2014-05-13 13:02:47 -0400
  • a855b54268 Update index.html Josh de Leeuw 2014-05-01 14:08:20 -0400
  • 8267154774 change default option for choices parameter v2.3 Josh de Leeuw 2014-05-01 13:58:32 -0400
  • e8b11ed94c Add response collection option Josh de Leeuw 2014-05-01 13:51:59 -0400
  • 49323ed040 Update index.html Josh de Leeuw 2014-05-01 07:49:49 -0400
  • 75dc0e8b57 Adding enforceArray method Josh de Leeuw 2014-04-28 16:47:15 -0400
  • 7e41142e2f Update index.html Josh de Leeuw 2014-04-03 09:32:42 -0400
  • 0424b722cb Update index.html Josh de Leeuw 2014-04-03 09:31:52 -0400
  • 7d5738aee7 Update README.md Josh de Leeuw 2014-04-03 09:21:05 -0400
  • af4dda9c86 path fix Josh de Leeuw 2014-04-02 15:16:52 -0400
  • 85412deb0a adding ref info Josh de Leeuw 2014-04-02 15:15:32 -0400
  • ae98dd029f Update README.md Josh de Leeuw 2014-04-01 11:15:20 -0400
  • d2abf5edd4 Update README.md Josh de Leeuw 2014-03-31 11:01:32 -0400
  • 8282cb3d44 add citation Josh de Leeuw 2014-03-31 10:53:47 -0400
  • 8bb2b4678d Merge pull request #38 from jodeleeuw/function-variables Josh de Leeuw 2014-03-23 21:34:35 -0400
  • 99d2692428 adding normalizeTrialVariables() call to every plugin and plugin template. addresses issue #35 #38 Josh de Leeuw 2014-03-14 13:10:33 -0400
  • 807eaeb066 Merge pull request #37 from jodeleeuw/master Josh de Leeuw 2014-03-14 11:07:07 -0400
  • c1c3a52fb8 update file for hotfix Josh de Leeuw 2014-03-03 14:37:32 -0500
  • 7277576b10 css bug #37 Josh de Leeuw 2014-03-03 14:36:47 -0500
  • 5a970c3f26 css id bug Josh de Leeuw 2014-03-03 14:33:15 -0500
  • ce4ca49554 css id bug Josh de Leeuw 2014-03-03 14:32:27 -0500
  • d7ef36f2c3 updating file to hotfix css bug Josh de Leeuw 2014-03-03 14:28:37 -0500
  • 2e9ce585c2 Fixing css id bugs Josh de Leeuw 2014-03-03 14:26:58 -0500
  • 43fac3c674 minor bug Josh de Leeuw 2014-03-03 11:59:01 -0500
  • 30df65e95b First pass at allowing functions as variables Josh de Leeuw 2014-03-03 11:47:16 -0500
  • c8cb4204d1 adding normalizeTrialVariables method Josh de Leeuw 2014-03-03 10:41:24 -0500
  • dace75f63d add Raphael.js ref Josh de Leeuw 2014-03-01 16:59:42 -0500
  • 6984c12763 fix link Josh de Leeuw 2014-03-01 16:59:02 -0500
  • b43266593d adding example of vsl-animate-occlusion Josh de Leeuw 2014-03-01 16:58:26 -0500
  • dc5081aae3 Delete jspsych-utils.js Josh de Leeuw 2014-02-28 17:47:15 -0500
  • 75a61e3abd Merge pull request #33 from jodeleeuw/merge-palmer-stimuli-function Josh de Leeuw 2014-02-28 17:46:15 -0500
  • 67910476f4 fix bug with div names #33 Josh de Leeuw 2014-02-28 17:44:44 -0500
  • 1a3ca8cc69 Add option to return flattened data object Josh de Leeuw 2014-02-28 17:07:07 -0500
  • 3090b02338 add aslin-like stimuli Josh de Leeuw 2014-02-28 13:21:10 -0500
  • bf749a30e5 add vsl-grid-scene example Josh de Leeuw 2014-02-28 13:19:23 -0500
  • 29e1e8b0e6 update to v2.2 Josh de Leeuw 2014-02-28 13:14:02 -0500
  • 9233f092a6 Get rid of palmer methods Josh de Leeuw 2014-02-24 19:15:14 -0500
  • aaace2dfe6 Adding generate_stimulus method Josh de Leeuw 2014-02-24 19:13:16 -0500
  • f5a7c09493 Update README.md v2.2 Josh de Leeuw 2014-02-21 15:43:21 -0500
  • b06a1fc5f3 Update README.md Josh de Leeuw 2014-02-21 13:25:47 -0500
  • 03f70efbe2 moving stimulus creation to a separate public function so that stimuli can be generated for other plugins Josh de Leeuw 2014-02-20 21:20:14 -0500
  • eb60da88e1 automatically center grid in container Josh de Leeuw 2014-02-20 19:04:23 -0500
  • c36c46ef25 fixing padding bug Josh de Leeuw 2014-02-20 18:20:22 -0500
  • f0e4e0f4aa Merge pull request #28 from jodeleeuw/vsl-grid-scene Josh de Leeuw 2014-02-19 14:27:11 -0500
  • 1db1cb8c52 require 0 for blank elements, so that grid size can be automatically determined #28 Josh de Leeuw 2014-02-19 14:22:36 -0500
  • 9e5592b662 initial commit of vsl-grid-scene plugin Josh de Leeuw 2014-02-19 12:12:45 -0500
  • 9f39bd80e2 closes #26 v2.1.1 Josh de Leeuw 2014-02-13 11:03:30 -0500
  • d7e93c612a Merge pull request #25 from jodeleeuw/vsl_animate_occlusion v2.1 Josh de Leeuw 2014-02-12 18:12:32 -0500
  • b56e1cc3aa adding parameter list to header doc #25 Josh de Leeuw 2014-02-12 17:46:41 -0500
  • 5e136e679a a few bug fixes Josh de Leeuw 2014-02-12 17:27:53 -0500
  • a3a08cf00c initial commit of vsl-animate-occlusion plugin Josh de Leeuw 2014-02-12 17:04:33 -0500
  • ea2c978094 css fix was applied incorrectly to survey-likert, resulting in a bug that failed to show slider labels v2.0-hotfix.1 Josh de Leeuw 2014-02-04 19:38:16 -0500
  • f27b4225a9 Merge branch 'gh-pages' of github.com:jodeleeuw/jsPsych into gh-pages Josh de Leeuw 2014-02-04 12:37:23 -0500
  • c81b1a3fa8 updating minor details in tutorial Josh de Leeuw 2014-02-04 12:34:00 -0500
  • 2104d543e7 update version number and downloads Josh de Leeuw 2014-01-29 12:55:29 -0500
  • 02229c8e3b Merge pull request #21 from jodeleeuw/rt-key-down v2.0 Josh de Leeuw 2014-01-28 11:04:54 -0800
  • 9558914b82 changing keyup to keydown #21 Josh de Leeuw 2014-01-27 15:20:03 -0500
  • f68b475552 Merge pull request #20 from jodeleeuw/timing-zero-fix Josh de Leeuw 2014-01-27 12:09:02 -0800
  • e76284acb2 fixing timing_post_trial = 0 issue #15 #20 Josh de Leeuw 2014-01-27 15:05:16 -0500
  • 76457f11be timing_post_trial fix (#15) Josh de Leeuw 2014-01-27 13:30:42 -0500
  • 1fe60bff01 timing_post_trial fix (#15) Josh de Leeuw 2014-01-23 09:44:59 -0500