Becky Gilbert
|
bb7b3f0570
|
Merge pull request #1228 from kurokida/freesort
for using the free-sort plugin with a touch device.
|
2021-02-18 16:40:28 -08:00 |
|
Daiichiro Kuroki
|
efac416602
|
Changed the stim, sort_area, and canvas sizes in the free-sort demo for touch devices.
|
2020-11-26 10:25:01 +09: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 |
|
Daiichiro Kuroki
|
4c7c7b8ac3
|
Revert "gitignore-test"
This reverts commit 960cd8b4a5.
|
2020-11-25 19:08:52 +09:00 |
|
Daiichiro Kuroki
|
960cd8b4a5
|
gitignore-test
|
2020-11-25 18:58:34 +09:00 |
|
Daiichiro Kuroki
|
1fff4606ba
|
for using with a touch device.
|
2020-11-24 21:31:18 +09: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
|
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
|
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 |
|
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 |
|
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 |
|