Branch: refs/heads/hotfix/3.1.1
Home: https://github.com/cytoscape/cytoscape-impl
Commit: 7911bfb8f03fbe01a406b7a487f861ed3ee4d2c9
https://github.com/cytoscape/cytoscape-impl/commit/7911bfb8f03fbe01a406b7a487f861ed3ee4d2c9
Author: Keiichiro Ono <[email protected]>
Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths:
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapeJsNetworkReader.java
M
json-impl/src/main/java/org/cytoscape/io/internal/read/json/CytoscapejsMapper.java
M
json-impl/src/test/java/org/cytoscape/io/internal/read/json/JSONCytoscapejsNetworkReaderTest.java
M json-impl/src/test/resources/testData/galFiltered.cyjs
Log Message:
-----------
refs #2613 Network and edge tables will be imported from this version.
Commit: 2bc389845bc3738f437c35e4fb27e45a01ac0e2e
https://github.com/cytoscape/cytoscape-impl/commit/2bc389845bc3738f437c35e4fb27e45a01ac0e2e
Author: Keiichiro Ono <[email protected]>
Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths:
M editor-impl/src/main/java/org/cytoscape/editor/internal/ClipboardImpl.java
M
editor-impl/src/main/java/org/cytoscape/editor/internal/ClipboardManagerImpl.java
M editor-impl/src/main/java/org/cytoscape/editor/internal/CopyTask.java
M
editor-impl/src/main/java/org/cytoscape/editor/internal/CutEdgeTaskFactory.java
R editor-impl/src/main/java/org/cytoscape/editor/internal/CutEdit.java
M
editor-impl/src/main/java/org/cytoscape/editor/internal/CutNodeTaskFactory.java
M editor-impl/src/main/java/org/cytoscape/editor/internal/CutTask.java
M
editor-impl/src/main/java/org/cytoscape/editor/internal/CutTaskFactory.java
M editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
M
filter2-impl/src/main/java/org/cytoscape/filter/internal/column/ColumnFilter.java
M
filter2-impl/src/main/java/org/cytoscape/filter/internal/column/ColumnFilterViewFactory.java
M
filter2-impl/src/main/java/org/cytoscape/filter/internal/topology/TopologyFilter.java
M
filter2-impl/src/main/java/org/cytoscape/filter/internal/view/FilterPanelController.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/select/RowsSetViewUpdater.java
M
vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/ContinuousMappingImpl.java
Log Message:
-----------
Merged remote changes.
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/e813a533521f...2bc389845bc3
--
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 http://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.
