Becky Gilbert
|
d75717ac5b
|
remove use_webaudio: false from audio examples
|
2020-12-02 17:46:13 -08:00 |
|
Becky Gilbert
|
91f774a50a
|
add protocol check and file_protocol flag to disable Web Audio and video preloading (CORS errors)
|
2020-12-02 17:44:34 -08:00 |
|
Becky Gilbert
|
2f73392370
|
add override_safe_mode parameter to jsPsych.init
|
2020-12-02 17:42:18 -08:00 |
|
Becky Gilbert
|
4f06465ba3
|
fix indentation
|
2020-12-02 17:11:04 -08:00 |
|
Becky Gilbert
|
b67d4a4881
|
add auto preload test
|
2020-12-02 12:11:38 -08:00 |
|
Becky Gilbert
|
ffc80a372e
|
add console warning when auto preload parameter not found
|
2020-12-02 12:11:03 -08:00 |
|
Becky Gilbert
|
d9437c1c11
|
change sources parameter name to stimulus
|
2020-12-01 16:56:12 -08:00 |
|
Becky Gilbert
|
df8c28f397
|
Merge pull request #1171 from mgorenstein/fix-video-plugin-preload
Fix stimulus parameter naming in video response plugins
|
2020-12-01 16:48:37 -08:00 |
|
Mark Gorenstein
|
d63012706f
|
video files stored in 'stimulus' var for consistency with other plugins
|
2020-11-25 14:47:32 -08:00 |
|
Becky Gilbert
|
6bcb624f7d
|
Merge pull request #1233 from jspsych/docs-6.2
Add docs-6.2 branch to master
|
2020-11-25 11:57:29 -08:00 |
|
Becky Gilbert
|
528a56c53e
|
Merge branch 'master' into docs-6.2
|
2020-11-25 11:51:23 -08:00 |
|
Becky Gilbert
|
39c128cddc
|
Merge pull request #1174 from becky-gilbert/fix-consecutive-images
add render_on_canvas option, fix maintain_aspect_ratio - #891 #969 #1172
|
2020-11-25 10:51:52 -08:00 |
|
Becky Gilbert
|
32cdeae645
|
Merge branch 'master' into fix-consecutive-images
|
2020-11-25 10:50:26 -08:00 |
|
Becky Gilbert
|
bbef9ef9d2
|
Merge pull request #1203 from jspsych/freesort
Updates to free-sort plugin
|
2020-11-25 09:48:05 -08:00 |
|
Becky Gilbert
|
6471e4bb4f
|
make button style consistent with other plugins, add space between button and sort area
|
2020-11-25 09:46:26 -08:00 |
|
Becky Gilbert
|
e94bc9fc3e
|
Merge pull request #1193 from becky-gilbert/slider-positions
fix slider label positioning with custom CSS - fixes #695
|
2020-11-25 09:26:55 -08:00 |
|
Becky Gilbert
|
8c81c9f420
|
Merge branch 'master' into slider-positions
|
2020-11-25 09:26:00 -08:00 |
|
Becky Gilbert
|
6673c9e903
|
add IDs to label/alternative text
|
2020-11-20 15:52:47 -08:00 |
|
Becky Gilbert
|
347005809a
|
minor tweaks to wording
|
2020-11-20 15:51:18 -08:00 |
|
Becky Gilbert
|
374814c56d
|
added awhug
|
2020-11-20 15:27:03 -08:00 |
|
Becky Gilbert
|
1aaee22324
|
Merge pull request #1136 from awhug/master
Add maxdiff plugin
|
2020-11-20 15:09:39 -08:00 |
|
Angus Hughes
|
bcb3b3653c
|
Fix error when required is false to return null response
|
2020-11-20 11:19:53 +08:00 |
|
Becky Gilbert
|
a7bed07cf4
|
add examples to demo new parameters
|
2020-11-19 18:25:48 -08:00 |
|
Becky Gilbert
|
dc00efd0ea
|
add counter text and stim_starts_inside params, fix missed hardcoded colors
|
2020-11-19 18:24:44 -08:00 |
|
Becky Gilbert
|
8cc2454cfd
|
add counter text and stim_starts_inside parameters
|
2020-11-19 18:22:08 -08:00 |
|
Becky Gilbert
|
4c0dab0122
|
add new border/background color parameters
|
2020-11-19 16:07:35 -08:00 |
|
Becky Gilbert
|
b1b3e7d973
|
remove dependency text
|
2020-11-19 15:43:37 -08:00 |
|
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 |
|