Branch: refs/heads/release/3.7.1
Home: https://github.com/cytoscape/cytoscape-impl
Commit: 480abfc792ec55f576243d0414a97ecc26fa49e2
https://github.com/cytoscape/cytoscape-impl/commit/480abfc792ec55f576243d0414a97ecc26fa49e2
Author: Unknown
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
Log Message:
---
Cherrypick CYTOSCAPE-12465
Commit: 124c25eb5302187325d7565abbee56f5bf03fe6a
https://github.com/cytoscape/cytoscape-impl/commit/124c25eb5302187325d7565abbee56f5bf03fe6a
Author: Scooter Morris
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMediator.java
M gui-cmdline-parser-impl/pom.xml
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
Log Message:
---
Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into develop
Commit: ed8406ba5d677b1cecc78bcc21255d81b24bcde2
https://github.com/cytoscape/cytoscape-impl/commit/ed8406ba5d677b1cecc78bcc21255d81b24bcde2
Author: Scooter Morris
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMediator.java
M gui-cmdline-parser-impl/pom.xml
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
Log Message:
---
Revert "Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into
develop"
This reverts commit 124c25eb5302187325d7565abbee56f5bf03fe6a.
Commit: 3f15f4afc8380882cec4fb8fc43ec88a044b90ef
https://github.com/cytoscape/cytoscape-impl/commit/3f15f4afc8380882cec4fb8fc43ec88a044b90ef
Author: Christian Lopes
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMediator.java
M gui-cmdline-parser-impl/pom.xml
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/CyActivator.java
M
gui-cmdline-parser-impl/src/main/java/org/cytoscape/cmdline/gui/internal/StartupConfig.java
Log Message:
---
CYTOSCAPE-12464 #comment StartupConfig now waits for the
AppsFinishedStartingEvent before loading a session.
Commit: 06178e61f5c3fa0488034f4b29da7ca7c567321a
https://github.com/cytoscape/cytoscape-impl/commit/06178e61f5c3fa0488034f4b29da7ca7c567321a
Author: Christian Lopes
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/MacCyActivator.java
A
swing-application-impl/src/main/java/org/cytoscape/internal/actions/AboutAction.java
A
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/AboutDialog.java
R
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/CreditScreen.java
R
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTask.java
R
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTaskFactory.java
R swing-application-impl/src/main/resources/images/CytoscapeCredits.png
A swing-application-impl/src/main/resources/images/about.png
R swing-application-impl/src/main/resources/images/blank_icon_16.png
R swing-application-impl/src/main/resources/images/icon16x16.png
R swing-application-impl/src/main/resources/images/icon32x32.png
R swing-application-impl/src/main/resources/images/logo-light-grey-96.png
Log Message:
---
CYTOSCAPE-12469 #comment New About Dialog with: links, Java and OS info, no
developers list.
Commit: 43f4f90716cc8b00069cec0b8d884e42ca0966c3
https://github.com/cytoscape/cytoscape-impl/commit/43f4f90716cc8b00069cec0b8d884e42ca0966c3
Author: Unknown
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/AboutDialog.java
Log Message:
---
CYTOSCAPE-12469 #comment Minor updates to About Dialog.
Commit: c52b66c667e22c5134706af5f460a4aaac0c5edf
https://github.com/cytoscape/cytoscape-impl/commit/c52b66c667e22c5134706af5f460a4aaac0c5edf
Author: Unknown
Date: 2018-12-19 (Wed, 19 Dec 2018)
Changed paths:
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/help/AboutDialog.java