Becky Gilbert
|
7782eb2e3a
|
minor tweaks to wording, remove jQuery dependency
|
2020-11-19 14:54:19 -08:00 |
|
Becky Gilbert
|
8f24267aae
|
update expected regex to handle plugin modifications
|
2020-11-19 14:40:44 -08:00 |
|
Becky Gilbert
|
175eaab10d
|
Merge pull request #1018 from kohler-visual-neuroscience-lab/master
updates to free-sort plugin, new functionality
|
2020-11-18 17:46:02 -08:00 |
|
Peter J. Kohler
|
a1ca6a8406
|
fixed above/below
|
2020-11-18 19:41:43 -05:00 |
|
Becky Gilbert
|
3424f386ff
|
fix slider label positioning with custom track/thumb CSS & calc - fixes #695
|
2020-11-14 16:57:01 -08:00 |
|
Becky Gilbert
|
b2c845fa19
|
remove div container for prompt
|
2020-11-11 11:05:40 -08:00 |
|
Becky Gilbert
|
5f18091058
|
remove div containers for prompts
|
2020-11-11 10:53:03 -08:00 |
|
Becky Gilbert
|
005772d78b
|
added cjungerius
|
2020-11-10 14:09:19 -08:00 |
|
Becky Gilbert
|
c367531d40
|
initial commit
|
2020-11-10 14:06:47 -08:00 |
|
Becky Gilbert
|
386e5be719
|
minor changes for clarity and consistency with other plugins, more examples
|
2020-11-10 14:05:46 -08:00 |
|
Becky Gilbert
|
8104d356c5
|
minor changes for clarity and consistency with other v6.2 plugins
|
2020-11-10 14:01:21 -08:00 |
|
Becky Gilbert
|
ece6e3b57e
|
Merge pull request #700 from cjungerius/feature/canvas
Add canvas keyboard/button/slider plugins
|
2020-11-09 15:38:50 -08:00 |
|
Becky Gilbert
|
e9adaff0e0
|
add render_on_canvas: false to tests
|
2020-11-09 14:22:43 -08:00 |
|
Becky Gilbert
|
af8d531259
|
add render_on_canvas option, fix maintain_aspect_ratio - fixes #891 #969 #1172
|
2020-11-06 17:55:06 -08:00 |
|
Mark Gorenstein
|
9af708d584
|
replace 'stimulus' with 'sources' in trial_data of video plugins
|
2020-11-05 11:54:26 -08:00 |
|
Mark Gorenstein
|
ec83e9cd20
|
replace 'stimulus' with 'sources' in registerPreload calls of video plugins
|
2020-11-05 10:01:11 -08:00 |
|
Becky Gilbert
|
c2ff15435c
|
Merge pull request #1145 from becky-gilbert/respond-while-playing
Add response_allowed_while_playing parameter to audio/video plugins - fixes #1137
|
2020-11-04 11:29:46 -08:00 |
|
Becky Gilbert
|
dbb001c0c7
|
Merge branch 'master' into respond-while-playing
|
2020-11-04 11:27:50 -08:00 |
|
Becky Gilbert
|
9822cfe2c9
|
Merge pull request #1162 from becky-gilbert/firefox-video-start
Fix FF video issue with non-zero start time - fixes #712
|
2020-11-04 11:08:17 -08:00 |
|
Josh de Leeuw
|
3fc8447fba
|
minor change at the end
|
2020-11-02 22:49:20 -05:00 |
|
Josh de Leeuw
|
7861b4471d
|
Minor changes
|
2020-11-02 22:44:09 -05:00 |
|
Becky Gilbert
|
879f6a7cb5
|
fix problem with non-zero video start time in FF
|
2020-10-31 15:37:27 -07:00 |
|
Becky Gilbert
|
ce50c6710c
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-10-31 13:40:53 -07:00 |
|
Becky Gilbert
|
7be11b72f4
|
first draft
|
2020-10-31 12:46:49 -07:00 |
|
Becky Gilbert
|
abc587184b
|
fix typo
|
2020-10-30 17:00:43 -07:00 |
|
Becky Gilbert
|
9f3fb74754
|
initial commit
|
2020-10-30 16:54:01 -07:00 |
|
Josh de Leeuw
|
a2b0cecfbb
|
fixes Preloading progress bar not centered when experiment_width property is set in jsPsych.init #1160
|
2020-10-30 12:01:41 -04:00 |
|
Becky Gilbert
|
71ce1263f9
|
put button :hover in media query, add button :active style - #977
|
2020-10-29 15:55:49 -07:00 |
|
Becky Gilbert
|
4f8e59431d
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-10-28 12:07:13 -07:00 |
|
Josh de Leeuw
|
d621710625
|
Merge pull request #948 from bjoluc/fix-duplicate-body
Delay `init()` execution until the document is ready
|
2020-10-28 11:49:28 -04:00 |
|
bjoluc
|
ffb9c5d39c
|
add tests for delayed init() execution
|
2020-10-28 12:34:22 +01:00 |
|
bjoluc
|
2f421f4317
|
delay init() execution until the document is ready
This prevents jsPsych from creating a duplicate `body` element when the
actual `body` element has not yet been initialized.
Fixes #316
|
2020-10-28 12:34:22 +01:00 |
|
Becky Gilbert
|
f16c9a54ee
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-10-26 17:02:34 -07:00 |
|
Becky Gilbert
|
b02e73ea21
|
warn about .mov files - #649
|
2020-10-26 16:58:45 -07:00 |
|
Becky Gilbert
|
8b5a68edfc
|
fix undefined starttime problem
|
2020-10-26 15:43:02 -07:00 |
|
Becky Gilbert
|
3787331df8
|
revert changes
|
2020-10-26 14:59:19 -07:00 |
|
Becky Gilbert
|
6396036c9e
|
add response_allowed_while_playing parameter - #1137
|
2020-10-26 14:47:30 -07:00 |
|
Becky Gilbert
|
645102b8cb
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2020-10-23 16:15:06 -07:00 |
|
Becky Gilbert
|
ac5c101c9d
|
add minimum_valid_rt parameter to jspsych.init
|
2020-10-23 09:05:29 -07:00 |
|
Becky Gilbert
|
1be5f0b97f
|
Merge pull request #1139 from jspsych/min-rt
Merges minimum valid RT changes into master
|
2020-10-23 08:45:22 -07:00 |
|
Josh de Leeuw
|
b216b8f1e1
|
fixes test suite failure (== vs. === issues!)
|
2020-10-23 11:15:03 -04:00 |
|
Josh de Leeuw
|
0cbda8a76c
|
adds a test for min-rt #546
|
2020-10-23 10:36:28 -04:00 |
|
Josh de Leeuw
|
a7916b8d33
|
Merge pull request #546 from andytwoods/min_RT
minimum_valid_rt
|
2020-10-23 10:13:59 -04:00 |
|
Josh de Leeuw
|
b364aa77cd
|
trigger actions on all branches
|
2020-10-23 10:09:12 -04:00 |
|
Josh de Leeuw
|
eb08de2a43
|
Merge branch 'min-rt' into min_RT
|
2020-10-23 10:06:35 -04:00 |
|
Angus Hughes
|
857db43166
|
maxdiff response column labels now more generic
|
2020-10-23 11:05:13 +08:00 |
|
Josh de Leeuw
|
b8ad672fb7
|
adds a test for #990
|
2020-10-22 11:33:31 -04:00 |
|
Josh de Leeuw
|
56a74ac745
|
Merge pull request #990 from egaudrain/master
Patching for issue #989
|
2020-10-22 11:32:30 -04:00 |
|
Angus Hughes
|
b0646f5649
|
simple randomisation test added, better comments
|
2020-10-22 11:23:07 +08:00 |
|
Becky Gilbert
|
719b009707
|
change require_movement so that clicking cursor is sufficient - fixes #696
|
2020-10-21 17:37:37 -07:00 |
|