Branch: refs/heads/master
Home: https://github.com/PathwayCommons/factoid
Commit: 676072b435d60ba1c7be1f11f2d15cdb51447207
https://github.com/PathwayCommons/factoid/commit/676072b435d60ba1c7be1f11f2d15cdb51447207
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Try using [email protected] for travis
Commit: 91ce2abced3bbff63c32c3a56d50450c420e96ab
https://github.com/PathwayCommons/factoid/commit/91ce2abced3bbff63c32c3a56d50450c420e96ab
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Enable sudo mode for travis; hopefully that allows rethinkdb to install
and run properly
Commit: 7da03d761a4dabab48725f05c96fe36a93ab9626
https://github.com/PathwayCommons/factoid/commit/7da03d761a4dabab48725f05c96fe36a93ab9626
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Use ubuntu 14.04 for travis
Commit: 033d4865321c740dcb3a610987f445a1427c542c
https://github.com/PathwayCommons/factoid/commit/033d4865321c740dcb3a610987f445a1427c542c
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Try manually installing and starting rethinkdb on travis
Commit: 6a7135b1f71a7d8a2279581b260c85439f6d1016
https://github.com/PathwayCommons/factoid/commit/6a7135b1f71a7d8a2279581b260c85439f6d1016
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Start rethinkdb manually by `rethinkdb &` for travis
Commit: cb092f223cba1a34800e909a5ba431a809802063
https://github.com/PathwayCommons/factoid/commit/cb092f223cba1a34800e909a5ba431a809802063
Author: Max Franz <[email protected]>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M Vagrantfile
Log Message:
-----------
Update Vagrantfile to trusty64 like travis
Commit: 56d516fad234087f6c0bd93032a2d6d5292df8c7
https://github.com/PathwayCommons/factoid/commit/56d516fad234087f6c0bd93032a2d6d5292df8c7
Author: Max Franz <[email protected]>
Date: 2017-07-25 (Tue, 25 Jul 2017)
Changed paths:
M package.json
Log Message:
-----------
Remove winston for client side logging #134
Closes #134
Commit: 9464e510b14389417bb1c7e084891a8da1dd0f9a
https://github.com/PathwayCommons/factoid/commit/9464e510b14389417bb1c7e084891a8da1dd0f9a
Author: Max Franz <[email protected]>
Date: 2017-07-26 (Wed, 26 Jul 2017)
Changed paths:
M src/client/components/editor/buttons.js
M src/client/components/editor/cy/cxtmenu.js
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/edgehandles.js
M src/client/components/editor/cy/make-cy-eles.js
M src/client/components/editor/cy/stylesheet.js
M src/client/components/editor/index.js
Log Message:
-----------
Simplify interactions view #138
- Increase edge width to make interaction nodes appear less pronounced
- Non-modal arity>=2 interaction simplification
- Disable add interaction button
- Adjust context menus for simplified interactions
- Improve hit target area for interaction nodes
Commit: 0d36a32a69a90b9947f97ec378a97ebaade77c94
https://github.com/PathwayCommons/factoid/commit/0d36a32a69a90b9947f97ec378a97ebaade77c94
Author: Max Franz <[email protected]>
Date: 2017-07-26 (Wed, 26 Jul 2017)
Changed paths:
M src/client/components/entity-info.js
M src/model/element/entity.js
M src/styles/editor/entity-info.css
Log Message:
-----------
Support bond / attachment tag #140
Commit: 398e9c0c23f927979cb4ac45bac3a732a6287605
https://github.com/PathwayCommons/factoid/commit/398e9c0c23f927979cb4ac45bac3a732a6287605
Author: Max Franz <[email protected]>
Date: 2017-07-27 (Thu, 27 Jul 2017)
Changed paths:
M src/client/components/editor/index.js
Log Message:
-----------
Adding interaction nodes needs to be allowed by the controller but not the UI
Commit: 8e552c5bb5aaa21db4184f7e8d2581e162232a66
https://github.com/PathwayCommons/factoid/commit/8e552c5bb5aaa21db4184f7e8d2581e162232a66
Author: Max Franz <[email protected]>
Date: 2017-07-27 (Thu, 27 Jul 2017)
Changed paths:
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/qtip.js
M src/client/components/editor/cy/stylesheet.js
Log Message:
-----------
Improves display of interaction nodes
Commit: 60aa694fc61cbb059eed85ba5d5d0c650399db85
https://github.com/PathwayCommons/factoid/commit/60aa694fc61cbb059eed85ba5d5d0c650399db85
Author: Max Franz <[email protected]>
Date: 2017-07-27 (Thu, 27 Jul 2017)
Changed paths:
M src/client/components/editor/index.js
Log Message:
-----------
Adding disconnected interactions should not be allowed via `i` key
Commit: 4dc1cc9cc2ea5548334da65308d2d6785292aad0
https://github.com/PathwayCommons/factoid/commit/4dc1cc9cc2ea5548334da65308d2d6785292aad0
Author: Max Franz <[email protected]>
Date: 2017-07-27 (Thu, 27 Jul 2017)
Changed paths:
M src/client/components/entity-info.js
Log Message:
-----------
Remove modification state from entity if it is unassociated in the UI
Commit: 5fd0811e6b5750b2e97343ae84173c5f1d764ff9
https://github.com/PathwayCommons/factoid/commit/5fd0811e6b5750b2e97343ae84173c5f1d764ff9
Author: Max Franz <[email protected]>
Date: 2017-08-09 (Wed, 09 Aug 2017)
Changed paths:
M src/client/components/entity-info.js
Log Message:
-----------
EntityInfo : Ensure that element references are clean
Commit: 3b5f5db328c11872b4b84d56611e9ea30f6976af
https://github.com/PathwayCommons/factoid/commit/3b5f5db328c11872b4b84d56611e9ea30f6976af
Author: Max Franz <[email protected]>
Date: 2017-08-09 (Wed, 09 Aug 2017)
Changed paths:
M src/client/components/editor/index.js
Log Message:
-----------
Editor : `.el.removeAllListeners()` shouldn't take an argument
Commit: 21c544a70115af89fb7e876ea41016cd32d931c2
https://github.com/PathwayCommons/factoid/commit/21c544a70115af89fb7e876ea41016cd32d931c2
Author: Max Franz <[email protected]>
Date: 2017-08-09 (Wed, 09 Aug 2017)
Changed paths:
M src/client/components/editor/cy/index.js
Log Message:
-----------
Editor : Make sure the preset layout is used at init (i.e. for existing doc
load case)
Commit: b8d30b5dc991c810fbd8682335d0496a501b009e
https://github.com/PathwayCommons/factoid/commit/b8d30b5dc991c810fbd8682335d0496a501b009e
Author: Max Franz <[email protected]>
Date: 2017-08-09 (Wed, 09 Aug 2017)
Changed paths:
M src/client/components/entity-info.js
Log Message:
-----------
EntityInfo : Don't generally read React `state` because it's set
asynchronously. Use a synchronous `data` store instead. Update `state` from
`data` changes and read `state` only in `render()`.
Commit: 76ecd17bc1bb81abc88e1b3ed232fd0edcfeec08
https://github.com/PathwayCommons/factoid/commit/76ecd17bc1bb81abc88e1b3ed232fd0edcfeec08
Author: Max Franz <[email protected]>
Date: 2017-08-09 (Wed, 09 Aug 2017)
Changed paths:
M README.md
Log Message:
-----------
Improve docker / env instructions in readme
Commit: 6e73f69a2c5d7e1af3bd00dc473fbc0cc06527f0
https://github.com/PathwayCommons/factoid/commit/6e73f69a2c5d7e1af3bd00dc473fbc0cc06527f0
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/client/components/editor/cy/automove.js
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/edgehandles.js
M src/client/components/editor/cy/layout.js
M src/client/components/editor/cy/make-cy-eles.js
M src/client/components/editor/cy/qtip.js
M src/client/components/editor/cy/stylesheet.js
M src/client/components/element-info.js
M src/client/components/interaction-info.js
M src/model/element-set.js
M src/model/element/interaction.js
M src/util/is.js
Log Message:
-----------
Writing to the interaction group working through the UI; graph state synching
TODO
Commit: 125beac49dbc3fdd03e630f0d0e5142545e02e63
https://github.com/PathwayCommons/factoid/commit/125beac49dbc3fdd03e630f0d0e5142545e02e63
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/client/components/editor/cy/qtip.js
Log Message:
-----------
InteractionInfo : Edge tooltips get positioned to avoid overlapping the side
of interest
Commit: 0dfc726fcd1c5a83078989efbeb3925ce0430be8
https://github.com/PathwayCommons/factoid/commit/0dfc726fcd1c5a83078989efbeb3925ce0430be8
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/model/element-set.js
Log Message:
-----------
ElementSet : Make sure element object are passed in emitted events
Commit: b869d5e6018acafbbf8b5dc2946329025813b912
https://github.com/PathwayCommons/factoid/commit/b869d5e6018acafbbf8b5dc2946329025813b912
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/stylesheet.js
Log Message:
-----------
InteractionInfo : Edge arrows get updated as the participants get regrouped
Commit: 2c3c3a67e685e8f5b22d4fdc31dfe44e2c3f55e7
https://github.com/PathwayCommons/factoid/commit/2c3c3a67e685e8f5b22d4fdc31dfe44e2c3f55e7
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/styles/base.css
Log Message:
-----------
A disabled select box should have its arrow greyed out
Commit: 551145eb1ed79f27ea2a461e05ecbaae4a26958a
https://github.com/PathwayCommons/factoid/commit/551145eb1ed79f27ea2a461e05ecbaae4a26958a
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/client/components/editor/cy/index.js
M src/client/components/editor/index.js
M src/client/components/interaction-info.js
M src/model/document/document.js
M src/model/element/interaction.js
M src/model/syncher.js
M src/styles/editor/editor.css
M src/styles/editor/interaction-info.css
M src/util/promise.js
Log Message:
-----------
- Syncher : hasCorrectSecret() for Syncher, filled in on create() or load(),
can be read synchronously
- Editor : Use syncher.hasCorrectSecret() for more accurate editable state
- Editor : Init Cytoscape only after the document is filled
Commit: 0e62fed6f49e068d1f596073d384f3b45141f84c
https://github.com/PathwayCommons/factoid/commit/0e62fed6f49e068d1f596073d384f3b45141f84c
Author: Max Franz <[email protected]>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/make-cy-eles.js
M src/client/components/editor/cy/stylesheet.js
M src/client/components/entity-info.js
M src/client/components/interaction-info.js
M src/model/element-set.js
M src/model/element/interaction.js
M src/styles/editor/element-info.css
M src/styles/editor/entity-info.css
M src/styles/editor/interaction-info.css
M src/styles/vars.css
Log Message:
-----------
InteractionInfo : Interaction participant type specification working well,
but Cytoscape bug TODO and remote update animations TODO
Commit: dbf5f865b695755137f50e441db83cfd7d3fc93f
https://github.com/PathwayCommons/factoid/commit/dbf5f865b695755137f50e441db83cfd7d3fc93f
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M package.json
Log Message:
-----------
Update to [email protected] to fix edge arrow change issue
Commit: 2eda3887fb9e4680d6ea86d2e09595d38cf1e04b
https://github.com/PathwayCommons/factoid/commit/2eda3887fb9e4680d6ea86d2e09595d38cf1e04b
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/util/dom.js
Log Message:
-----------
Add makeClassList to make specifying class lists to React more concise
Commit: 8a06cf10d7679e73d4431d5dba44f666b40e75cb
https://github.com/PathwayCommons/factoid/commit/8a06cf10d7679e73d4431d5dba44f666b40e75cb
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/model/element/entity.js
Log Message:
-----------
Remote unassociate events should be emitted only when the new association
value is exactly null
Commit: b585abbb9f7a8b2f9f06164005f126294c241623
https://github.com/PathwayCommons/factoid/commit/b585abbb9f7a8b2f9f06164005f126294c241623
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/styles/base.css
Log Message:
-----------
Disable the arrow opacity change on select boxes when disabled -- it
interferes with highlighting on edit
Commit: 803e6ec79d85d63a57eeac253587a637bb392dac
https://github.com/PathwayCommons/factoid/commit/803e6ec79d85d63a57eeac253587a637bb392dac
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/model/element/entity.js
Log Message:
-----------
Entity emits remotemodify events
Commit: 57e47c04aedbff2610ef77f8624dc97a48d5b6d3
https://github.com/PathwayCommons/factoid/commit/57e47c04aedbff2610ef77f8624dc97a48d5b6d3
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/client/components/editor/cy/doc.js
M src/client/components/entity-info.js
Log Message:
-----------
Remote modifications are given the remote edit coloured highlight
Commit: 4f2ce0926cc9af72948791db7746567b72ce47f1
https://github.com/PathwayCommons/factoid/commit/4f2ce0926cc9af72948791db7746567b72ce47f1
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/client/components/interaction-info.js
Log Message:
-----------
Simplify interaction type label
Commit: f1373b1736bc6277f5a2ec100c70761626636272
https://github.com/PathwayCommons/factoid/commit/f1373b1736bc6277f5a2ec100c70761626636272
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/client/components/interaction-info.js
Log Message:
-----------
Participant type UI reads from state rather than the model
Commit: 70c25a3f5cf31d949e9798493e16f433204b5b96
https://github.com/PathwayCommons/factoid/commit/70c25a3f5cf31d949e9798493e16f433204b5b96
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M src/client/components/editor/cy/doc.js
M src/client/components/interaction-info.js
Log Message:
-----------
Highlight remote interaction type changes
Commit: 537c2082be40f22d34bc14a658f6ec4ef02d8a66
https://github.com/PathwayCommons/factoid/commit/537c2082be40f22d34bc14a658f6ec4ef02d8a66
Author: Max Franz <[email protected]>
Date: 2017-08-14 (Mon, 14 Aug 2017)
Changed paths:
M .travis.yml
M README.md
M Vagrantfile
M package.json
M src/client/components/editor/buttons.js
M src/client/components/editor/cy/automove.js
M src/client/components/editor/cy/cxtmenu.js
M src/client/components/editor/cy/doc.js
M src/client/components/editor/cy/edgehandles.js
M src/client/components/editor/cy/index.js
M src/client/components/editor/cy/layout.js
M src/client/components/editor/cy/make-cy-eles.js
M src/client/components/editor/cy/qtip.js
M src/client/components/editor/cy/stylesheet.js
M src/client/components/editor/index.js
M src/client/components/element-info.js
M src/client/components/entity-info.js
M src/client/components/interaction-info.js
M src/model/document/document.js
M src/model/element-set.js
M src/model/element/entity.js
M src/model/element/interaction.js
M src/model/syncher.js
M src/styles/base.css
M src/styles/editor/editor.css
M src/styles/editor/element-info.css
M src/styles/editor/entity-info.css
M src/styles/editor/interaction-info.css
M src/styles/vars.css
M src/util/dom.js
M src/util/is.js
M src/util/promise.js
Log Message:
-----------
Merge branch 'unstable'
Compare:
https://github.com/PathwayCommons/factoid/compare/f1f109367045...537c2082be40
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.
