jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-2673 turn off update to running flag from scrollUp/scrollRight

    • -14
    • +18
    /src/jalview/appletgui/SeqPanel.java
JAL-2673 Attempt to stop infinite scrolling etc

Merge branch 'releases/Release_2_10_2b1_Branch' of http://source.jalview.org/git/jalview into releases/Release_2_10_2b1_Branch

    • -12
    • +4
    /src/jalview/gui/OverviewPanel.java
Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch

JAL-2611 reinstated missed commit

    • -8
    • +5
    /src/jalview/appletgui/OverviewPanel.java
    • -13
    • +4
    /src/jalview/gui/OverviewPanel.java
JAL-2675 release notes

Merge branch 'feature/JAL-2587' into documentation/JAL-2675_release2102b1

    • -1
    • +2
    /resources/lang/Messages_es.properties
    • -6
    • +145
    /src/jalview/gui/OverviewCanvas.java
    • -19
    • +52
    /src/jalview/gui/OverviewPanel.java
Merge branch 'bug/JAL-2691_nomultimermapping' into documentation/JAL-2675_release2102b1

JAL-2672 JAL-2665 release notes. Also note this merge does not resolve JAL-2673

Merge branch 'bug/JAL-2665-2.10.2b' into documentation/JAL-2675_release2102b1

JAL-2664 JAL-2527 signs for release

Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch

JAL-2588 overview tab docs, whats new and release notes

    • -0
    • +30
    /help/html/features/preferences.html
Merge branch 'feature/JAL-2527' into documentation/JAL-2675_release2102b1

JAL-2681 release notes

Merge branch 'features/JAL-2681_duplicatecrossrefs' into documentation/JAL-2675_release2102b1

JAL-2527 Additional test

JAL-2527 Unit test for group colouring

JAL-2527 Unit test

JAL-2527 Fix typo

    • -1
    • +1
    /resources/lang/Messages_es.properties
JAL-2527 Updated Spanish, adjusted UI so Spanish fits

    • -3
    • +3
    /resources/lang/Messages_es.properties
JAL-2527 Updates following code review

JAL-2527 Code comments, tidy

    • -4
    • +22
    /src/jalview/renderer/OverviewResColourFinder.java
JAL-2527 Added default setting/resetting and first pass at Spanish

    • -8
    • +9
    /resources/lang/Messages_es.properties
    • -8
    • +27
    /src/jalview/jbgui/GPreferences.java
JAL-2527 Wired up cached values to overview

    • -2
    • +12
    /src/jalview/gui/OverviewPanel.java
    • -2
    • +37
    /src/jalview/renderer/OverviewResColourFinder.java
Merge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527

Conflicts:

src/jalview/renderer/OverviewRenderer.java

Merge branch 'feature/JAL-2664' into feature/JAL-2527

JAL-2664 Updates following review

JAL-2527 Added overview prefs - don't get picked up by overview yet

    • -4
    • +5
    /resources/lang/Messages_es.properties
    • -12
    • +37
    /src/jalview/gui/Preferences.java
    • -28
    • +73
    /src/jalview/jbgui/GPreferences.java