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

skeleton for table

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

fixed styling issues

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

skeleton for TimelineForm

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

Merge pull request #61 from GavinQ1/master

Merge: Try to fix drag and drop limit and clean up

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

Merge branch 'master' into master

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

Clean up

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

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

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

Try to fix drag and drop limit

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

added parameters back into trial state

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

Merge pull request #60 from jspsych/trial-form

Trial form

20c88c29f717a66a6d8cd0be84317fa06be2dfba authored over 7 years ago by kristiyip <[email protected]>

cleaned up debugging statements

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

added actions for parameter types

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

Merge pull request #59 from GavinQ1/master

Better hover for Organizer drag and drop

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

Merge branch 'master' into master

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

Better hover for Organizer drag and drop

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

dynamically retrieve plugin parameters

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

fix issue with state reference to update text fields

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

Merge pull request #58 from jspsych/display-trial-form

parameter values are saved

4b2aa74433ed4311cff1f342efd8dd46fd4b1cea authored over 7 years ago by kristiyip <[email protected]>

parameter values are saved

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

Merge pull request #57 from jspsych/display-trial-form

Display trial form

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

fixed selector

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

selecting plugin type works

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

able to fetch pluginType

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

pluginType now recognized

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

added trialform container

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

Merge pull request #56 from GavinQ1/master

Clean up

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

Clean up

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

Merge pull request #55 from GavinQ1/master

Fix bugs for sortable organizer; Notice there is still a limit

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

Fix bugs for sortable organizer; Notice there is still a limit

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

Merge pull request #54 from GavinQ1/master

Enable drag and drop

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

Enable drag and drop

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

Merge pull request #53 from GavinQ1/master

Revoke recursive way to render organizer items; Implement drag and dr…

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

Revoke recursive way to render organizer items; Implement drag and drop; Notice duplicate id bug when dragging

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

Merge pull request #52 from GavinQ1/master

Try out react-dnd

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

Try out react-dnd

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

Merge pull request #51 from GavinQ1/master

Skeleton for editor drawer container

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

Skeleton for editor drawer container

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

Merge pull request #50 from GavinQ1/master

Better Context Menu

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

Better context menu

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

Better context menu

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

Merge pull request #49 from GavinQ1/master

Add context menu

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

Add context menu

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

Merge pull request #48 from GavinQ1/master

Modify constants/utils; Add type attribute

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

Modify constants/utils; Add type attribute

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

Merge pull request #47 from GavinQ1/master

Cleaner structure

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

Cleaner structure

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

Merge

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

Merge

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

Merge branch 'GavinQ1-master'

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

Fix view issues

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

Fix view issues:

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

Fix bug

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

Enable delete

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

Basic tree menu

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

able to edit experiment name

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

Add test

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

Merge pull request #45 from jspsych/fixing-paths

fixed paths

56dea6480e3dfa3ed272378a45b8a5629169ad5a authored over 7 years ago by kristiyip <[email protected]>

fixed paths

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

Merge pull request #44 from GavinQ1/master

Test for reducers

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

Test for reducers

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

Merge pull request #43 from jspsych/recognizing-jsPsych

installed webpack and now recognizes jsPsych folder

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

installed webpack and now recognizes jsPsych folder

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

Merge pull request #42 from GavinQ1/master

TimelineNode Reducer; New packages

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

TimelineNode Reducer; New packages

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

Merge pull request #41 from jspsych/trial-form

deleted PluginForm.js

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

deleted PluginForm.js

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

Merge pull request #40 from jspsych/trial-form

base for trial form

06100c8294bd16604c6231499e41a8fef4be1b21 authored over 7 years ago by kristiyip <[email protected]>

base for trial form

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

Merge pull request #39 from GavinQ1/master

Add utility functions

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

Add utility functions

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

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

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

Resolve merge conflict

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

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

Need update

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

Better react state

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

added isTimeline toggle

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

Better react state

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

New Code Structure

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

Preview window size

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

Change subhead

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

Cleaner structure

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

Fix issue: latency in fading left side material-ui drawer-items

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

Some small parameter modifications

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

Add TimelineNodeEditorDrawer, better toggle for opening and closing drawers

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

New structure for the app, new resizable push drawer, new appbar

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

Merge pull request #38 from jspsych/Feature-CollapsingTimelines

Feature collapsing timelines

ccf4829054a53ab8314539ddbd17674689423c53 authored over 7 years ago by David Wallach <[email protected]>

Merge branch 'master' into Feature-CollapsingTimelines

2bd76d2528ca3d5e4b35f5e2f07dd83186996aaa authored over 7 years ago by David Wallach <[email protected]>

Collapsing timelines tested. Controlled by item in the timeline menu (to right of trial name)

1c38bbaa737f3639043b0a41b48853f50b0ad6bf authored over 7 years ago by dswallach <[email protected]>

Implemented collapsable timelines

4d16da7233219588993b2111186491736bf190b6 authored over 7 years ago by dswallach <[email protected]>

Fixing conflcts

674bb52028ebe41974573ab106f0a612d5b6bef8 authored over 7 years ago by dswallach <[email protected]>

Working on collapsable children

4e7db9f642bec943fe1349880d0c2b1ed96a7d81 authored over 7 years ago by dswallach <[email protected]>

Merge pull request #37 from jspsych/Updating-MOVE_TRIAL

Updating move trial

95315b4d211fd589d785b18dcda70f4795f1bfde authored over 7 years ago by David Wallach <[email protected]>

Merging with master

593faf1c95abc9c68fd21664e978d9fa4941a812 authored over 7 years ago by dswallach <[email protected]>

Tests now pass

1caca967df0d9eae78aef47fa49e66a5a3b1332d authored over 7 years ago by dswallach <[email protected]>

Fixed moving of trial into a Timeline

375705b48d28027f337a18f6c615dd3194c0ec4d authored over 7 years ago by dswallach <[email protected]>

Pre-merge

5b8be80fbd6d98e6d609a6cebc7a70e486afbdcf authored over 7 years ago by dswallach <[email protected]>

Was refactoring how the reducers work to simplify the setup. Maybe will finish this after finals. For now I'm just gonna fix the actions with the old setup

a5d0a90bedb8f927503c16bdbfeff2a7d528ce47 authored over 7 years ago by dswallach <[email protected]>

Merging Testing-TrialTable and Updating-MOVE_TRIAL

9d2bf4567075b48d8c96ead1c2032628d217f3c7 authored over 7 years ago by dswallach <[email protected]>

Working on new MOVE_TRIAL

22c15106f2b7df87f0a6be78c0208b59e8c12848 authored over 7 years ago by dswallach <[email protected]>

Merge pull request #35 from jspsych/Feature-DuplicateTrial

Feature duplicate trial

5ad6edcbe7670e9473057ed572ce6f848039fcb3 authored over 7 years ago by David Wallach <[email protected]>

Merge branch 'master' into Feature-DuplicateTrial

426fdca09731ff255c90629e4c30812aac67a2dd authored over 7 years ago by David Wallach <[email protected]>