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

Merge from upstream

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

Merge pull request #91 from jspsych/user-menu

User menu

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

style changes

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

add basic form fields to registration component

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

Merge remote-tracking branch 'refs/remotes/origin/master' into user-menu

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

Merge pull request #90 from GavinQ1/master

Enable full screen

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

register window component added

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

Enable full screen

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

initial commit of component.

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

Merge pull request #89 from GavinQ1/master

Fix toggle this only bug

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

Fix toggle this only bug

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

Merge pull request #88 from GavinQ1/master

Control for if include a timeline node when play

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

Control for if include a timeline node when play

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

Merge pull request #87 from GavinQ1/master

Style changes

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

Style changes

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

Merge pull request #86 from GavinQ1/master

Toolbar for Preview

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

Toolbar for Preview

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

Merge pull request #85 from GavinQ1/master

Handle auto generating timeline code

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

Pull changes from jsPsych

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

Handle timeline code

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

Merge pull request #84 from GavinQ1/master

Handle function code generation and put all parameters in parameters object

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

Handle function code generation

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

Merge pull request #83 from GavinQ1/master

Resolve merge issue

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

Resolve merge issue

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

Merge pull request #82 from GavinQ1/master

Pre-handle play all

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

Relocate function stringify

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

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

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

Pre-handle play all

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

Merge pull request #81 from GavinQ1/master

File name changes

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

Merge branch 'master' into master

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

fixed path

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

File name changes

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

everying working in popover, still need to do key events for spreadsheet

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

Merge pull request #78 from GavinQ1/master

Some style changes

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

Some style changes

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

Some style changes

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

Merge pull request #77 from GavinQ1/master

Some style change

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

Sync fork

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

Some style change

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

Merge pull request #76 from GavinQ1/master

Merge "parse function"

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

Merge branch 'master' into master

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

Parse function

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

clean up

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

table is now popover

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

adds rows

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

values save properly

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

create function that turns array of arrays into array of objects

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

created function to change array of objects to array of arrays

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

Handle converting string to code

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

Merge pull request #75 from GavinQ1/master

Try auto generate jsPsych code for trial

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

Fix merge issues

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

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

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

Try auto generating code

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

Merge pull request #74 from GavinQ1/master

Change files name/path

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

Merge branch 'master' into master

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

Change files name/path

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

Merge

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

Add changing timeline node names

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

trial and timeline form renders again

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

Merge pull request #72 from GavinQ1/master

Prepare future files adding

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

Prepare future files adding

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

Merge pull request #71 from GavinQ1/master

Properer names

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

Properer names

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

Merge pull request #70 from GavinQ1/master

Add deepCopy function

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

Add deepCopy function

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

Merge pull request #69 from GavinQ1/master

Fix webpack issue

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

Fix webpack issue

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

Merge pull request #67 from GavinQ1/master

jsPsych.init Editor; Code Editor;

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

Create index.html

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

jsPsych.init Editor; Code Editor

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

Update README.md

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

Update README.md

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

Update README.md

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

Update README.md

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

Create README.md

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

Merge pull request #66 from GavinQ1/master

Frame for jsPsych.init Editor; Major file reoganize

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

Frame for jsPsych.init Editor; Major file reoganizer

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

Restructure

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

Merge remote-tracking branch 'upstream/master'

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

Merge pull request #65 from GavinQ1/master

Set up webpack; dev-env

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

Set up webpack; dev-env

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

Merge pull request #64 from GavinQ1/master

Merge features: Duplicate node; Common context menu; Enable keyboard control; Add comment and test;

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

Add more test

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

Comments and tests

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

Fix keyboard bug

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

Enable keyboard to control organizer items

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

Common context menu

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

Enable duplicate node

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

Clean up

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

Merge pull request #63 from GavinQ1/master

Optimization

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

Clean up

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

Optimization

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

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

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

Fix small bug

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

Merge pull request #62 from GavinQ1/master

Finally D&D as wanted!

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

Merge branch 'master' into master

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

Clean up

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

D&D as wanted!!

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

Save

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

D&D Tree menu

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