jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' into bug/JAL-2837

Conflicts:

src/jalview/gui/SeqPanel.java

Merge branch 'develop' into bug/JAL-2837

JAL-2811 release note

JAL-2541 not in 2.10.3, JAL-2831 signed off.

JAL-2698 11th hour release today

Merge branch 'bug/JAL-2831' into develop

    • -69
    • +188
    /src/jalview/gui/SeqCanvas.java
JAL-2541 JAL-2829 JAL-2830 JAL-2822 catch all release note entry for sequence feature relocation

Merge branch 'bug/JAL-2829deleteCharsWithGaps' into develop

    • -37
    • +50
    /src/jalview/datamodel/Sequence.java
JAL-2831 Removed unwanted hidden sequences checks

JAL-2831 Don't show cursor if position in hidden region

Merge branch 'bug/JAL-2811' into bug/JAL-2831

JAL-2811 Updated following review

JAL-2840 fix wrapped scrolling when using cursor at a hidden region

JAL-2834 JAL-2836 temporarily disabled wrapped mode fastpaint

JAL-2831 ported to applet

    • -1
    • +2
    /src/jalview/appletgui/ScalePanel.java
    • -2
    • +14
    /src/jalview/appletgui/SeqCanvas.java
    • -33
    • +28
    /src/jalview/appletgui/SeqPanel.java
JAL-2831 tidies and tests

Merge branch 'bug/JAL-2811' into bug/JAL-2831

JAL-2811 Changed to overlay on via graphics context, not separate image

JAL-2811 Missed commit

JAL-2811 Made it work for hidden columns/seqs too

JAL-2831 Attempt at cursor fix for wrapped mode

JAL-2758 update uniprot retrieval test

    • -7
    • +4
    /test/jalview/ws/dbsources/UniprotTest.java
Merge branch 'bug/JAL-2811' into bug/JAL-2831

JAL-2831 deal with hidden cols and seqs in new cursor code

JAL-2831 Added move viewport event and set up cursor code to use it

Merge branch 'imp/JAL-2774' into bug/JAL-2831

JAL-2758 release notes

JAL-2698 formatting