github.com/jspsych/jsPsych commits | Ecosyste.ms: OpenCollective

rename stimuli to stimulus in vsl grid data fix

026d7153042638e4ff89363ec7c09774b54caf66 authored over 10 years ago

rename stimuli to stimulus in vsl grid data

3ba276da5b38d0bf918ea79ecc91cbcb18c1d936 authored over 10 years ago

Update jspsych-visual-search-circle.md

16a91b8113d2159ed0d0ef8b029deb04db9b85c5 authored over 10 years ago

Update jspsych-survey-text.md

7684463cd7d4bec9a2f7c8d43fa99e32edc3368d authored over 10 years ago

Update jspsych-survey-likert.md

9043e05e8776b20a0cecff8cb72acf1310299393 authored over 10 years ago

Update and rename jspsych-suvey-likert.md to jspsych-survey-likert.md

46792fddf5dacb3617f03b8ac532d6669068a027 authored over 10 years ago

Update contributing.md

8e6e0550bc70a8ac81735d9852c9077cb24228a6 authored over 10 years ago

add info about callback functions

1887be0dd403097b24f30ee567041d78deab5310 authored over 10 years ago

more docs!

ce9dd191ee0823b125cc52b1678c54bf40f4d650 authored over 10 years ago

adding more plugin docs

7ed0ba70c624f3528bf331b62d34d4dd49134f54 authored over 10 years ago

core doc update

8f33110defc39bef3ee099a1ac3a52c8f4f8ed94 authored over 10 years ago

more docs updates

92219b75d0030adbd185a72d246f947f0ccdf932 authored over 10 years ago

Update randomization-repetition.md

f5aa15348dbd8370d6f4dc248d7ca99015eded03 authored over 10 years ago

Update randomization-repetition.md

08f77beca39c3db18d4f29c93c0e90d5b01abcbf authored over 10 years ago

Update mturk.md

9ec7bf230c6590d73d374b67ed1fa32a64cd6cf9 authored over 10 years ago

Update overview.md

6e637de614a448bc92a8791fee0fc35d6c0f1b87 authored over 10 years ago

Update jspsych-pluginAPI.md

0d131c26d11c938454796a12259fc9c119bbfc74 authored over 10 years ago

adding pluginAPI docs

ec5caa3c7832a5740c46bbec3a6ca23242a97974 authored over 10 years ago

adding data module docs

bfed3e8cfaac1dbb1b702357c36171e5753c32ca authored over 10 years ago

clean up pages without content

be2ead4cd625feeae57bcc996a7031875ab66192 authored over 10 years ago

adding randomization and turk module docs

48ac399886d088ee0bdb1e174aaf7e6a4e49462f authored over 10 years ago

removing force_refresh option for turkInfo

just parse the string every time

3c6d7fdd665738078a9f9724ade70b15b7d17da8 authored over 10 years ago

update read me

a8eb2b99a5602e5de7dc7ff33a05f01f10ca3159 authored over 10 years ago

add support doc

070dbf68c42b5eee834ac6cb480d4b7b260f84dc authored over 10 years ago

add docs for categorize plugin

7259badd35cf2248b50d68deeaec28ba156d6b48 authored over 10 years ago

doc updates, rename reps -> sequence_reps

51716711d1748a9df787f24c8f2839cb82e284cd authored over 10 years ago

add call-function doc

7beb851b7d94768bf61909ac58be0be85b19d652 authored over 10 years ago

remove args param

5be6dc2c114ba894a46165f26d4b9169ddbe463a authored over 10 years ago

adding documentation files

a3cd98921cd23058432134379f94d1ce871c2fae authored over 10 years ago

change repetitions -> sequence_reps

prevents conflict with new default repetitions option

b5fc742461073355c1fcf0ba099107ddb41f2a22 authored over 10 years ago

change blocks to timeline

closes #77

9d816dbf2b881953fb5c6e787d05470081d5933e authored over 10 years ago

add getLastChunkData; edge case handling

5546f08094d8787407236b195b47d4a580560f58 authored over 10 years ago

add getLastTrialData function

f2c0ebf63dd5f22a75ad1b91f2b0e0f48805aca8 authored over 10 years ago

adding if chunk

4171f8d461b32edd900e42e800b674dca6d8eee7 authored over 10 years ago

semicolon

8cef6f089edb28728c77147915f12de2f85173e8 authored over 10 years ago

adding code to remove setTimeouts when trial ends

issue #62

720b150e50eb55353294a20e97cc9cd8eb2fca34 authored over 10 years ago

fix timeout issue

issue #62

e262c52ee98141a7699fa575f7dbe78b54433fd8 authored over 10 years ago

Rename license to license.txt

e1bf232a5818e19c0b60b246b6586d55d4a03897 authored over 10 years ago

Create license

8729e972b7e110ecf7edb2dfd3b15847f71e2d78 authored over 10 years ago

remove editable option

Closes #72

9b617435e86f1ebe50dab9f4629f72976672a88d authored over 10 years ago

fix xab bug and formatting

Closes #74

940c5580f8bb84fb6306f17dbff37168b0861c4d authored over 10 years ago

implement randomize_order and repetitions opts

closes issue #70

6f10c190c57e7e2ba13225852ad2747f24ebd20e authored over 10 years ago

remove line

c5c0298c9a6188a63aa788b0a6336fde174b5312 authored over 10 years ago

implement ability to get index of trial relative to block

e07e05ce35e0747de5a028ffa38eb8926bf03265 authored over 10 years ago

update progress bar spec

shows progress based on which chunk the subject is currently doing in
the root_chunk object. thi...

c1c60c209de90fd8db897babfdd7a4e339ab3988 authored over 10 years ago

Merge pull request #69 from jodeleeuw/dev-chunks

Dev chunks

ac5c70751617398a106c95ab7e70e0c72d8281e9 authored over 10 years ago

cleaning up stuff that isn't needed.

e4d2766f8b411ee2cfb404dc3bc539903d543a7d authored over 10 years ago

more fixes for nested chunks

- fixed method to get data associated with chunk ID
- isComplete now works for root type chunk

044cbc3d6eff08000949938d8bb755c788376628 authored over 10 years ago

reconfiguring chunk to be tree-like

now there is a root chunk which contains the entire experiment, with
all other chunks being bran...

619d9ffa05751a3bf2701490cd91bd69b6090f8f authored over 10 years ago

trying to implement nested chunks

this is really broken right now.

044cf9c780304b285cf4b89637abefa3bf9f90f6 authored over 10 years ago

removing block from plugin.trial call

1c2b198d501d1137b54af55650fcd6422a37b362 authored over 10 years ago

replace block.writeData with jsPsych.data.write

234eb88ebbbaf86aed2e7aa2d3644d46920101f4 authored over 10 years ago

replace block.next with jsPsych.finishTrial();

d9c356f6d791cadf80827383a141306b4a7b011e authored over 10 years ago

more work to support while chunks

Issue #8

e7e32717314727d9b4fd533fedb1091f4a9d5f5d authored over 10 years ago

implements while chunk

related to Issue #8

fcf8239578c46e1a576fd56c1ee6efde3edbb45d authored over 10 years ago

various bug fixes to get chunks working

03386a661f36589abe7357a01057b658c33786d9 authored over 10 years ago

more work on chunk code

4128984f367cf12bd6e5cd1f9427098a532d91e5 authored over 10 years ago

starting to fill in chunk behavior

ab300879738ae47298cdaad613893ac959f041b3 authored over 10 years ago

changing what blocks do

now they are just collections of trials, rather than having significant
functionality for runnin...

73b6524c0f9798a14f346486b06c258b12614441 authored over 10 years ago

more changes to support chunks

ba0ac9c6bf9616131514a03b0c1a4d97be7af91d authored over 10 years ago

more sketching for chunks

4a783ea684cbfa2770eefb00d3aaa5a1b23be04e authored over 10 years ago

start sketching out chunks

6fc666ec1eac255c3ca6051557a431e9daf16125 authored over 10 years ago

add datastore object

c19295bd986da032c1e95db0c1ac6b6c9b7e9873 authored over 10 years ago

wake up this branch

80158e52f2f390f176fef09f901db1eafa24b20a authored over 10 years ago

remove genericParameters from plugin specific implementations

bc00b48ee2c11e627beae50b4bc726586ce3943a authored over 10 years ago

streamline generic trial options

1d5adf787a54cecfd1e69ccc8a0bffa9d634e92e authored over 10 years ago

add generic trial options support in core

related to issue #36, #68

2ed85be15b9182bc006c37bb26b3abf308dc7465 authored over 10 years ago

fix layout bug

issue #67

6e24d52acfb463d530a1f4ccc054f9538f80adda authored over 10 years ago

starting to handle trial level callbacks

however, this will probably not be able to happen until the code for
creating trials is refactor...

9ab6543cb044759f7186eeeac3d36bec4e1c7919 authored over 10 years ago

remove part parameter in do trial method

closes #64

89f4f1535ccc3af6f2f0fa3715c8b82d395f059a authored over 10 years ago

remove part parameter from plugins

related to issue #64

109e549b4f1074376011cec078d3d1079e9b22c1 authored over 10 years ago

remove now-redundant data from plugins

closes issue #65

2574f41acb38de915b4f5b9304b25d1d8f54c180 authored over 10 years ago

add progress bar option

Can now pass ‘show_progress_bar: true’ to init method to display a
progress bar throughout the e...

12118247b1b49aeee2bc7c20571caeff9fb4ff10 authored over 10 years ago

enforce array for continue key

7c1da930104b9a1b66a2ea06d441b00e1d48b710 authored over 10 years ago

clean formatting, remove redundant data

2d9af8dfa939815874ef139faaa07a63611bbaba authored over 10 years ago

add block_index to default data

records the index of the current block

2c33d7603d3c898c585d814bbe36867d4c9eec2e authored over 10 years ago

add time_elapsed to default data

records the number of ms since the start of the experiment when a trial ends.

146d1dae20ceb4d5013503346658c04d06566436 authored over 10 years ago

add default data for all trials

records default data for all trials:

- trial type
- trial index within the block
- trial in...

8db4ea307ebbaa94b1e27f7ec30683d84702bf67 authored over 10 years ago

namespace bug

a07f59d323550aa18581a664d4375e85393fc0ee authored over 10 years ago

Fixed bugs when timing_response was > 0

Related to Issue #62.

Also, explicitly canceled keyboard listener in cases where trial ended ...

03ce248d0b144afef629e2f0a5fcfdae20202fb3 authored over 10 years ago

remove unnecessary startTime record

3e96600423774d698727a8bde2be292577881cd8 authored over 10 years ago

Merge pull request #61 from jodeleeuw/master

merge master to dev

81248f7d614f1991d6d638112788ac63ad225c56 authored over 10 years ago

bug fix other "

655d5cef91f9dc94bf92432f5fca589491fc05c1 authored over 10 years ago

bug missing "

05df09502e1d3eacbad822fdd2950b337572d49f authored over 10 years ago

Merge pull request #60 from jodeleeuw/dev

update to v3.1

ada763ce3bcbddf64db60279116277c0f9f3065a authored over 10 years ago

remove append_data

26052c22a1afa4c398cacabd1fd9aabc24c77339 authored over 10 years ago

make json pretty

fdf77c79dd19563497a4dfbe47a8619c4fa591ce authored over 10 years ago

add getter method for DOM_target, update module methods

fc16067939a2b4d337484480b6c2cf9aeec62a1f authored over 10 years ago

bug fix flatten_data -> flattenData

8d3d9af0db4a35ae939b395ebb0088f6c327b3e7 authored over 10 years ago

add dataAPI.displayData

594be10e526fc5a8fe87b8a53075ba29b0773b97 authored over 10 years ago

Merge pull request #59 from jodeleeuw/css

Css

a340f9c7ef05a2a61107f13999b7e8eda9896ccc authored over 10 years ago

bug fixes with size and location of raphael canvas

also, show fixation throughout entire trial

351542dc6c6bd3a9c74bd4dfb762f3f1e130b7b4 authored over 10 years ago

add jsPsych email group

a0113f70ea96205b16502234ecbb401064768312 authored over 10 years ago

add a few plugins

9fe361306dfd7729a7443900fc67b9c71cbbe7c5 authored over 10 years ago

add class info for left/right

5acb0aba9b0992eaaaac72101d5b0ed250f7aa5d authored over 10 years ago

Create jspsych.css

c5fda9fad08011795ffd5a8912d34b87c249fea2 authored over 10 years ago

change css info

c7e4050e940c49ca4b63a17aa0aa9b6e19255bdf authored over 10 years ago

change class of image

bd5a97fee209a6cdbeec86e827178f045b93b6a5 authored over 10 years ago

Merge pull request #58 from jodeleeuw/visual-search-circle

Visual search circle

b7a658e8250447c0e8232f6bfd1723fb4758a739 authored over 10 years ago

update header

35deb1935b07154c0214dd7f1d7ef802fa13ee1f authored over 10 years ago