Rebase to upstream #2

kahana-sysadmin · 2020-12-09T18:47:09Z

No description provided.

…reloadAudioFiles -> preloadAudio, update parameters and descriptions

…s docs page

…t for auto-preloading

…ing is moved to plugin

…e in examples/docs (missed these out in the earlier keyCode->key change)

…rom plugins/overview and creating-a-plugin and remove those pages from plugins section

Docs reorg

Merging preload docs

…page

…nditional/loop functions

Merge the feature timeline events branch

Fix incorrect parameter name (case_sensitive_responses) in experiment-options.md

Fixed jspsych-webgazer-validate plugin documentation title

Html keyboard response working

… ++ added remove_post_trial_gap to simluate_opts

…s-fix Fixes stim duration default values in same-different plugins #1879

Add jsPsych Builder reference to docs (overview/running-experiments and tutorials/hello-world)

Fix typo in the image-button-response docs: `maintain_aspect_ratio` parameter.

jodeleeuw and others added 30 commits February 10, 2021 17:58

fix the on_timeline_start issue

1b2f1a2

remove preload params from jsPsych.init docs

145d3e5

preload plugin changes: add getAutoPreloadList, remove autoPreload, p…

b4a174b

…reloadAudioFiles -> preloadAudio, update parameters and descriptions

update docs for preload plugin

e67c75c

update docs with preload plugin changes

8238d9a

remove references to preloading via jsPsych.init in experiment option…

fea41a7

…s docs page

tweak plugin descriptions to reflect switch to preload plugin

b5211be

switch to preloading via preload plugin in example files

f1ee569

initial commit for preload plugin docs

3694d75

add preload plugin to docs structure

4758d55

tweak plugin parameter descriptions

301b4cb

video tests just check that register preload is called, no longer tes…

9729cd9

…t for auto-preloading

remove auto_preload: false in jsPsych.init from tests because preload…

470c0d4

…ing is moved to plugin

change numeric keyCodes to key strings, change valid keys to lowercas…

5331b5c

…e in examples/docs (missed these out in the earlier keyCode->key change)

add preload plugin to plugin overview page

aa588c2

move repetitions parameter out of timeline_vars subheading

b112ec4

add dynamic-params page, rename trials page as plugins, add content f…

f833a4a

…rom plugins/overview and creating-a-plugin and remove those pages from plugins section

fix broken links in docs

d9648d3

Merge pull request #1508 from jspsych/docs-reorg

a70d016

Docs reorg

some minor docs edits

2f7e5cc

Merge branch 'master' into preload-docs

969484f

show list of plugins

dcca2a4

Merge pull request #1509 from jspsych/preload-docs

2fece8c

Merging preload docs

minor edits to preload docs

a5fc7af

change last heading text in dynamic params docs

446ebe5

add case_sensitive jsPsych.init parameter to experiment-options docs …

f845393

…page

tweak docs and examples for on_timeline_start and on_timeline_finish

8c85707

Merge branch 'master' into feature-timeline-events

080b295

edit docs to clarify when on_timeline_start/finish run relative to co…

9442b0c

…nditional/loop functions

Merge pull request #1512 from jspsych/feature-timeline-events

ad8b309

Merge the feature timeline events branch

becky-gilbert and others added 28 commits May 13, 2021 10:37

Merge pull request #1820 from AndrianV/patch-1

38286b1

Fix incorrect parameter name (case_sensitive_responses) in experiment-options.md

Merge pull request #1781 from moltaire/fix-validate-doc-title

7681e5c

Fixed jspsych-webgazer-validate plugin documentation title

update version number from 6.3.0 to 6.3.1 - fixes #1835

dd9424c

Merge branch 'master' of https://github.com/jspsych/jsPsych

b528c46

fix error in docs example (missing comma) - fixes #1840

316aa67

fix typo - fixes #1840

e7eb6a6

fix typo

e917fab

Create examples with simulate folder

85b1dc6

_Temp save

59d2843

Html-keyboard-response seems to work

a550da1

Merge pull request #1 from nikbpetrov/html-keyboard-response

b3a8326

Html keyboard response working

jspsych-image-keyboard-repsonse simulate working

8dc1959

Demo flanker working ++ updates to keyboard-response simulate methods…

3dbcd94

… ++ added remove_post_trial_gap to simluate_opts

html-button-response working

012e9f9

Working: html-slider, image-sldier, instructions, image-button

ac3a386

Same-different-html & same-different-image default values fix

9d01f20

Merge pull request #1880 from nikbpetrov/same-different-default-value…

1436132

…s-fix Fixes stim duration default values in same-different plugins #1879

added contributor nikbpetrov

ae332b3

add jsPsych Builder reference to docs

4bc8d51

fix trial_ends_after_video when video stop time is set - fixes #1533

7b16a1d

add a test for #1728

3d678e0

return 0 when no gazeData (possibly fixes #1724)

1c9ca30

Merge pull request #1912 from bjoluc/docs

0ab7239

Add jsPsych Builder reference to docs (overview/running-experiments and tutorials/hello-world)

minor tweaks to jsPsych-builder text

d5efdb3

tweak jsPsych Builder info box text #1912

3221cfa

Fixing typo in the maintain_aspect_ratio parameter.

43397d2

Merge pull request #1981 from nikbpetrov/patch-1

db8bab4

Fix typo in the image-button-response docs: `maintain_aspect_ratio` parameter.

update mkdocs.yml in prep for versioned docs

528d9ad

jodeleeuw deleted the branch kahana-sysadmin:master August 20, 2021 14:49

jodeleeuw deleted the master branch August 20, 2021 14:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase to upstream #2

Rebase to upstream #2

Uh oh!

kahana-sysadmin commented Dec 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Rebase to upstream #2

Are you sure you want to change the base?

Rebase to upstream #2

Uh oh!

Conversation

kahana-sysadmin commented Dec 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants