Branch: refs/heads/develop
Home: https://github.com/cytoscape/cytoscape-impl
Commit: fd7ed96bd50e084362fe1a261c5bf1a8a136a471
https://github.com/cytoscape/cytoscape-impl/commit/fd7ed96bd50e084362fe1a261c5bf1a8a136a471
Author: Adam Treister <adam.treis...@gladstone.ucsf.edu>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
A swing-application-impl/hs_err_pid90709.log
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/AbstractPrefsPanel.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/Cy3PreferencesPanel.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PPanels.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsAdvanced.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsBehavior.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsColor.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsEfficiency.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsGroups.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsLinks.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsNetwork.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsPrivacy.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsSecurity.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsStyles.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsTables.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PrefsText.java
R
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/lib/FontAwesomeIcon.java
R
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/lib/fontawesome-webfont.ttf
Log Message:
-----------
making prefs extensible, remove fontawesome
Commit: d0d8008e124538785aec2780cb9b68d03659de3a
https://github.com/cytoscape/cytoscape-impl/commit/d0d8008e124538785aec2780cb9b68d03659de3a
Author: Adam Treister <adam.treis...@gladstone.ucsf.edu>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseWheelListener.java
M
equations-impl/src/main/java/org/cytoscape/equations/internal/EquationParserImpl.java
M
equations-impl/src/main/java/org/cytoscape/equations/internal/Tokeniser.java
M
equations-impl/src/test/java/org/cytoscape/equations/internal/AttribParserTest.java
M
equations-impl/src/test/java/org/cytoscape/equations/internal/interpreter/InterpreterTest.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/Cy3PreferencesPanel.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/BiModalJSplitPane.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoPanelImpl.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoPanelUtil.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
Log Message:
-----------
Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into
develop
# Conflicts:
#
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/Cy3PreferencesPanel.java
Commit: f384c958b6a955cdc14704bd4cb7a6383bc0e744
https://github.com/cytoscape/cytoscape-impl/commit/f384c958b6a955cdc14704bd4cb7a6383bc0e744
Author: Adam Treister <adam.treis...@gladstone.ucsf.edu>
Date: 2018-03-06 (Tue, 06 Mar 2018)
Changed paths:
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/Cy3PreferencesPanel.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/prefs/PPanels.java
Log Message:
-----------
extensible prefs
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/ea584292b7af...f384c958b6a9
--
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 cytoscape-cvs+unsubscr...@googlegroups.com.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
Visit this group at https://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.
