jalview

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

    • -2
    • +1
    /resources/lang/Messages_es.properties
JAL-1608 leave Create Group, Remove Group menu items enabled

    • -23
    • +2
    /src/jalview/jbgui/GAlignFrame.java
JAL-2401 code and help tidy for review comments

    • -5
    • +0
    /src/jalview/gui/UserDefinedColours.java
JAL-2401 don't apply lower case colour to upper case

    • -7
    • +8
    /src/jalview/gui/UserDefinedColours.java
Merge branch 'develop' into bug/JAL-2399textColour

    • -5
    • +30
    /resources/lang/Messages.properties
    • -4
    • +22
    /resources/lang/Messages_es.properties
JAL-2346 JAL-1933 test updated to include Occupancy

JAL-2346 always run setup!

JAL-2346 more test coverage for AnnotationColourGradient

Merge branch 'develop' into bug/JAL-2346annotationChoice

Conflicts:

src/jalview/gui/AnnotationRowFilter.java

    • -15
    • +15
    /src/jalview/gui/AnnotationRowFilter.java
Merge branch 'develop' into bug/JAL-1608createGroups

    • -4
    • +28
    /resources/lang/Messages.properties
    • -3
    • +20
    /resources/lang/Messages_es.properties
    • -28
    • +36
    /src/jalview/appletgui/AlignFrame.java
    • -12
    • +18
    /src/jalview/gui/AlignFrame.java
JAL-2360 fix applet build by separating castor XML dependency from jalview.schemes.ColourSchemes to jalview.schemes.ColourSchemeLoader

    • -1
    • +2
    /src/jalview/gui/ColourMenuHelper.java
    • -2
    • +3
    /src/jalview/gui/UserDefinedColours.java
    • -0
    • +125
    /src/jalview/schemes/ColourSchemeLoader.java
    • -115
    • +0
    /src/jalview/schemes/ColourSchemes.java
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

JAL-2388 unit test initialisation fix for running full suite

    • -0
    • +1
    /test/jalview/gui/AlignmentPanelTest.java
JAL-2464 fix cancel tree print behaviour

JAL-2388 Reinstated original overview checks for annotation display

    • -2
    • +5
    /src/jalview/appletgui/OverviewPanel.java
Merge remote-tracking branch 'origin/bug/JAL-2436featureRendererThreading' into develop

Conflicts:

src/jalview/appletgui/OverviewPanel.java

src/jalview/gui/OverviewPanel.java

Merge remote-tracking branch 'origin/develop' into bug/JAL-2436featureRendererThreading

Conflicts:

src/jalview/appletgui/OverviewPanel.java

src/jalview/gui/OverviewPanel.java

    • -269
    • +138
    /src/jalview/appletgui/OverviewPanel.java
    • -14
    • +24
    /src/jalview/appletgui/SeqCanvas.java
    • -301
    • +137
    /src/jalview/gui/OverviewPanel.java
JAL-2311 suppress autocalc'd annotation to isolate the 'real' failure

JAL-2307 Fixed SiftsClient unit test

    • -2
    • +30
    /test/jalview/ws/sifts/SiftsClientTest.java
JAL-2306 assert no DAS sources

JAL-2438 removed (non-functional) lastSeq, lastSequenceFeatures

JAL-2243 update discovered features on opening structure in Chimera

    • -0
    • +11
    /src/jalview/gui/ChimeraViewFrame.java
JAL-2438 check for null FeatureRenderer

    • -1
    • +4
    /src/jalview/ext/jmol/JalviewJmolBinding.java
Merge branch 'features/JAL-2388OverviewWindow' into develop

Merge branch 'bug/JAL-2421overviewboxflicker' into develop

JAL-2388 Comment typo

JAL-2388 ViewportRanges unit test

    • -0
    • +100
    /test/jalview/viewmodel/ViewportRangesTest.java
JAL-2437 Synchronization corrections and unit tests

JAL-2388 Renamed column and row subtraction functions

Merge branch 'merges/develop_JAL2295setChimeraAttributes' into develop