Merge Mol 49 into dev - Githubissues

moltimate / moltimate-frontend

Moltimate's frontend source code.

GNU General Public License v2.0

8 stars 2 forks source link

Merge Mol 49 into dev #79

Closed kdm5498 closed 4 years ago

kdm5498 commented 4 years ago

Description

Contains the components needed to perform the visualization of a docked ligand and protein. For a test upload file, see file in JIRA ticket.

Checklist

[ ] Code compiles correctly
[ ] Created tests which fail without the change (if possible)
[ ] All tests passing
[ ] Extended the README / documentation, if necessary

kdm5498 commented 4 years ago

Git has decided that everything done by Eric is also part of this review. The parts actually under review are DummyData.js, MoltimateContainer.js, TopBar.js, ngl-util.js, and DockingContainer.js.

ada-phillips commented 4 years ago

It looks like you branched off of Eric's branch rather than dev, which is why all of the extra changes and merge conflicts got dragged in there. Would it be possible for you to rebase to dev, or just open a new PR using the diff between this one and dev?

I really don't like how messy this is.

kdm5498 commented 4 years ago

I just attempted a rebase to dev. It did not help at all with cleaning up, and I think it just made it messier.

kdm5498 commented 4 years ago

Closed to open pull request on branch with only differences from dev.