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
1,628 Commits 14 Branches 506 Tags 58 MiB
72c84130c5
Commit Graph

1628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp Sprengholz
72c84130c5 Refined the cloze structure and added both example and doc files 2018-07-13 23:15:38 +02:00
Philipp Sprengholz
503c4cc9e7 Added cloze plugin 2018-07-13 22:17:43 +02:00
Josh de Leeuw
db054ba9c7
Merge pull request #547 from guydav/master 
CSS imports must be at beginning of file.
 2018-07-03 15:33:59 -04:00
Guy Davidson
4df9c11388 CSS imports must be at beginning of file. 
As it's currently written, the Open Sans font is never being loaded. See, for instance, https://developer.mozilla.org/en-US/docs/Web/CSS/@import
 2018-07-03 15:11:29 -04:00
Josh de Leeuw
b9a796211e step version 2018-06-25 22:10:58 -04:00
Josh de Leeuw
25d23a8e0d adding RDK plugin 2018-06-25 22:08:47 -04:00
Josh de Leeuw
fe29d2b255
Merge pull request #491 from vrsivananda/add-RDK 
Added RDK plugin
 2018-06-25 22:02:19 -04:00
Josh de Leeuw
d96252b157
Merge pull request #501 from mjaquiery/instruction-pagenum 
Instruction page numbers (feature requested in #371)
 2018-06-25 21:51:06 -04:00
Josh de Leeuw
fe74cdefbf update docs for #537 2018-06-25 21:48:57 -04:00
Josh de Leeuw
b6009b2de9 docs for #532 2018-06-25 21:37:32 -04:00
Josh de Leeuw
3c73ed41fd
Merge pull request #534 from onkeltom/fix-external-html-plugin 
Fix #532 to allow script on external-html pages to be executed
 2018-06-25 21:34:55 -04:00
Josh de Leeuw
2970c94559 fixes #539 2018-06-25 21:33:39 -04:00
Josh de Leeuw
176424df82 fixes #545 2018-06-25 15:39:40 -04:00
Josh de Leeuw
0f92127a49 fixes #541 by moving current_trial_finished to better location 2018-06-25 15:33:29 -04:00
Josh de Leeuw
0b1b5c3cf9 add test for jsPsych.endExperiment() 2018-06-25 15:18:40 -04:00
Josh de Leeuw
c112f930c1 relocate tests on core library 2018-06-25 15:18:23 -04:00
Josh de Leeuw
243c49dc74 fixes #544 2018-06-25 14:42:40 -04:00
Josh de Leeuw
c2e55bd52b fixes #533 2018-06-25 14:28:05 -04:00
Josh de Leeuw
a6a012009c update docs on localSave 2018-06-25 14:23:11 -04:00
Josh de Leeuw
b15261c09c
Merge pull request #530 from spencerking/master 
Fixing issue #261
 2018-06-25 14:19:18 -04:00
Josh de Leeuw
3a3a792fed fix two typos in docs 2018-05-30 13:23:02 -04:00
Dominik Strohmeier
5698002b3e Fix #532 to allow script on external-html pages to be executed optionally in a external-html plugin trial 
Issue #532 addresses the issue that scripts included in the remote page will not be executed via the XMLHttpRequest() in the external-html script.

We will need to relocate the content of all scripts by relocating the content through DOM manipulation. The execution is optional and can be controlled through the new execute_Script parameter.
 2018-05-30 10:08:58 +02:00
Sivananda Rajananda
10608969b7 Fixed multiple apertures nSets parameter and function 2018-05-22 11:35:51 -04:00
Spencer King
aa3df3591f Fixing issue #261 
localSave() is now supported by Safari
 2018-05-16 22:12:05 -05:00
Josh de Leeuw
8678eed304 did not work 2018-05-14 23:02:33 -04:00
Josh de Leeuw
b7dd6ce0c8 try adding gitignore to docs for autobuild? 2018-05-14 23:01:08 -04:00
Josh de Leeuw
6173928409 step version in docs 2018-05-14 22:27:43 -04:00
Josh de Leeuw
442fe05ed9 fixes chrome 66+ audio play #518 2018-05-14 22:24:19 -04:00
CML2
7d5910f569 Fixed doc for RDK 2018-05-09 15:05:09 -07:00
CML2
bab507b9f6 Fixed lag for multiple apertures RDK 2018-05-08 15:27:37 -07:00
Josh de Leeuw
66f21d9e7d scope the input CSS to the jspsych-display-element 2018-05-03 10:12:48 -04:00
Josh de Leeuw
7dba81b83b completes #520 2018-04-20 10:55:09 -04:00
Josh de Leeuw
c14b0f1d76 fix links to slider plugins 2018-04-20 09:02:03 -04:00
Josh de Leeuw
c6c4eff79f fix typo in rt tutorial 2018-04-18 21:09:06 -04:00
Josh de Leeuw
1035b0f503 update version 2018-04-17 21:47:25 -04:00
Josh de Leeuw
fea3015fbd fixed implementation of start/stop for all browsers #517 2018-04-17 21:32:18 -04:00
Josh de Leeuw
50771fd2b4 change default scroll behavior #515 2018-04-17 14:23:56 -04:00
Josh de Leeuw
b4a0ce33e6 fix docs, make callback optional #513 2018-04-17 10:43:37 -04:00
Josh de Leeuw
810df6c182 fix minor errors; step version #516 2018-04-17 10:38:34 -04:00
CML2
7b444afd59 Added multiple apertures and opposite coherence 2018-04-04 16:23:03 -07:00
Josh de Leeuw
2f568aebdb patch a bug with multiple init calls and webaudio context 2018-03-20 12:27:42 -04:00
Josh de Leeuw
b25de70bba new test for survey-text 2018-03-18 22:47:01 -04:00
Josh de Leeuw
f2319fec53 add a test case for survey-text defaults 2018-03-11 17:06:28 -04:00
Josh de Leeuw
a4b3271b09
Merge pull request #510 from hans/patch-1 
Fix title
 2018-02-28 10:46:59 -05:00
Jon Gauthier
4a0ef29c07
Fix title 2018-02-28 10:39:19 -05:00
Josh de Leeuw
85a3cf84ca
Merge pull request #509 from uozias/fix/shown_code_in_lexical-decision.html 
Add a parameter for getting a word instead of a function
 2018-02-27 08:58:53 -05:00
saizo aoyagi@desktop-iniad1
acfb5c88fa Add a parameter for getting a word instead of a function 2018-02-27 14:56:50 +09:00
Josh de Leeuw
a34a99dc3b Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-02-18 16:53:35 -05:00
Josh de Leeuw
3fb7ef6b6d fix loadFail timeout bug 2018-02-18 16:53:31 -05:00
Josh de Leeuw
c1e7442f6c
Merge pull request #505 from yulkang/master 
corrected a typo in the rt-task tutorial regarding tagging
 2018-02-18 22:28:34 +01:00