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

Fix timeline preview not showing up

03f5d66d8216ae89ce9a87d64a582662ad3e3c07 authored over 7 years ago

Merge pull request #159 from GavinQ1/master

Clean up

db1f186f3f6f3183d5df10a4d3eeba1754a4abe2 authored over 7 years ago

Clean up

acd3eec3d01c2f005563b6538176db65b05ead7e authored over 7 years ago

Merge pull request #158 from GavinQ1/master

Clean up

e0b4342894fbfe8d8090c60811b9d3ff65b82220 authored over 7 years ago

Merge remote-tracking branch 'upstream/master'

889591f28c5a60c609fab075f6943f47f543bd03 authored over 7 years ago

Clean up

fa6d8b15bb09fbcc143c52ed7dbbfcc82679b5f0 authored over 7 years ago

Clean up

b00a252df5c63d16992dc88584bba5d4149ecf25 authored over 7 years ago

Merge pull request #157 from GavinQ1/master

Complete choosing timeline variable

e81828135b569af76d8e602433d1b96c9e1922cb authored over 7 years ago

Merge branch 'master' into master

5557cc2232041a9a378de865a9256f9a185f0e49 authored over 7 years ago

fixed changing header

b85732b3918a82d5f9b3c18906e9c8963eeb657c authored over 7 years ago

Complete choosing timeline variable

d93a7d866c1de0cad829d0bd145e6faf2b6a7f1d authored over 7 years ago

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

Need update

4efba4178af2e7aa9d2e5d0d3e40d3f8f8151315 authored over 7 years ago

Merge pull request #156 from GavinQ1/master

Framework for timeline variable selector

865758f3fde8978e639efa9c598ee88aafd3ac46 authored over 7 years ago

Framework for timeline variable selector

5e2f4cbc6a97b6fa5954996b0237c1e63571a466 authored over 7 years ago

Merge pull request #155 from GavinQ1/master

Better check for media insertion

95b8e3b927aa306c504b3d56983d7d418ab2533a authored over 7 years ago

Clean up

4599d53694c0967f186175b3e21d270be89cfb3f authored over 7 years ago

Better check for media insertion

3485440ee4d6e504cb930605d1db8a3aca665a49 authored over 7 years ago

Prepare for adding timeline variable selector

e324d42042e11bbd920ef856e6e8c24e159ce83e authored over 7 years ago

Merge pull request #154 from GavinQ1/master

Adapt to jsPsych changes; Better input check for media selector; Field for select type

96d852fbe9db802d8278a213c1243f612aaad3c1 authored over 7 years ago

Complete select plugin

74109867c9de0a31ec167c79238af33bd9d250d2 authored over 7 years ago

Adapt to jsPsych changes; Better input check for media selector

78ed10b01f03a8b5f8ae3933f173fbd9f382e287 authored over 7 years ago

Clean up

9886665a26e4bb1ef925bea9ddebfe1b6d324777 authored over 7 years ago

Merge pull request #153 from GavinQ1/master

Make editor drawer resizable

8c9843fe6489038ebe8d45587aa67f64ca1bc271 authored over 7 years ago

Make editor drawer resizable

4925a8a2be8296887efb170595156eb28de7dbdf authored over 7 years ago

Merge pull request #152 from GavinQ1/master

Fix timeline form

740077747f7aada80cff44fd3ae713996f498733 authored over 7 years ago

Fix timeline form

330952d0bc24e00b3ee707cb56dd8c66bc834a89 authored over 7 years ago

Merge pull request #151 from GavinQ1/master

Check input for keyboard

06bbb23d80716092c0e3f9f93536acebb87ba63a authored over 7 years ago

Check input for keyboard

b348616a91e6be4d6fb84987aa3e200625dfd951 authored over 7 years ago

Merge pull request #150 from GavinQ1/master

Complete media selector (video); Add component for keyboard

b686b6c00d326c8cd2ec84e19fa36a0ef4d444b2 authored over 7 years ago

Complete media selector (video); Add component for keyboard

620b59e67eebf47efa74e8886c9663b54c199c8c authored over 7 years ago

Merge pull request #149 from GavinQ1/master

Add comment; Fix bug: empty file array for delete s3 files reports post form error

8ab9c9abd9b8cb371e658724ded8fb0949aab995 authored over 7 years ago

Fix bug: empty file array for delete s3 files reports post form error

ac0d5518e7c7ca01fdf12c5a3a479a8064c7a687 authored over 7 years ago

Add comment

ad8685aeacaee56c25801ef2c52b79ff946aab4f authored over 7 years ago

Merge pull request #148 from GavinQ1/master

Fix bug: update experimentState.media with s3 data

229e6380195922dd60b4888d5b373fe7fe2fbf61 authored over 7 years ago

Fix bug: update experimentState.media with s3 data

ab1143471414eec823b70f2e23590c46cc03a3ac authored over 7 years ago

Merge pull request #147 from GavinQ1/master

Resolve file path; Allow insert code for inserting media:

1e9edd3a69f7fc4020c3e0dac3949df6edb45076 authored over 7 years ago

Clean up

92e5790196a385057d9526b8116881de8c10caa2 authored over 7 years ago

Reset selected after upload/delete/insert

f9fde01c474a979fb1f49fc3aa35e2193c256100 authored over 7 years ago

Allow insert code for inserting media:

0bc3ec2676c62deb56b5979d805c7dd013615323 authored over 7 years ago

Resolve file path

d634a7277da00ba578126376b6da30e75d87af51 authored over 7 years ago

Merge pull request #146 from GavinQ1/master

Link saveAs duplicate delete operations with s3

aead774c740f73b8ee7df440f92e0cff5bd5b2aa authored over 7 years ago

Link saveAs duplicate delete operations with s3

81dac393366cc68628aff3a05d178b304e524c6c authored over 7 years ago

Merge pull request #145 from GavinQ1/master

Add function editor to each

da7b97ae2a1e3aae6423562dbb6db0752bd1feba authored over 7 years ago

Fix function editor bug

16d2c487dc41f617e83326b4e5d8a87589905253 authored over 7 years ago

Add function editor to each

e94b8764465670aed10ee8a5e0d662f6832ba607 authored over 7 years ago

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

Need update

857315788d797a1cd768020ec41becbaf575e99b authored over 7 years ago

Merge pull request #143 from GavinQ1/master

Better progress handle for bundling and download deployment

6a86a8030b2f4d87c8323ae7641ee2b860402393 authored over 7 years ago

Better progress handle for bundling and download deployment

f0d8aedfb85aaf2cf826f502a1b891febfa11d41 authored over 7 years ago

Merge pull request #142 from GavinQ1/master

Finish deploy

39cc28407c3943820813d26af83359361941e80d authored over 7 years ago

Finish deploy

7625633d08e1dc509254102f90b0eb5d72923f06 authored over 7 years ago

Merge pull request #141 from GavinQ1/master

Rewrite trialform; Complete deploy

458addfacf92c278e8044977099eb4d9e9965628 authored over 7 years ago

Complete deploy

b9716bbf19f30230c1d0c828c775430ebfa4ada6 authored over 7 years ago

Try deploy

480dc34c2b286764560da1079eafa235d735a42d authored over 7 years ago

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

Need to merge

5afe01dcd815a0068df3b54e31fd240c1fd2ba1d authored over 7 years ago

deleted unwatned file button-response

4db1cf71153f88d6f9c7e4675e37801430dba235 authored over 7 years ago

Rewrite trial form

b3681e26bdaccbc40ed3d869eecd9c13c24daefe authored over 7 years ago

Merge pull request #140 from GavinQ1/master

Progress bar for uploading files

cd82414683989dc08ae121d837a6809f0bb2c660 authored over 7 years ago

Progress bar for uploading files

36ff684a007a1982b67620f922abc61e85ed9f99 authored over 7 years ago

Merge pull request #139 from GavinQ1/master

Fix multi selecting media bug

e68d6f4031e5aac58209b5be5d86e96af7c7382f authored over 7 years ago

Fix multi selecting media bug

10b14580398dc43971fa63438973d985af69e415 authored over 7 years ago

Merge pull request #138 from GavinQ1/master

More Stable Media Manager; New generate code policy;

890b2cc8bd459fd4445b93d22b1aa9caa4c7217e authored over 7 years ago

merge

d974eb8fa26bf072516b0b280ad52597d6da66cd authored over 7 years ago

More Stable Media Manager; New generate code policy; Update jsPsych

f23f16a79527b7cabd19feca55455dcb59bf367b authored over 7 years ago

Merge pull request #137 from GavinQ1/master

Restructure reducers/Exeriment/Editor, trialForm; Add media selector:…

65257335b2a94e96a45acf5d117c0cb5338d2207 authored over 7 years ago

Merge branch 'master' into master

07f564d999e38d9268c6b06ea254964f9175385e authored over 7 years ago

Restructure reducers/Exeriment/Editor, trialForm; Add media selector: Demo's working but need to be more stable

a95bc0893e74d2bf94823b19d78e4bfe4d39e8da authored over 7 years ago

allkeys disappears when box is unchecked

a1aa94bac76d031d304a3d17f220d85b169a7a89 authored over 7 years ago

implemented component for keycode

ba189ccae840ba232000c7a4f663310d2ad949b4 authored over 7 years ago

component for keycode fully functional

8db6aabffa9291fea99b9f9132821949bff8c095 authored over 7 years ago

Merge pull request #136 from GavinQ1/master

Better error catching and handling; Code reuse; style improvements;

5302aacdd16e5092abd6662bf79a2e4c286678ce authored over 7 years ago

Code reuse; style improvements

abeb4d68dc05a66870a4f07964cbd89f815d71fc authored over 7 years ago

Merge pull request #135 from GavinQ1/master

Style changes

decd1c0174aac6199a07434ef3f3b00d3f978390 authored over 7 years ago

Style changes

b9df03f152b2415446830007e34c93c6159d4892 authored over 7 years ago

Merge pull request #134 from GavinQ1/master

Add account pic

12c680c203ea51742588e17d4f095e38e7d5dfdf authored over 7 years ago

Add account pic

ee853c1ec45a1e20c5fce5096e03b98aff6a0c1c authored over 7 years ago

commented out single key inputs

04ca9615895cf7c57489bcb4651eec046f862849 authored over 7 years ago

saves single key inputs as arrays

18aaad29a0702881616ac02026a707ad5bc7acb3 authored over 7 years ago

Merge pull request #133 from GavinQ1/master

Clean up

f51eec8850d032fca3ed2eea4be9b0ae85fef8cf authored over 7 years ago

Clean up

257adf60a9cdc857f9e88a48fc63a2c882823b60 authored over 7 years ago

Merge pull request #132 from GavinQ1/master

Fix display_element null error for empty timeline

76d4efd11ba8680a56043ee99300e32dcd088b90 authored over 7 years ago

Clean up

bf59fc4222d855823e260f00c0a8ce8e14372068 authored over 7 years ago

Clean up

80b334fe9e66790a371f9d8db18c6a15c660d08c authored over 7 years ago

Merge pull request #131 from GavinQ1/master

Add timestamps for experiments

f297d83f9b68dc9026cc05f9b4eb47a4370a2e66 authored over 7 years ago

Fix bugs

b1c0a362440120efd0e6019d3a0a4b30a44eeb04 authored over 7 years ago

Add timestamps for experiments

1da3613482e2ff67cf4eb1bd480f757081d094df authored over 7 years ago

working on choices

227ff893377d7d9ae4b52d7f1840095a8adc0af7 authored over 7 years ago

trialForm and timelineForm renders again

4060dbc206e89d88631fb0bd809065b1a83db606 authored over 7 years ago

Merge pull request #130 from GavinQ1/master

Add inProgress effect for saving as

13e7afcde8cd550f04ed728d7059f49a5be2abcc authored over 7 years ago

Add inProgress effect for saving as

cf50ac27fc9db6bc25fa57971c88e8d780503a85 authored over 7 years ago

Merge pull request #129 from GavinQ1/master

\Add confirmation dialog/onStart/onFinish effects for browse/duplicate/delete

7dd62af117d2477af4b37cc4632a23c3b252493d authored over 7 years ago

Clean up

d204e36c6e233bba13f82be1b98c08787c25b604 authored over 7 years ago

Add confirmation dialog/onStart/onFinish effects for browse/duplicate/delete

0392e884f82d3ed799607d87480e21600df16b6d authored over 7 years ago

Merge pull request #127 from GavinQ1/master

Update jsPsych library

9aec75a2355b812a05625a9685e1b00df4e5340f authored over 7 years ago

Update jsPsych library

ce285cbae86d666818c64093103c27d184dc19a9 authored over 7 years ago

Merge pull request #126 from GavinQ1/master

Clean up after sync

cb86de383f1697e1e4e829df868a99e5ff58ef75 authored over 7 years ago

Clean up after sync

7d8aecb68e7956f90eb8134eded50fd4e715b43a authored over 7 years ago

Merge pull request #125 from GavinQ1/master

Fix new experiment bug

2f950970b62041edc7ce0396bd59843d6c949d45 authored over 7 years ago

Fix new experiment bug

d7cf531457b4b79e6bf643ff82312376b500235b authored over 7 years ago

Merge pull request #124 from GavinQ1/master

Fix new experiment bug

7c8d5b3b86144b68a950366b86170db3fe1251da authored over 7 years ago

Fix new experiment bug

b3f2177286b2aa7d58632722d1b066eaf32b8d21 authored over 7 years ago