HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,843 Commits 14 Branches 506 Tags 58 MiB
ee228b1419
Commit Graph

1843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
219aed23b9
Merge pull request #592 from r-b-g-b/master 
Bug in video trial when video is preloaded
 2019-01-31 22:02:49 -05:00
Robert Gibboni
f935aa8172 Variable not defined, potential bug. Use 2019-01-31 16:56:56 -08:00
Josh de Leeuw
d6f7002497
Merge pull request #590 from r-b-g-b/master 
Option to set video playback rate
 2019-01-24 14:39:27 -05:00
Robert Gibboni
560a655c64 option to set video playback rate 2019-01-23 15:23:25 -08:00
Josh de Leeuw
74fee77f4b
Merge pull request #586 from zhanwenchen/patch-1 
Update jspsych-same-different-image.md
 2019-01-05 13:26:53 -05:00
Zhanwen "Phil" Chen
fc7f7cc9e8
Update jspsych-same-different-image.md 
Type "same-different" is undefined.
 2019-01-05 11:05:46 -06:00
Josh de Leeuw
bc03aebfb1 allow functions in data params (#562) 2018-12-14 12:12:50 -05:00
Josh de Leeuw
5741bd83e9 fix survey-text bug (#576) 2018-12-14 11:26:43 -05:00
Josh de Leeuw
248c5dcaab fix lexical decision example 2018-12-11 10:35:28 -05:00
Josh de Leeuw
0fcc566228 fix formatting bug #578 2018-11-30 14:48:57 -05:00
Sivananda Rajananda
1d46025e97
Rename plugin-RDK.test.js to plugin-rdk.test.js 2018-11-27 16:53:09 -08:00
Sivananda Rajananda
99ef8a149f
Rename jspsych-RDK.js to jspsych-rdk.js 2018-11-27 16:49:09 -08:00
CML2
a02664ec64 fixed test 2018-11-27 16:42:42 -08:00
Sivananda Rajananda
e49ba9d0ab
Rename jspsych-RDK.md to jspsych-rdk.md 2018-11-27 16:36:27 -08:00
CML2
dd64b0a00e changed RDK to lowercase 2018-11-27 16:26:32 -08:00
CML2
8408f59746 Changed to lowercase rdk and fixed border bug 2018-11-27 16:19:53 -08:00
Josh de Leeuw
e284a57bc6 skip required test because jsdom doesn't implement 2018-11-09 14:29:42 -05:00
Josh de Leeuw
4df4f5e1ec add test for required text 2018-11-09 14:14:10 -05:00
Josh de Leeuw
8c5d83b258 implement required parameter for survey-text plugin (#460) 2018-11-09 14:10:09 -05:00
CML2
5fe2a5f97e Fixed opposite_coherence function 2018-11-01 19:45:59 -07:00
Josh de Leeuw
d27f52618f update docs for video preload 2018-10-12 11:58:01 -04:00
Josh de Leeuw
e59895cb8e updates for video preloading 2018-10-12 11:48:01 -04:00
Josh de Leeuw
e36195dcd6
Merge pull request #535 from andytwoods/master 
preloading video
 2018-10-12 11:21:32 -04:00
Josh de Leeuw
b551f99f12
Merge branch 'master' into master 2018-10-12 11:19:51 -04:00
Josh de Leeuw
0bcf6b856a update Jest, configure URL 2018-10-09 16:17:28 -04:00
Josh de Leeuw
501a5be52a update all to performance.now() - #492 2018-10-09 16:13:59 -04:00
Josh de Leeuw
6eeed765af make default progress bar amount 0 2018-10-09 13:51:24 -04:00
Josh de Leeuw
8b8d269665 add new progress bar tests 2018-10-09 13:50:59 -04:00
Josh de Leeuw
954eac9784 fix progress bar bug 2018-10-09 13:47:43 -04:00
Josh de Leeuw
0c4080fe81 update progress bar docs #538 2018-10-09 13:26:55 -04:00
Josh de Leeuw
6a6d390cb8 add get of progress bar value (#538) 2018-10-09 13:21:53 -04:00
Josh de Leeuw
59258d3215 implements #324 -- beforeunload event handler 2018-10-09 13:12:07 -04:00
Josh de Leeuw
540ce2ed6f step version 2018-10-04 15:31:37 -04:00
Josh de Leeuw
1c79b55740 remove form plugin test 2018-10-04 15:30:36 -04:00
Josh de Leeuw
f052f23633 remove form plugin 2018-10-04 15:27:33 -04:00
Josh de Leeuw
ea4196f764 minor comment formatting 2018-10-04 15:26:35 -04:00
Josh de Leeuw
cb030f3ed7
Merge pull request #564 from vrsivananda/add-RDK 
Added functionality for RDK to take in javascript character codes for…
 2018-10-04 15:23:52 -04:00
Josh de Leeuw
330e5a8611 add preventDefaul on captured key responses #548 2018-10-04 15:23:34 -04:00
Josh de Leeuw
f6b607f46f Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-10-04 14:20:39 -04:00
Josh de Leeuw
7115ae7ed3 add test to validate #567 2018-10-04 14:20:30 -04:00
Josh de Leeuw
15d1bd4bae
Merge pull request #559 from tbrotherm/patch-1 
Update jspsych-external-html.js
 2018-10-04 14:08:48 -04:00
Josh de Leeuw
2e69a17693 update lexical decision to help test #563 2018-10-04 14:07:18 -04:00
Josh de Leeuw
299e9d7671 fix focus #563 2018-10-04 14:04:54 -04:00
Josh de Leeuw
7a08072070 scroll to top of DOM target at start of next trial #550 2018-10-04 13:55:08 -04:00
Josh de Leeuw
4bf2a6f643 Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-10-04 13:44:41 -04:00
Josh de Leeuw
6b88af120e fix slider parameter type #571 2018-10-04 13:44:12 -04:00
CML2
3d708804b2 changed timing_post_trial to post_trial_gap 2018-09-20 13:31:55 -07:00
Josh de Leeuw
43a646599f
Merge pull request #566 from dillonplunkett/shuffleNoRepeats-fix 
make shuffleNoRepeats check last two elements
 2018-09-17 09:24:35 -04:00
Dillon Plunkett
da094d8a30 make shuffleNoRepeats check last two elements 2018-09-14 19:57:34 -04:00
CML2
b7e359510e Fixed bugs for backgroundColor and response_ends_trial 2018-09-13 14:30:48 -07:00