Commit Graph

  • b6db7c08f9 fixing issues with 0 as timing parameter (#15) Josh de Leeuw 2014-01-22 23:28:14 -0500
  • f906a7b8d5 Merge pull request #18 from jodeleeuw/css-cleanup Josh de Leeuw 2014-01-22 20:19:05 -0800
  • 36f5757a66 css cleanup (#13) #18 Josh de Leeuw 2014-01-22 23:15:59 -0500
  • 968b4ea549 css cleanup (#13) Josh de Leeuw 2014-01-22 19:04:26 -0500
  • 53ad86bf20 css cleanup (#13) Josh de Leeuw 2014-01-22 18:36:12 -0500
  • 124840d9fa css cleanup (#13) Josh de Leeuw 2014-01-20 16:17:37 -0500
  • 98e9f43af0 css cleanup (#13) Josh de Leeuw 2014-01-20 16:12:15 -0500
  • a1d882d385 cleanup css (#13) Josh de Leeuw 2014-01-20 14:43:28 -0500
  • 54c0043e62 update css (#13) Josh de Leeuw 2014-01-17 17:22:41 -0500
  • 719b5c9196 cleanup css (#13) Josh de Leeuw 2014-01-17 16:17:18 -0500
  • 6c3c49af33 cleanup css names (#13) Josh de Leeuw 2014-01-17 16:15:16 -0500
  • e2e60e8048 Change from keyup to keydown v1.8.1-fix Josh de Leeuw 2014-01-16 10:08:56 -0500
  • 42d0fc3ef5 update download link to v1.8.1 Josh de Leeuw 2014-01-13 18:12:35 -0500
  • c118a4034c Merge pull request #14 from jodeleeuw/animation-rework v1.8.1 Josh de Leeuw 2014-01-13 12:07:26 -0800
  • 9aa76d17ae testing new features of animation Josh de Leeuw 2014-01-13 15:03:20 -0500
  • 39e0134e2b update animation plugin to test branch version Josh de Leeuw 2014-01-13 15:01:09 -0500
  • 478da23caf record current stim in response #14 Josh de Leeuw 2014-01-13 14:42:37 -0500
  • 4943c140ec adding response collection capability, ability to add blank interval between frames Josh de Leeuw 2014-01-13 14:35:04 -0500
  • 5554018c6b adding response collection capability, ability to add blank interval between frames Josh de Leeuw 2014-01-13 14:29:17 -0500
  • 0c2fdbd2e8 testing branch setup on cloud9 Josh de Leeuw 2014-01-13 13:37:37 -0500
  • af466e78c5 updating to download link to v1.8 Josh de Leeuw 2013-12-16 15:13:58 -0500
  • f74752a23f updating header doc v1.8 Josh de Leeuw 2013-12-10 13:02:52 -0500
  • 0da9a164a3 moving visibility reveal after content is updated Josh de Leeuw 2013-12-10 13:00:05 -0500
  • 90cc26a44e visible property bug Josh de Leeuw 2013-12-10 12:33:28 -0500
  • fae8ee7880 fixing height of labels container Josh de Leeuw 2013-12-10 11:27:14 -0500
  • 6aed75b9d1 revising sim plugin to provide more flexibility in how the trial unfolds - related to #12 Josh de Leeuw 2013-12-10 11:21:20 -0500
  • 88f7c9aa70 updating to v1.7 Josh de Leeuw 2013-12-07 15:11:55 -0500
  • 07a667307b rt was not being recorded correctly when continue_after_response was false v1.7 Josh de Leeuw 2013-12-07 15:02:51 -0500
  • 1c3a0bab9a bug fix with continue_after_response Josh de Leeuw 2013-12-05 20:50:15 -0500
  • 7553c98bcd bug fix with continue_after_response Josh de Leeuw 2013-12-05 20:45:51 -0500
  • 09af7112ec moving categorize animation into the main folder Josh de Leeuw 2013-12-03 12:21:31 -0500
  • d637f9c86b changed wrong file - oops Josh de Leeuw 2013-12-03 12:17:51 -0500
  • 0b34e7f3e8 updating script Josh de Leeuw 2013-12-03 12:17:05 -0500
  • 6f536b0999 fixing the instructions Josh de Leeuw 2013-12-03 12:01:44 -0500
  • 0ca41e8d2e preloading images Josh de Leeuw 2013-12-03 11:59:05 -0500
  • 5eb4be654f fixing stylesheet move Josh de Leeuw 2013-12-03 11:55:57 -0500
  • 0a9a9da73e updating script Josh de Leeuw 2013-12-03 11:54:47 -0500
  • d52f3fe070 adding cat-animation plugin file Josh de Leeuw 2013-12-03 11:52:34 -0500
  • 48b8571d46 adding categorize-animation example Josh de Leeuw 2013-12-03 11:51:12 -0500
  • 31347c15d6 updating categorize-animation plugin to match standards of other plugins Josh de Leeuw 2013-12-03 11:00:23 -0500
  • 99e7cb58ba Adding an extra value for identifying when page is loaded outside of Turk context (relevant to #10) Josh de Leeuw 2013-11-21 15:08:20 -0500
  • b6a89b935c Adding jsPsych.turkInfo() method (addresses issue #10) Josh de Leeuw 2013-11-20 15:07:32 -0500
  • 4bdf7a2dce fixing naming of stimulus elements in data Josh de Leeuw 2013-11-18 22:24:36 -0500
  • 635bfadf92 Adding a template for creating a new plugin Josh de Leeuw 2013-11-18 12:17:49 -0500
  • 60ef236dc6 Merge branch 'master' of github.com:jodeleeuw/jsPsych Josh de Leeuw 2013-11-14 11:42:56 -0500
  • 5e75ea964d Adding a keydown requirement so that plugin will not advance if key is already pressed when user arrives at plugin page Josh de Leeuw 2013-11-14 11:40:32 -0500
  • d6c02e7361 Update README.md Josh de Leeuw 2013-11-13 11:58:58 -0500
  • 18850e664e Update README.md Josh de Leeuw 2013-11-13 11:58:10 -0500
  • df40d45c37 zip icon Josh de Leeuw 2013-11-13 11:25:37 -0500
  • 65d84a7690 missing files? Josh de Leeuw 2013-11-13 11:24:19 -0500
  • 5019361fe6 fixing disappearing scripts Josh de Leeuw 2013-11-13 11:22:29 -0500
  • 4ce268651b Adding download for tutorial Josh de Leeuw 2013-11-13 11:21:31 -0500
  • da9c19aa75 quote fix Josh de Leeuw 2013-11-12 14:33:00 -0500
  • 6f3976a5f9 adding part1 of tutorial Josh de Leeuw 2013-11-12 14:32:04 -0500
  • 915d3e928b updating the latest version info Josh de Leeuw 2013-11-12 14:10:39 -0500
  • ca80074f7f adding images Josh de Leeuw 2013-11-12 13:50:28 -0500
  • 04a54f8461 adding single-stim example Josh de Leeuw 2013-11-12 13:45:51 -0500
  • 3a0944215a ; Josh de Leeuw 2013-11-12 13:13:31 -0500
  • 64f977c0ca adding preloading for images Josh de Leeuw 2013-11-12 13:11:10 -0500
  • dfb036c1be weird disappearing bug... Josh de Leeuw 2013-11-12 12:52:46 -0500
  • 448c19a376 title fix Josh de Leeuw 2013-11-12 12:47:17 -0500
  • d4fb9a906f adding preloading Josh de Leeuw 2013-11-12 12:46:51 -0500
  • 51020fea6b adding preloading Josh de Leeuw 2013-11-12 12:46:21 -0500
  • 93e2ec17bc copying over library update Josh de Leeuw 2013-11-12 12:44:27 -0500
  • c05bce5390 style update Josh de Leeuw 2013-11-12 12:41:55 -0500
  • 86695cca8a adding xab example Josh de Leeuw 2013-11-12 12:41:05 -0500
  • f8f7904e41 adding margin to img Josh de Leeuw 2013-11-12 12:24:20 -0500
  • 2ea5b729b3 copying over updated similarity plugin Josh de Leeuw 2013-11-12 12:23:19 -0500
  • 75da56a591 bug fix string' v1.6 Josh de Leeuw 2013-11-12 12:22:06 -0500
  • 7485be16f3 adding built in styles for slider labels in similarity plugin Josh de Leeuw 2013-11-12 12:21:24 -0500
  • 584dedfeb1 bug fix Josh de Leeuw 2013-11-12 12:15:33 -0500
  • 90816bc68d adding similarity example Josh de Leeuw 2013-11-12 12:14:42 -0500
  • b8626f94ec fixing same-diff plugin issues Josh de Leeuw 2013-11-12 11:40:28 -0500
  • 5a62ceba55 adding back in prompt and fixing a/b mixup Josh de Leeuw 2013-11-12 11:38:57 -0500
  • 3bd280033a bug fix Josh de Leeuw 2013-11-12 11:36:49 -0500
  • 4efdb39aa3 bug fix Josh de Leeuw 2013-11-12 11:33:27 -0500
  • b80a51d4d8 same-diff file issue Josh de Leeuw 2013-11-12 11:30:11 -0500
  • 23e42af954 first line was missing Josh de Leeuw 2013-11-12 11:29:14 -0500
  • b145171417 fixing same-diff blank file? Josh de Leeuw 2013-11-12 11:18:23 -0500
  • 9809f5efe4 bug fix Josh de Leeuw 2013-11-12 11:10:39 -0500
  • 667a47993f adding same-different example Josh de Leeuw 2013-11-12 11:09:30 -0500
  • 869f4871f1 renaming imgs to cell_... Josh de Leeuw 2013-11-12 10:48:05 -0500
  • dd203128db adding prompt Josh de Leeuw 2013-11-12 10:43:38 -0500
  • 7cb8dd55f0 stylechanges Josh de Leeuw 2013-11-12 10:41:35 -0500
  • 4280932733 add ui library Josh de Leeuw 2013-11-12 10:39:34 -0500
  • 43a4273076 bugfix Josh de Leeuw 2013-11-12 10:37:59 -0500
  • 9a8db2f78f adding sorting example Josh de Leeuw 2013-11-12 10:37:18 -0500
  • a7e02369ea formatting Josh de Leeuw 2013-11-12 10:23:16 -0500
  • 94895eae24 bug fix Josh de Leeuw 2013-11-11 23:41:17 -0500
  • a5b0a40b39 bug fix Josh de Leeuw 2013-11-11 23:39:51 -0500
  • 01bc830a3b bug fix Josh de Leeuw 2013-11-11 23:39:28 -0500
  • 17bc9e8a5a adding html plugin example Josh de Leeuw 2013-11-11 23:38:37 -0500
  • 59eb7fd2b2 clearer instructions Josh de Leeuw 2013-11-11 23:16:28 -0500
  • a04f33f30e adding core.preloadImages() Josh de Leeuw 2013-11-11 23:09:21 -0500
  • 293410764e tweaking timing Josh de Leeuw 2013-11-11 21:13:52 -0500
  • 6b85f26cb1 tweaking timing Josh de Leeuw 2013-11-11 21:13:22 -0500
  • 451cf5bf05 adding prompt Josh de Leeuw 2013-11-11 21:12:07 -0500
  • 0239dc0514 adding palmer example Josh de Leeuw 2013-11-11 21:10:53 -0500
  • 09e73f6797 adding survey-text example Josh de Leeuw 2013-11-11 20:48:23 -0500
  • 42c0d123c8 style change for likert page Josh de Leeuw 2013-11-11 18:11:11 -0500