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

Merge pull request #123 from GavinQ1/master

Clean up

695f3fea224be77d1423ad4594a8fddc23765093 authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

7152f1d513c181a7dae77704ca4a1654d8e83f97 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #122 from jspsych/fix-warnings

remove all code warnings

37a7ea176243ae24b04d976f64916b352b7b661e authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge branch 'master' into fix-warnings

e9ebea31ca458686867b9dea099767a7a519c909 authored over 7 years ago by Josh de Leeuw <[email protected]>

remove all code warnings

4b4d54ca662f8c536c901457645b1d08cbee006e authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge pull request #121 from GavinQ1/master

Handle Error, notifications; Add confirmation before leaving;

9186a4222aa38c71fd3127b503c4437dbedb8605 authored over 7 years ago by GavinQ1 <[email protected]>

Add confirmation before leaving

7a9ba492a40a17fea8d57493cc6438568f9d99ca authored over 7 years ago by GavinQ1 <[email protected]>

update s3 to be specific to user folder

393e881b17985dd19f657cadcb17a5824bbf21a6 authored over 7 years ago by Josh de Leeuw <[email protected]>

Handle Error, notifications

3def32c7121561f5b73a85b36d269d88b126fbe3 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #120 from GavinQ1/master

Forgot Password flow; New Experiment; Save Experiment As

991442c6aa919c2fec799e745c791f7b547b8031 authored over 7 years ago by GavinQ1 <[email protected]>

Forgot Password flow; New Experiment; Save Experiment As

4da44aa799d9a2e3a3f886f9387304634519d7ee authored over 7 years ago by GavinQ1 <[email protected]>

clean up

8b719f771f9fdfdb83b27dc853ee505e364f1585 authored over 7 years ago by KristinDiep <[email protected]>

check for uncontrolled input

285ccc2f58b6686941faa7546cca97027d20d588 authored over 7 years ago by KristinDiep <[email protected]>

Merge pull request #115 from GavinQ1/master

Clean up

c3d1a5b568e74e411ffb612902e49a2b6f6c8d8a authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

3d988e9a86da3c2af808ec945cd0271e4159cf98 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #113 from jspsych/s3

S3

a037e1e5a15780953e03f60c5c0dda8dc3c9deec authored over 7 years ago by GavinQ1 <[email protected]>

Merge branch 'master' into s3

fcc47583238598967a0b11cd3addc542a1cc3367 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #114 from GavinQ1/master

Put id tracker inside state; try to modify test accordingly

102f0d01551e1edd245e7ce6d2dd802d5835dfbd authored over 7 years ago by GavinQ1 <[email protected]>

Put id tracker inside state; try to modify test accordingly

6985b953dfc3aec80fcae20958efb89d4a36cf98 authored over 7 years ago by GavinQ1 <[email protected]>

most of s3 functionality in place

still need to partition to folders in bucket and set access policy

ce1fe030f47c6263a4cd2409fe3188e08327feaa authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge pull request #112 from GavinQ1/master

Make all init have no empty string

4beb0d94f11d816b1214741e751bc7f14a8cf329 authored over 7 years ago by GavinQ1 <[email protected]>

Make all init have no empty string

db9c623e23484253f435f45b8e49eca82e79714f authored over 7 years ago by GavinQ1 <[email protected]>

Fix enable bug

8ea7b5bb47a2d6665f53fdf4db6539641bc3cbe6 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #111 from GavinQ1/master

Subscribe window.load listener

2ea2b6394eb5afe8ba3d855379d2d53b8c1f4329 authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

844336f199b7125158c1c89b20394c327e41f1df authored over 7 years ago by GavinQ1 <[email protected]>

Fix refresh page that everything is gone

4154b47d1bb64dba4533e5151cbefe0814db4b9a authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #110 from GavinQ1/master

Implement duplicate/ delete

e2bba475045599895c5f15bb76578c47abbee414 authored over 7 years ago by GavinQ1 <[email protected]>

Implement duplicate/ delete

f8e4afb80c24eab06d34573d54738e28e2580efc authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #109 from GavinQ1/master

Experiment List: load experiment from database

ebc7032d94efc6eb10d1532e1307c4e7622bee04 authored over 7 years ago by GavinQ1 <[email protected]>

Experiment List: load experiment from database

cc5e8eb50c1ead9b293694117feb941fc65fa7c3 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #108 from GavinQ1/master

Implement save case: click save; Add comment;

8d6ce00d3cfe65a95bd587d98da42f8197f72562 authored over 7 years ago by GavinQ1 <[email protected]>

Add comment

5bec42f3db27c022b1bb1d55f548dba5fe6f5bbb authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

ea0b345a0fc786baf3248dec9facad86dbf3b7c7 authored over 7 years ago by GavinQ1 <[email protected]>

Implement save case: click save; Add comment; Note that should convert all empty string to null

774ce13170c4fe393277959faab5a70c0d313e7b authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #107 from GavinQ1/master

Implement save case: 1. create account; 2. sign in (include fetch)

7796f6902c6532a346175790688bcad717f14c8a authored over 7 years ago by GavinQ1 <[email protected]>

Implement save case: 1. create account; 2. sign in (include fetch)

3f9bcd789bc8c77c71e6a4a0db73b71482ca58a7 authored over 7 years ago by GavinQ1 <[email protected]>

initial work on S3 component

c0b4bd437f936d7c2926aadc3b1bedd1c8c61c18 authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge pull request #106 from jspsych/table

Table

8d621c1a813a87711f87e2883377ad5933470780 authored over 7 years ago by kristiyip <[email protected]>

Merge remote-tracking branch 'origin/master' into table

Need to update branch

54cd760dafcca88219833fc48ca21a1a331de46e authored over 7 years ago by KristinDiep <[email protected]>

clean up, table fully functional

2c74c70c44ea69132010a4b32e386c5970e6ffc0 authored over 7 years ago by KristinDiep <[email protected]>

new table cells are empty strings

8b87351837d6de6896fe3cd1df49d27c153a2280 authored over 7 years ago by KristinDiep <[email protected]>

changed default for timeline_variables

9116bd1d8f79a70789b0abba8b24321608b66c1d authored over 7 years ago by KristinDiep <[email protected]>

Merge pull request #105 from GavinQ1/master

Fetch credential when login/refresh; Add dynamoDB calls: putItem (tryout);

f1dc1a6b802de37b0c27709b6461ed5c246ee480 authored over 7 years ago by GavinQ1 <[email protected]>

Try to add dynamoDB

e0d0478f3e9138a53437c0df31fff2cdfc8a0e2c authored over 7 years ago by GavinQ1 <[email protected]>

fetch credentials for login

6cc8936898cc173f6975faa021bdc0a5992e5fcc authored over 7 years ago by GavinQ1 <[email protected]>

fixed anchoring of popovers

6bc0588cbe18bbaafd21922c3d9254f849c20b99 authored over 7 years ago by KristinDiep <[email protected]>

makes sure there is always at least one header and one cell

5e00951e7e41b2e3b44520e5832dedf41e2bf58f authored over 7 years ago by KristinDiep <[email protected]>

Merge pull request #104 from GavinQ1/master

New aws cognito config

392f8ca7e80551344a09eb5ed2c3998aceb27fc1 authored over 7 years ago by GavinQ1 <[email protected]>

New aws cognito config

4902b535a092058e267bf9057f4245de7f3eb0a5 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #103 from GavinQ1/master

Add key shortcut to login workflow

cec2887c20e94df9343d491fcb91e849f5961861 authored over 7 years ago by GavinQ1 <[email protected]>

Add key shortcut to login workflow

56ea062c3b06f7a30b0d706c87d62baac6e0153c authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #102 from GavinQ1/master

Complete login workflow

6cf325b6f8292d4e6ecfafd887d7e8d1003b1680 authored over 7 years ago by GavinQ1 <[email protected]>

Complete login workflow

0e751edb3979d537123fcd91fe90008174ab169b authored over 7 years ago by GavinQ1 <[email protected]>

can delete by header

ee338cad9703dcd074b029a580c8568830888deb authored over 7 years ago by KristinDiep <[email protected]>

deletes row and column, changes don't appear immediately though

daaff6e1b2749802f8256955751888adca663e2d authored over 7 years ago by KristinDiep <[email protected]>

fixed buggy table

d560df6ad5b2206dd572a27e3e4bb2e0287dc209 authored over 7 years ago by KristinDiep <[email protected]>

Merge pull request #101 from GavinQ1/master

Login window

7d42b9f449b7578af6bf641c1a54d14265a00be1 authored over 7 years ago by GavinQ1 <[email protected]>

Login window

6ade4c67f34a2dd6f8f37bb7e88626fbac908c60 authored over 7 years ago by GavinQ1 <[email protected]>

cleaned up files

d08ebae097263d44c08bfb799f4b515c1861c5d3 authored over 7 years ago by KristinDiep <[email protected]>

can add rows and columns with key press, still buggy though

a0063dce71751c34ee503409e4715a4bb7ff6e63 authored over 7 years ago by KristinDiep <[email protected]>

changed paths

1f5bf593219fdf0187c9710c2ba9436073ae5214 authored over 7 years ago by KristinDiep <[email protected]>

Style changes

c4c8307adf644f1d1baeaa5b9325d960dfd58b1d authored over 7 years ago by GavinQ1 <[email protected]>

Style changes

8e75e3df16aba469a6f6b06e6ab3c94c48d1968e authored over 7 years ago by GavinQ1 <[email protected]>

Cancel swipe effect

ed9226506695bc09c74b50382832c01eba595010 authored over 7 years ago by GavinQ1 <[email protected]>

Cancel swipe effect

c195ba131f77eeab8c74ccd1d0441b049c2d4315 authored over 7 years ago by GavinQ1 <[email protected]>

Add swipe effect

482ca252064dbe37922be0b2209b969c835dcc35 authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

41085692de337621121cb8e14a8609849bf8fa91 authored over 7 years ago by GavinQ1 <[email protected]>

Clean up

2f4cf5c4b4e8c4f35dc59f67bef02fb7c0a5ded5 authored over 7 years ago by GavinQ1 <[email protected]>

Style change for login dialog

de5145e5fc0258a8ba407a62259a9d128ba87a89 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #100 from GavinQ1/master

Fix preview focus; Code organizer; Fix zoom bug

91db64dbc41843c253d096b9917be15c06b041d1 authored over 7 years ago by GavinQ1 <[email protected]>

Code organizer; Fix zoom bug

cc23533f193fc9c50f1895c7e171ff2e84cc69ca authored over 7 years ago by GavinQ1 <[email protected]>

Fix preview focus

58390f89abda404e3e486fbd1906e196a16a4d51 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #99 from GavinQ1/master

Fix reload issue

75ce1bd37b64244e76d5e9cfd0083542da192c76 authored over 7 years ago by GavinQ1 <[email protected]>

Fix reload issue

a313eb7197a2f730e45ee36ac3027fae687097b7 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #98 from GavinQ1/master

Change zindex for zoom

4547b7b88411a08c19d64be1758c394e0d086177 authored over 7 years ago by GavinQ1 <[email protected]>

Change zindex for zoom

e3b6e654191dfcbd73dffa959ab745587513aafc authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #97 from GavinQ1/master

Resolve merge conflicts

3a2252ee26efd3a285753298ad54739317a95308 authored over 7 years ago by GavinQ1 <[email protected]>

Resolve merge conflicts

0157cfd336f3ff8386be6857bdb917113dfee091 authored over 7 years ago by GavinQ1 <[email protected]>

uncommented files

816834d38fe62a001b234452f6e111449decdf45 authored over 7 years ago by KristinDiep <[email protected]>

can move around table using keys, need to add actions for more rows and columns

8220da0bc24c6603aa3ef93e3a6aad1c3d93cff1 authored over 7 years ago by KristinDiep <[email protected]>

numbers on left most side of table

c0290d8e20988f471f445f015282cf41a57772c0 authored over 7 years ago by KristinDiep <[email protected]>

table works like before, need to create key shortcuts

4ba82698291b60a6e8b71b57c5261dbfd590a249 authored over 7 years ago by KristinDiep <[email protected]>

Took out esmangle

1867db05eba918f374189a68efc221d515eaa446 authored over 7 years ago by KristinDiep <[email protected]>

Merge pull request #96 from GavinQ1/master

Structure for easier experiment switch

f1074366bce9846116bc961397493f3e47430371 authored over 7 years ago by GavinQ1 <[email protected]>

File re organizer

8136ea2eb0e2a17464b177a37a95233bd4b18dda authored over 7 years ago by GavinQ1 <[email protected]>

Structure for easier experiment switch

c35324c38041818cc4a8ff3e5f4096cf0044d562 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #94 from jspsych/cognito

Cognito

e5f274fa03a87a693fc85eba4a1ad084d44bb60c authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge branch 'master' into cognito

2541468f67a2a8716864cf3a0c32519169180ae0 authored over 7 years ago by Josh de Leeuw <[email protected]>

Merge pull request #93 from GavinQ1/master

Change zoom popover to select tag

17d10b0266607f05c0e602b7e495d05d943a30b5 authored over 7 years ago by GavinQ1 <[email protected]>

Style changes

63a14eebc0767f9850edf643df6b848a5113bcde authored over 7 years ago by GavinQ1 <[email protected]>

Style changes

fd83f72cc00a315acf5b308471ecfe211b8e8f22 authored over 7 years ago by GavinQ1 <[email protected]>

Change Zoom from popover to select tag; better structure

ebe159d1aa155a68956d504d9f935e934b5820f3 authored over 7 years ago by GavinQ1 <[email protected]>

Merge pull request #92 from GavinQ1/master

Handle zoom; Issue: popover menu not showing up in fullscreen mode

f34619353348cf06a07f6bb9cd04fcf2717eb1d7 authored over 7 years ago by GavinQ1 <[email protected]>

Zoom

56f042f2715bc8567747feb7eb7b1f26f2856a94 authored over 7 years ago by GavinQ1 <[email protected]>

partially working verification

ae0425735833c55faf38b0ff588066739a33f9cd authored over 7 years ago by Josh de Leeuw <[email protected]>

Zoom

94096a159f9b1e9f9a2646efb2cac975c5ac5b65 authored over 7 years ago by GavinQ1 <[email protected]>

basic sign in window

8188dd8c5d336ca989fb183a644b02b66730a20a authored over 7 years ago by Josh de Leeuw <[email protected]>

basic integration with cognito and client error handling

cb67c4e3916341697c10bfd213d43a15296016c6 authored over 7 years ago by Josh de Leeuw <[email protected]>

update .gitignore for aws config file

3e331de2a32e09bc83ab61f7f611ba914c5a6aea authored over 7 years ago by Josh de Leeuw <[email protected]>

add aws cognito to package.json

ab4498ebb5e60997ac5cc5b24957bc2488eb8f3b authored over 7 years ago by Josh de Leeuw <[email protected]>