jalview

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

Merge branch 'documentation/JAL-3111_release_211' into develop

JAL-3111 release date now 20th June. more release note work..

    • -70
    • +149
    /help/help/html/releases.html
JAL-3111 report build type and commit in stdout from command line and in About/Splash screen

JAL-3299 JAL-3280 javadoc on BuildDetails bean

JAL-3111 report time when Jalview was built (consider making this a conditional)

Merge branch 'releases/Release_2_11_Branch' into develop

Merge branch 'bug/JAL-3295_CMD_select_not_working_in_sequence_selection' into develop

JAL-3143 recognise lnc_RNA as transcript

JAL-3295 Can now compile/run/debug in Eclipse with Java 1.8. Change JAVA_VERSION in gradle.properties

JAL-3295 Fixed CMD-select of sequences in alignment window

    • -0
    • +34
    /src/jalview/util/ShortcutKeyMaskExWrapper11.java
    • -0
    • +34
    /src/jalview/util/ShortcutKeyMaskExWrapper8.java
    • -0
    • +14
    /src/jalview/util/ShortcutKeyMaskExWrapperI.java
JAL-3299 Fixed gitHash and gitBranch definitions in build.gradle

JAL-3143 also parse "phase" from JSON response if present

    • -0
    • +5
    /src/jalview/ext/ensembl/EnsemblFeatures.java
JAL-3111 update release date placeholder

JAL-3288 fixes for gain/lose focus

JAL-3248 quick fix for build.gradle when pandoc not available

JAL-3248 building.html now generated by pandoc 'brew install pandoc'

JAL-3248 added conversion of building.md to building.html to gradle task. Will happen before making jar if pandoc available

Merge branch 'develop' into task/JAL-3248_rewritten_building_md_instructions

Merging in develop

Merge branch 'task/JAL-3248_rewritten_building_md_instructions' of https://source.jalview.org/git/jalview into task/JAL-3248_rewritten_building_md_instructions

JAL-3248 Building from source documentation in markdown and converted to HTML

JAL-3248 Building from source documentation in markdown and converted to HTML

JAL-3248 Almost completed building doc

Merge branch 'bug/JAL-3288splitFrameMenusJava11' into develop

JAL-3248 a bit more

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]

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.
Merge branch 'develop' into task/JAL-3248_rewritten_building_md_instructions

merging in latest changes in develop

JAL-3225 removing slightly misleading rewrite of .classpath when synchronizing/building in gradle

JAL-3225 Classpath now made in eclipse.classpath.file.whenMerged and recognised by buildship :)