Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-3438 spotless for 2.11.2.0

    • -229
    • +229
    ./AnnotationColourScheme.java
    • -4282
    • +4425
    ./JalviewModelType.java
  1. … 647 more files in changeset.
JAL-3438 - all src and test run through spotless..

    • -229
    • +229
    ./AnnotationColourScheme.java
    • -4282
    • +4425
    ./JalviewModelType.java
  1. … 654 more files in changeset.
JAL-3785 JAL- Merge branch 'bug/JAL-3785autoOverviewTitle' into 2_11_2_develop regenerated jaxb bindings for updated schemas on develop & feature branch Conflicts: src/jalview/gui/Preferences.java src/jalview/xml/binding/jalview/JalviewModel.java src/jalview/xml/binding/jalview/ObjectFactory.java src/jalview/xml/binding/jalview/package-info.java

  1. … 57 more files in changeset.
JAL-3863 add canonical DBRefEntry flag to Jalview project

  1. … 12 more files in changeset.
JAL-3863 add canonical DBRefEntry flag to Jalview project

  1. … 12 more files in changeset.
JAL-1713 save Overview title in project, don't save Overview on New View

  1. … 2 more files in changeset.
JAL-1713 schema and JAXB changes to save Overview in project file

  1. … 1 more file in changeset.
JAL-3705 JAL-3251 unused attribute repurposed/renamed to mappedFromId

  1. … 2 more files in changeset.
Shouldn't these be optional ? 2.11.0 project files will not have these options.

Shouldn't these be optional ? 2.11.0 project files will not have these options.

also probably necessary

also probably necessary

needs an issue

needs an issue

The routine doesn't match the documentation - should really fix it up

The routine doesn't match the documentation - should really fix it up

JAL-3081: Let manual annotation ordering take precedence over automatic
JAL-3081: Let manual annotation ordering take precedence over automatic
JAL-3081 schema and binding class changes to save annotation sort order

  1. … 1 more file in changeset.
JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from the applet branch. AND IT WORKS (sometimes)

  1. … 343 more files in changeset.
JAL-3210 Barebones gradle/buildship/eclipse. See README

    • -0
    • +5090
    ./JalviewModelType.java
  1. … 1990 more files in changeset.
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha

  1. … 32 more files in changeset.
JAL-3251 added optional attributes Sequence.biotype, Mapping.mappingType

  1. … 11 more files in changeset.
JAL-3251 added optional attributes Sequence.biotype, Mapping.mappingType

Conflicts:

src/jalview/xml/binding/jalview/AlcodonFrame.java

src/jalview/xml/binding/jalview/Annotation.java

src/jalview/xml/binding/jalview/AnnotationColourScheme.java

src/jalview/xml/binding/jalview/AnnotationElement.java

src/jalview/xml/binding/jalview/DoubleMatrix.java

src/jalview/xml/binding/jalview/DoubleVector.java

src/jalview/xml/binding/jalview/Feature.java

src/jalview/xml/binding/jalview/FeatureMatcher.java

src/jalview/xml/binding/jalview/FeatureMatcherSet.java

src/jalview/xml/binding/jalview/FilterBy.java

src/jalview/xml/binding/jalview/JalviewModel.java

src/jalview/xml/binding/jalview/JalviewUserColours.java

src/jalview/xml/binding/jalview/MapListType.java

src/jalview/xml/binding/jalview/Mapping.java

src/jalview/xml/binding/jalview/NoValueColour.java

src/jalview/xml/binding/jalview/ObjectFactory.java

src/jalview/xml/binding/jalview/PcaDataType.java

src/jalview/xml/binding/jalview/Pdbentry.java

src/jalview/xml/binding/jalview/Sequence.java

src/jalview/xml/binding/jalview/SequenceSet.java

src/jalview/xml/binding/jalview/SequenceType.java

src/jalview/xml/binding/jalview/ThresholdType.java

src/jalview/xml/binding/jalview/VAMSAS.java

src/jalview/xml/binding/jalview/WebServiceParameterSet.java

src/jalview/xml/binding/jalview/package-info.java

  1. … 11 more files in changeset.
JAL-3187 Viewport schema attributes for showComplementFeatures[OnTop]

  1. … 11 more files in changeset.
JAL-3187 Viewport schema attributes for showComplementFeatures[OnTop]

Conflicts:

src/jalview/xml/binding/jalview/AlcodonFrame.java

src/jalview/xml/binding/jalview/Annotation.java

src/jalview/xml/binding/jalview/AnnotationColourScheme.java

src/jalview/xml/binding/jalview/AnnotationElement.java

src/jalview/xml/binding/jalview/DoubleMatrix.java

src/jalview/xml/binding/jalview/DoubleVector.java

src/jalview/xml/binding/jalview/Feature.java

src/jalview/xml/binding/jalview/FeatureMatcher.java

src/jalview/xml/binding/jalview/FeatureMatcherSet.java

src/jalview/xml/binding/jalview/FilterBy.java

src/jalview/xml/binding/jalview/JalviewModel.java

src/jalview/xml/binding/jalview/JalviewUserColours.java

src/jalview/xml/binding/jalview/MapListType.java

src/jalview/xml/binding/jalview/Mapping.java

src/jalview/xml/binding/jalview/NoValueColour.java

src/jalview/xml/binding/jalview/ObjectFactory.java

src/jalview/xml/binding/jalview/PcaDataType.java

src/jalview/xml/binding/jalview/Pdbentry.java

src/jalview/xml/binding/jalview/Sequence.java

src/jalview/xml/binding/jalview/SequenceSet.java

src/jalview/xml/binding/jalview/SequenceType.java

src/jalview/xml/binding/jalview/ThresholdType.java

src/jalview/xml/binding/jalview/VAMSAS.java

src/jalview/xml/binding/jalview/WebServiceParameterSet.java

src/jalview/xml/binding/jalview/package-info.java

  1. … 11 more files in changeset.
JAL-3285 build Jalview XML file for current version

  1. … 12 more files in changeset.
JAL-2738 use GeneLocus extends DBRefEntry to hold chromosomal mappings

  1. … 15 more files in changeset.
JAL-2738 use GeneLocus extends DBRefEntry to hold chromosomal mappings

  1. … 15 more files in changeset.
JAL-3063 remove stale JAXB binding POJO

JAL-1767 port save/load PCA panel to JAXB - JAL-3063

    • -0
    • +186
    ./DoubleMatrix.java
  1. … 15 more files in changeset.
JAL-3130 incorporating feature/JAL-3063jaxbNoCastor and new script utils/jdeps_jlink_all.sh which works out module dependencies (not as straightforward as it should be) and makes a java 11 JRE

    • -0
    • +326
    ./AlcodonFrame.java
    • -0
    • +857
    ./Annotation.java
    • -0
    • +254
    ./AnnotationColourScheme.java
    • -0
    • +203
    ./AnnotationElement.java
    • -0
    • +160
    ./FeatureMatcher.java
    • -0
    • +192
    ./FeatureMatcherSet.java
    • -0
    • +5090
    ./JalviewModel.java
    • -0
    • +5090
    ./JalviewModelType.java
    • -0
    • +612
    ./JalviewUserColours.java
    • -0
    • +315
    ./MapListType.java
    • -0
    • +61
    ./NoValueColour.java
    • -0
    • +424
    ./ObjectFactory.java
  1. … 1447 more files in changeset.
JAL-3063 top level element added to JalviewWsParamSet.xsd

  1. … 8 more files in changeset.
JAL-3063 top level element added to colours schema, JAXB classes regen'd

  1. … 8 more files in changeset.