Branch: refs/heads/feature/json-support
  Home:   https://github.com/cytoscape/cytoscape-impl
  Commit: d4cb0917c6289d9b4dd229160df0e9084da81832
      
https://github.com/cytoscape/cytoscape-impl/commit/d4cb0917c6289d9b4dd229160df0e9084da81832
  Author: Samad Lotia <[email protected]>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/EditorManagerImpl.java

  Log Message:
  -----------
  Added support for VisualPropertyValueEditor to EditorManagerImpl


  Commit: 42d1c691d11db0d9d74633b05a0cb205123e51e9
      
https://github.com/cytoscape/cytoscape-impl/commit/42d1c691d11db0d9d74633b05a0cb205123e51e9
  Author: Samad Lotia <[email protected]>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CPath2Factory.java
    M cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CyActivator.java
    A 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/MergeNetworkEdit.java
    R 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
    M 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/NetworkMergeUtil.java
    M 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/view/CollapsablePanel.java
    M 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/view/SearchBoxPanel.java
    M 
cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/view/tree/CheckNodeRenderer.java
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/arrow_collapsed.gif
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/arrow_expanded.gif
    A cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/pc.png
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/question.png
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/arrow_collapsed.gif
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/arrow_expanded.gif
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/pc.png
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/question.png
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/run_tool.gif
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/stock_autofilter.png
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/stock_toggle-graphics-16.png
    R 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/resources/stock_zoom-16.png
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/run_tool.gif
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/stock_autofilter.png
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/stock_toggle-graphics-16.png
    A 
cpath2-impl/src/main/resources/org/cytoscape/cpath2/internal/view/stock_zoom-16.png
    A cpath2-impl/src/test/java/TestCytoscapeCPathWebService.java
    R 
cpath2-impl/src/test/java/org/cytoscape/coreapp/cpath2/test/TestCytoscapeCPathWebService.java
    M io-impl/impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderFactory.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/nnf/NNFNetworkReader.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/nnf/NNFNetworkReaderFactory.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReaderFactory.java
    M 
io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReader.java
    M io-impl/impl/src/main/java/org/cytoscape/io/internal/util/ReadUtils.java
    M 
io-impl/impl/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderTest.java
    M 
io-impl/impl/src/test/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReaderTest.java
    M io-impl/performance/src/main/java/org/cytoscape/io/read/sif/PerfTest.java

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/cytoscape/cytoscape-impl into 
develop


  Commit: 071473a38ccf603570ec791942b72657f10943f6
      
https://github.com/cytoscape/cytoscape-impl/commit/071473a38ccf603570ec791942b72657f10943f6
  Author: Samad Lotia <[email protected]>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java

  Log Message:
  -----------
  Initial steps for converting numerical value editor


  Commit: 90851286a2bd25d4a65ba11c314aa82b58578a4d
      
https://github.com/cytoscape/cytoscape-impl/commit/90851286a2bd25d4a65ba11c314aa82b58578a4d
  Author: Samad Lotia <[email protected]>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M 
ding-impl/performance-debug/src/main/java/org/cytoscape/ding/internal/PerfTest.java

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/cytoscape/cytoscape-impl into 
develop


  Commit: 1976f12b44e5b70ed82a4c108f512d5bd31b0152
      
https://github.com/cytoscape/cytoscape-impl/commit/1976f12b44e5b70ed82a4c108f512d5bd31b0152
  Author: Christian Lopes <[email protected]>
  Date:   2013-08-30 (Fri, 30 Aug 2013)

  Changed paths:
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java

  Log Message:
  -----------
  Fixes #2099: "Undo: Hide Selected Nodes/Edges" works now


  Commit: 2031ce71840ebbffb502b22172bbee66ae89aed7
      
https://github.com/cytoscape/cytoscape-impl/commit/2031ce71840ebbffb502b22172bbee66ae89aed7
  Author: Keiichiro Ono <[email protected]>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
    M 
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/EditorManagerImpl.java
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/editor/valueeditor/NumericValueEditor.java

  Log Message:
  -----------
  Merge branch 'develop' into feature/json-support


  Commit: 4f8f37ed01506d95037c139b76adb017dbbc7ae0
      
https://github.com/cytoscape/cytoscape-impl/commit/4f8f37ed01506d95037c139b76adb017dbbc7ae0
  Author: Keiichiro Ono <[email protected]>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M .gitignore
    M json-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
    M json-impl/src/test/resources/site/.idea/workspace.xml

  Log Message:
  -----------
  Minor updates only.


Compare: 
https://github.com/cytoscape/cytoscape-impl/compare/085399f7ef24...4f8f37ed0150

-- 
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/groups/opt_out.

Reply via email to