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

Duplicate trial implemented and tested

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

Minor update for duplicate child trial

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

Duplicate trial implemented and tested or trials on the top level

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

Working on trial duplication

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

Merge pull request #34 from jspsych/Get-Defaults-in-Reducer

default values of params are set by reducer

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

default values of params are set by reducer

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

Updated notes

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

Merge pull request #33 from jspsych/Toggle-Boolean-Params

added toggle for boolean params

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

added toggle for boolean params

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

Update .travis.yml

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

Added tests for MAKE_TRIAL, MAKE_TIMELINE, CHANGE_NAME

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

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

* 'master' of https://github.com/jsPsych/jsPsych-Redux-GUI:
Fixed Add Trial
Minor Change

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

Fixed reducers for transforming trial into timeline and visa versa

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

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

* 'master' of https://github.com/jsPsych/jsPsych-Redux-GUI:
Minor Change

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

Fixed Add Trial

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

Merge pull request #30 from jspsych/Travis-Test

Minor Change. Test of Travis setup was a success.

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

Minor Change

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

Merge pull request #29 from jspsych/Structure-TrialAsAStore

Structure trial as a store (Travis not setup yet)

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

Working on travis config

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

Fixed error when calling MAKE_TRIAL

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

Notes update

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

Started restructing of Trial

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

Fixed new tab opening when hovering over ButtonMenu

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

Added tests for openTrial

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

Added testing for dragged

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

Added test for over

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

Tests...

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

Implementing more tests for trialTable

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

Added some tests for trialTable. Fixed some issues with adding trials

40699fdb7e5fca0b307a23c819bc78a0d20db76e authored over 7 years ago by DSWallach <[email protected]>

Confirmed status after merge

d526136f70f669a1c36b2991c815e8decfbe2bc0 authored over 7 years ago by DSWallach <[email protected]>

Merge pull request #13 from jspsych/Feature-CombineReducers

Feature combine reducers

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

Update README.md

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

Update README.md

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

Implemented testing for trialOrder

fde98f47a78081bc805dfd919241af3e5c480938 authored over 7 years ago by DSWallach <[email protected]>

Updated Testing

0c58e9c1135b27df4afdaaf6b85f8cf0f865e911 authored over 7 years ago by DSWallach <[email protected]>

Updated testing setup

e8146afc4a805939bd27db3cbcee4eaed714ad88 authored over 7 years ago by DSWallach <[email protected]>

Gui Renders, adding property testing to identify issues

c57183662d7cc013cfeac9381e18ed95e0a0d8f4 authored over 7 years ago by DSWallach <[email protected]>

Gui Renders again

ad09372e3c300a53df20c8ee9e6a32dfd516d8a6 authored over 7 years ago by DSWallach <[email protected]>

Working on pastStates and futureStates

6c6187a7fde7c8a120058ac54ff77d738162cdcf authored over 7 years ago by DSWallach <[email protected]>

Work Continues

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

Update Notes

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

Updating notes

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

Changing reducers setup

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

Merge pull request #8 from jspsych/Feature-RemoveChildren

Fixed some Errors. Added Child Remove feature.

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

Fixed: Errors thrown by PluginForm, Errors caused by dragging a trial onto its child, Errors caused by dragging a trial onto itself. Added removeChild/removeSingleTrial functionality

3b59b9260f2044dd47316a8d20e073e01daab504 authored over 7 years ago by DSWallach <[email protected]>

Temporary Commit

ea0d4802341d9b02411cbed6f7ddee0f6fccb6b3 authored over 7 years ago by DSWallach <[email protected]>

Stopped pluginForm throwing an error

911f3c3fa6388520c8e01f794255cdcf42fb5044 authored over 7 years ago by DSWallach <[email protected]>

Cleaning up files

65eac9ab354136e25ae5b369a192a7dff8a06550 authored over 7 years ago by DSWallach <[email protected]>

Fixed errors when installing with npm. Got eslint config to a good place

561a49ba2f61620deca752dd837a551ed57ce1c2 authored over 7 years ago by DSWallach <[email protected]>

Fixed isTimeline toggle

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

Cleaning

4b691703bf12b985ed07ce834f0d84a824c37256 authored over 7 years ago by DSWallach <[email protected]>

Merge pull request #7 from jspsych/Component-AppBar

Component app bar

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

GUI renders. Master needs toggleIsTimeline updated

62b351769fc254b3b852e8fb188ed442d401c7d2 authored over 7 years ago by DSWallach <[email protected]>

GUI renders. Master needs toggleIsTimeline updated

63f4df79ef6843eab60af3920f0806ca10667ca4 authored over 7 years ago by DSWallach <[email protected]>

Merge branch 'master' into Component-AppBar

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

Adding ESLint for syntax uniformity

eed1f46803ed7da78b6953776203aa39d0866ad3 authored over 7 years ago by DSWallach <[email protected]>

Merge pull request #6 from jspsych/plugin-form

Plugin form

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

Material in PluginForm.jsx now renders in open drawer

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

Commenting

dd5f3d24589a41b01c73278a7033488a99b26fd7 authored over 7 years ago by DSWallach <[email protected]>

Merge branch 'Component-AppBar' of https://github.com/jspsych/jsPsych-Redux-GUI into Component-AppBar

Forgot to pull before making changes

23b75e8e4b0b3d0139b2561c92d19cdc9fb82237 authored over 7 years ago by DSWallach <[email protected]>

Clean up

b00db010ef1a18748306deae9608dc660b682f6f authored over 7 years ago by DSWallach <[email protected]>

Clean Up

b8afe281af155cfe80fde674187a0c5fb385c8cb authored over 7 years ago by DSWallach <[email protected]>

moved plugin form to another component, need to display in open drawer

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

Update on deleting children

3c1ed6c6022184fa5ec321e029efb59c6cb7031d authored over 7 years ago by DSWallach <[email protected]>

able to grab parameters of plugin

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

To do implement REMOVE_CHILD_TRIAL

88bcec622d6474aaf43a2d81d48e69a5c4de085b authored over 7 years ago by DSWallach <[email protected]>

Added HotKeys for adding children and making trials into timelines

e11ad44e174d102f10be02d79f0ccb0039000950 authored over 7 years ago by DSWallach <[email protected]>

Got drag n drop working with nested trials

fe39b9ce3f5cc20eac40a43db69d7d8f74204aba authored over 7 years ago by DSWallach <[email protected]>

now displays name of selected plugin type

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

fix update to store/state, need to display text of trial type

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

moved plugin form functions to PluginDrawer to fix dispatch being undefined

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

trying to get parameters of plugin

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

Able to load plugin, fixing store/state update

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

Got nested trials working properly. It has messed up the drag n drop functionality however. Working on a fix

8c45b1cfa11a5c946893cf70aa95d89a95286418 authored over 7 years ago by DSWallach <[email protected]>

Added nested trial functionality, currently can only nest to one level

69fadcf3b88072b8595d6d41fc9a1a3642d78333 authored over 7 years ago by DSWallach <[email protected]>

Improved the drag n drop UX

6903a4aa79175ffe994d38665e3fdf581d7c1e2e authored over 7 years ago by DSWallach <[email protected]>

Things

3490463d2ea6218fa882202674a760f83f8aeced authored over 7 years ago by DSWallach <[email protected]>

Got the timeline drawer working

8dc74262cafc2248660088f595360ec8cb835973 authored over 7 years ago by DSWallach <[email protected]>

Working on a drawer for the timeline

48880f9a44796adb46376493f73e01bf5bd9ffba authored over 7 years ago by DSWallach <[email protected]>

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

"Getting the latest code"

bbcbc8fe8841ef1abcfc1dedc1ea3df4071165a9 authored over 7 years ago by DSWallach <[email protected]>

update index.html

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

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

"Added the app bar"

d49a1f648802a4952403dd897bfd9668c110254f authored over 7 years ago by DSWallach <[email protected]>

add jspsych files

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

Highlighting Fix

07ce1989bf160af470bf33735b82949ff8f706db authored over 7 years ago by DSWallach <[email protected]>

add state to plugindrawer

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

Merge pull request #5 from jspsych/feature-reorderingTrials

Feature reordering trials

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

Merge branch 'master' into feature-reorderingTrials

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

Fixed animation issues when dragging a trial

a335e22721f65941f69950701ee9ee5bda910176 authored over 7 years ago by DSWallach <[email protected]>

Added select trial type, need to fix placement

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

Drag and drop is working. Still needs work on the visuals and the size of the drop area

07cbe6fdebe5d45d19e6afd5d94f25ce60aebbc1 authored over 7 years ago by DSWallach <[email protected]>

Reordering works correctly in the store. Doesn't render the moved trial.

e12e30fe85abac5a529d0ca00ff4ef61c44b3c77 authored over 7 years ago by DSWallach <[email protected]>

Working on drag and drop implementation

7ab0493153828aa03212424fc2fd99d10bc7adaf authored over 7 years ago by DSWallach <[email protected]>

Implemented HotKeys for Timeline. SelectableTrialList must be in focus (won't work if the drawer is in focus)

cfaae07b5526c59f41d756500e7c75a8f6ddbdf7 authored over 7 years ago by DSWallach <[email protected]>

Changed hash keys to random number for better performance

fd51634690fad3e439cac7287895695b9e98b67d authored over 7 years ago by DSWallach <[email protected]>

Merge pull request #4 from jspsych/toggle-isTimeline

Toggle is timeline

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

fix inline style

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

fix update state for toggle radio buttons

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

add toggle radio buttons

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

Merge pull request #3 from jspsych/name-change

resolve trial name change

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

Fixed menu position and added highlighting for the trial open in the drawer

c9746e6b384166b090c0120e9ae1e30a69fdbedc authored over 7 years ago by DSWallach <[email protected]>