jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-3751 only merge strictly contiguous ranges of mappings

    • -112
    • +88
    /test/jalview/util/MapListTest.java
    • -10
    • +17
    /test/jalview/util/MappingUtilsTest.java
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

JAL-3718 force re-initialise of getdown.txt file when new getdown.txt downloaded from appbase. getdown jar and version files

    • binary
    /getdown/lib/getdown-launcher-local.jar
JAL-3718 force re-initialise of getdown.txt file when new getdown.txt downloaded from appbase. getdown src files

Merge branch 'feature/JAL-3615gzipXfam' into develop

JAL-3746 bump release version for 2.11.2 series (currently on develop)

JAL-3679 Added externally specified plugins dir to J2sPlugin check

JAL-3679 Added externally specified plugins dir to J2sPlugin check

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

JAL-3680 merged description of individual cursor key actions

JAL-3732 - sequences can be moved up/down in cursor mode via alt-up/down arrow JAL-3733 TODO - provide an undo for sequence/group up/down moves

JAL-3518 removed unneeded override in ChimeraCommands

    • -27
    • +0
    /src/jalview/ext/rbvi/chimera/ChimeraCommands.java
JAL-3018 Ensembl reviewed REST version updated to 13.0

JAL-1191 use Cache.log for logging

    • -2
    • +2
    /src/jalview/ext/so/SequenceOntology.java
JAL-3018 updated reviewed REST version to 12.0

JAL-3615 code tidy, improve unit test

JAL-2656 better read of (potential) gzip magic bytes

JAL-2656 Java 8 compatible test for gzipped, refactored for unit test

    • -13
    • +44
    /test/jalview/io/FileIOTester.java
Merge branch 'task/JAL-3597memoryLeakTest' into develop

JAL-3597 Increased heap passmark to <= 45MB and report smallest of failed attempts heap size

    • -5
    • +10
    /test/jalview/gui/FreeUpMemoryTest.java
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

Merge branch 'task/JAL-3608_property_set_laf_and_tests' into develop

    • -37
    • +178
    /src/jalview/bin/Jalview.java
JAL-3691 Changed .toUppoerCase().startsWith(...) to .regionMatches(true,...) as upper-cased 'i' in Turkish is not 'I'.

JAL-3477 Improved command line arguments description in memory.html

JAL-3477 Added -help text for jvmmempc and jvmmemmax. Fixed typo and slight rewording in help/memory.html

    • -3
    • +3
    /help/help/html/features/clarguments.html
JAL-3477 added help documentation for executable jar command line arguments -jvmmempc and -jvmmemmax

    • -0
    • +19
    /help/help/html/features/clarguments.html
Merge branch 'bug/JAL-2983negativeSliderMin' into develop

Conflicts:

src/jalview/gui/FeatureSettings.java

src/jalview/gui/FeatureTypeSettings.java

    • -20
    • +13
    /src/jalview/gui/AnnotationColourChooser.java
    • -15
    • +13
    /src/jalview/gui/AnnotationColumnChooser.java
    • -34
    • +28
    /src/jalview/gui/FeatureTypeSettings.java
JAL-3371 JAL-2983 don't modify 'extent' of slider - this is managed by look and feel

Merge branch 'feature/JAL-3615gzipXfam' into develop

JAL-3615 JAL-2656 missing import after cherrypick