Build: #2 did not start
Job: Default Job did not complete
Code commits
Jalview Gitlab
-
Gitlab User 87afc897f4ab4cf704d7e1c000421e81e0464919
Merge tag 'Release_2_11_5_0'
-
Gitlab User 86d2c844db19c23c7922b5fd103807d0d2469a66 m
Merge branch 'development/Release_2_11_5_Branch' into releases/Release_2_11_5_Branch
-
Gitlab User 2c0064b6000a3666230f5f3ff75e356835e68bd2 m
JAL-4531 updated resolved issues and knowndefects
- help/markdown/releases/release-2_11_5_0.md (version 2c0064b6000a3666230f5f3ff75e356835e68bd2)
-
Gitlab User 7cc6b9e721a23f8fc07ee1c1b72ffb120d04ce2c m
Merge branch 'development/Release_2_11_5_Branch' into releases/Release_2_11_5_Branch
-
Gitlab User 4798881414450fbc88fb6b2be7fd6952c3a74750 m
JAL-4531 2.11.5.0 release date and notes finalised !
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 4798881414450fbc88fb6b2be7fd6952c3a74750)
- help/markdown/releases/release-2_11_5_0.md (version 4798881414450fbc88fb6b2be7fd6952c3a74750)
-
Gitlab User 31da99d4ce594efdb3e2ce7fa3ed8e3e2340cb59 m
JAL-4594 call alignmentChanged after retrieving from Pfam or FileLoader import to make sure SS consensus line is properly shown.
- src/jalview/viewmodel/AlignmentViewport.java (version 31da99d4ce594efdb3e2ce7fa3ed8e3e2340cb59)
- src/jalview/io/FileLoader.java (version 31da99d4ce594efdb3e2ce7fa3ed8e3e2340cb59)
- src/jalview/gui/SequenceFetcher.java (version 31da99d4ce594efdb3e2ce7fa3ed8e3e2340cb59)
-
Gitlab User bf7d2e6f2e0341525d492851456575c898f6a375 m
JAL-4594 refactor showOrHide annotation routine in Commands to the AlignFrame and JAL-4595 TODO
- src/jalview/gui/AlignFrame.java (version bf7d2e6f2e0341525d492851456575c898f6a375)
- src/jalview/bin/Commands.java (version bf7d2e6f2e0341525d492851456575c898f6a375)
-
Gitlab User 37e2f1301e78bcd12a5fb70c3c0f30e75f084436 m
Merge branch 'bug/JAL-4530_applescript_to_detect_Applications_symlink' into development/Release_2_11_5_Branch
-
Ben Soares <b.soares@dundee.ac.uk> beaf02f8336050fefcb1c3d240e094e62835b689 m
JAL-4530 Updated applescript installer to handle symbolic links in user-space Applications folder. Better error handling too.
- utils/macos_dmg/Install Jalview/Install Jalview_app.tgz (version beaf02f8336050fefcb1c3d240e094e62835b689)
- utils/macos_dmg/Install Jalview/Install Jalview.applescript (version beaf02f8336050fefcb1c3d240e094e62835b689)
- utils/macos_dmg/Install Jalview/Install Jalview.app/Contents/Resources/applet.rsrc (version beaf02f8336050fefcb1c3d240e094e62835b689)
- utils/macos_dmg/Install Jalview/Install Jalview.app/Contents/Resources/Scripts/main.scpt (version beaf02f8336050fefcb1c3d240e094e62835b689)
- utils/macos_dmg/Install Jalview/Install Jalview.app/Contents/MacOS/applet (version beaf02f8336050fefcb1c3d240e094e62835b689)
- utils/macos_dmg/Install Jalview/Install Jalview.app/Contents/Info.plist (version beaf02f8336050fefcb1c3d240e094e62835b689)
-
Gitlab User a4348463fb1ec42cef72a8610b716df178ae0d58 m
JAL-4530 - use the modified entitlements file in the signand staple script!
- utils/osx_signing/sign_and_staple_dmg.sh (version a4348463fb1ec42cef72a8610b716df178ae0d58)
-
Gitlab User ba8078010f7f5e01c8ee14eb279a5e2909e0369c m
JAL-4530 different entitlements for the applescript app
- utils/osx_signing/sign_and_staple_dmg.sh (version ba8078010f7f5e01c8ee14eb279a5e2909e0369c)
-
Gitlab User eee3f2dded8a755a9f5908f4019803e5d72692d1 m
Merge branch 'local_patch' into development/Release_2_11_5_Branch
-
Gitlab User 0eb4264c2c33ca17c327ae7d7faa6174b39fbbfd m
JAL-4530 applescript event send entitlement
- utils/osx_signing/entitlements_installer.txt (version 0eb4264c2c33ca17c327ae7d7faa6174b39fbbfd)
-
Gitlab User c93a71c13f154f1df718ef6c37ad1476fcbe633d m
Merge branch 'development/Release_2_11_5_Branch' into releases/Release_2_11_5_Branch
-
Gitlab User 1dc8cdd9076e4b9223233c4e0a1294a680271069 m
JAL-4531 update release date and document fixed JAL-4591
- help/markdown/releases/release-2_11_5_0.md (version 1dc8cdd9076e4b9223233c4e0a1294a680271069)
-
Gitlab User 628293dbdf94c35a2ea274ae28c6fae589174be8 m
JAL-4591 check if content and/or encoding are not null before gzip detection test
- src/jalview/io/FileParse.java (version 628293dbdf94c35a2ea274ae28c6fae589174be8)
-
Gitlab User 74fcd2876f6f9284a0a60c38fb45c4f28e569c05 m
JAL-4590 missed one isBlank - thanks GJB for spotting this !
- src/mc_view/PDBChain.java (version 74fcd2876f6f9284a0a60c38fb45c4f28e569c05)
-
Gitlab User 10ac6777fc94f0f0e02b3b06e75298481aa735ff m
JAL-4531 bump release date
- help/markdown/releases/release-2_11_5_0.md (version 10ac6777fc94f0f0e02b3b06e75298481aa735ff)
-
Gitlab User 5765a74cd167eec2c8bb65eaa5fe07ef36f7f1ea m
JAL-4590 missed one isBlank - thanks GJB for spotting this !
- src/mc_view/PDBChain.java (version 5765a74cd167eec2c8bb65eaa5fe07ef36f7f1ea)
-
Gitlab User 2f427136a49a2ba278366cf58f64a22de4f72922 m
JAL-4531 bump release date
- help/markdown/releases/release-2_11_5_0.md (version 2f427136a49a2ba278366cf58f64a22de4f72922)
-
Gitlab User a026dd4286797a601b43f7dd543b68ff88242322 m
JAL-4428 - fix typo in script
- utils/osx_signing/sign_and_staple_dmg.sh (version a026dd4286797a601b43f7dd543b68ff88242322)
-
Gitlab User be4730bcd4417ff4db856450f16b74c2e2aa62a9 m
JAL-4428 - staple the installer app too
- utils/osx_signing/sign_and_staple_dmg.sh (version be4730bcd4417ff4db856450f16b74c2e2aa62a9)
-
Gitlab User 21442d821750ca3f585c1afc4c7865d2f4e1c04b m
JAL-4590 patch out isBlank - also fix sense for PDBChain.addMetadata so chain ID is always writen unless null
- src/mc_view/PDBChain.java (version 21442d821750ca3f585c1afc4c7865d2f4e1c04b)
- src/jalview/io/AnnotationFile.java (version 21442d821750ca3f585c1afc4c7865d2f4e1c04b)
- src/jalview/datamodel/BinaryNode.java (version 21442d821750ca3f585c1afc4c7865d2f4e1c04b)
-
Gitlab User 46d253667c89c3ea40c5c7683903bdde3e176cd7 m
JAL-4531 JAL-4435 fix broken doc links
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 46d253667c89c3ea40c5c7683903bdde3e176cd7)
- help/help/html/colourSchemes/ssconservation.html (version 46d253667c89c3ea40c5c7683903bdde3e176cd7)
-
Gitlab User 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae m
JAL-4531 updated docs and release notes - new image for JAL-4435
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/html/structures/secstrtree_providers.png (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/html/colourSchemes/ssconservation.html (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/html/calculations/treeviewer.html (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/html/calculations/tree.html (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/html/calculations/protssconsensus.html (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/helpTOC.xml (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
- help/help/help.jhm (version 1b1f14c4ae42a5541c0b8bd860de502046ebb2ae)
-
Gitlab User f4212816e7744405f3d7995ddea8aa8bdce29eb8 m
JAL-4531 release note for JAL-4530
- help/markdown/releases/release-2_11_5_0.md (version f4212816e7744405f3d7995ddea8aa8bdce29eb8)
-
Gitlab User c30612ac298595727aab99caadaf0ae5da66471a m
JAL-4428 update osx dmg sign/staple script for presence of Jalview Installer.app (JAL-4530)
- utils/osx_signing/sign_and_staple_dmg.sh (version c30612ac298595727aab99caadaf0ae5da66471a)
-
Gitlab User e0239344ebc01920adc116cb2571e0e4a4533161 m
Merge branch 'development/Release_2_11_5_Branch' into feature/JAL-4542_highlight_selected_annot_labels_tree_nodes
-
Gitlab User 6b4aa677b3c9253c88ec9315e1cdca8a44602ea7 m
JAL-4531 release notes for JAL-4469 and minimal documentation
- help/markdown/releases/release-2_11_5_0.md (version 6b4aa677b3c9253c88ec9315e1cdca8a44602ea7)
- help/help/html/features/uniprotsequencefetcher.html (version 6b4aa677b3c9253c88ec9315e1cdca8a44602ea7)
-
Gitlab User 2ac3be950c04d0e17c859ba5efbc7a4902714a1c m
Merge branch 'improvement/JAL-4469_handling_uniprot_versioned_accesion_ids' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User e324269560d54a1ffcffd7777acf64cf2780b71a m
Merge branch 'development/Release_2_11_5_Branch' into improvement/JAL-4469_handling_uniprot_versioned_accesion_ids
-
Gitlab User 128879808cbe19fc3c76f191d37344d04e17e799 m
JAL-4531 release notes and docs for JAL-4555
- help/markdown/releases/release-2_11_5_0.md (version 128879808cbe19fc3c76f191d37344d04e17e799)
- help/help/html/menus/alignmentMenu.html (version 128879808cbe19fc3c76f191d37344d04e17e799)
-
Gitlab User 7bbb968bd75e0bba484d9b9acf204d0a8d3847dc m
JAL-4531 patch and release notes for JAL-4589
- src/jalview/viewmodel/AlignmentViewport.java (version 7bbb968bd75e0bba484d9b9acf204d0a8d3847dc)
- help/markdown/releases/release-2_11_5_0.md (version 7bbb968bd75e0bba484d9b9acf204d0a8d3847dc)
-
Gitlab User 8efa8feba5f42843831a6bc0546face306a28d4e m
Merge branch 'patch/JAL-4555_sort_by_descr' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 492b5f4c42ac30e42e37e55d81cd1176ada3dbfc m
JAL-4531 release note for JAL-4507
- help/markdown/releases/release-2_11_5_0.md (version 492b5f4c42ac30e42e37e55d81cd1176ada3dbfc)
-
Gitlab User 90efd081f05c512d7fa63d09d0ce854eabfeb864 m
Merge branch 'bug/JAL-4507_Some_exported_annotations_being_reloaded_as_sequences' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 525ab10fdc50be45c8065cb29ed443b3038ef25a m
Merge branch 'improvement/JAL-4530_add_applescript_to_allow_installation_to_home_applications_folder' into development/Release_2_11_5_Branch
-
Gitlab User 8def1f47f8b4b4bedbe9cdacb5a7d2c2ddb63649 m
JAL-4531 add JAL-4500 to release notes
- help/markdown/releases/release-2_11_5_0.md (version 8def1f47f8b4b4bedbe9cdacb5a7d2c2ddb63649)
-
Gitlab User 7c3df8ddd5b32d1ac9470193527320258222c556 m
Merge branch 'development/Release_2_11_5_Branch' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 4a59ca7ec2e2cf1c61a9212af2f57b33885ab1bb m
Merge branch 'development/Release_2_11_5_Branch' into improvement/JAL-4530_add_applescript_to_allow_installation_to_home_applications_folder
-
Gitlab User 26d345f359143157ac95f3cdc0d2479b3db855f7 m
JAL-4531 JAL-4428 release notes
- help/markdown/releases/release-2_11_5_0.md (version 26d345f359143157ac95f3cdc0d2479b3db855f7)
-
Gitlab User 8291b4ce34559c51e0661417bc8cb43f1b8babd6 m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4507_Some_exported_annotations_being_reloaded_as_sequences
-
Gitlab User d7fbd2ad269e569d8710dfa0b138931773c15e91 m
Merge branch 'development/Release_2_11_5_Branch' into patch/JAL-4555_sort_by_descr
-
Gitlab User 99260f56593e048004a4fcbd03dd1f45b5250607 m
JAL-4531 documented JAL-4505
- help/markdown/releases/release-2_11_5_0.md (version 99260f56593e048004a4fcbd03dd1f45b5250607)
-
Gitlab User 9aedf81cdf8dc418bcd12fd0d26a78ae93baf46e m
Merge branch 'bug/JAL-4505_install4j_background_image_and_dark_mode' into development/Release_2_11_5_Branch
-
Gitlab User bd6043d718ae378490d21c755bb16e1d35265130 m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4505_install4j_background_image_and_dark_mode
-
Gitlab User e8ddc0df17b0f841153821da4f6f3d4c64550d83 m
Merge branch 'improvement/JAL-4541_slight_increase_in_robustness_of_analytics_from_jalview_desktop' into development/Release_2_11_5_Branch
-
Gitlab User 4c1030d5e3e709e06d191146c44e5ef65421790f m
JAL-4531 update release date and documented JAL-4541
- help/markdown/releases/release-2_11_5_0.md (version 4c1030d5e3e709e06d191146c44e5ef65421790f)
-
Gitlab User 0b49394ab4347cd84580f9cda33cfc2ca10b5cf7 m
JAL-4555 update i18n
- resources/lang/Messages.properties (version 0b49394ab4347cd84580f9cda33cfc2ca10b5cf7)
-
Gitlab User ca94fb631ecb3852f558edbaefcd303f1c0207b4 m
Merge branch 'development/Release_2_11_5_Branch' into patch/JAL-4555_sort_by_descr
-
Gitlab User 0da3cea35a76b43a1b932bbf775df92433e42aaf m
Merge branch 'development/Release_2_11_5_Branch' into feature/JAL-4542_highlight_selected_annot_labels_tree_nodes
-
Gitlab User f4510730ed33779e3e8d0c6c0467551c9e5b9657 m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4507_Some_exported_annotations_being_reloaded_as_sequences
-
Gitlab User df642e690d6dd6a19673ebedf66a037576321eb6 m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4505_install4j_background_image_and_dark_mode
-
Gitlab User f0d02101a3a53fc6f4bb445b90e99befb69b5c12 m
Merge branch 'development/Release_2_11_5_Branch' into improvement/JAL-4541_slight_increase_in_robustness_of_analytics_from_jalview_desktop
-
Gitlab User a80eab8b26c56c05943cfc158793fdcb88650d78 m
JAL-4548 reinstated old version of uniref50_Multiple_SS_Providers_Data.jvp under testdata and patched test to use that version.
- test/jalview/project/Jalview2xmlTests.java (version a80eab8b26c56c05943cfc158793fdcb88650d78)
- examples/testdata/uniref50_Multiple_SS_Providers_Data.jvp (version a80eab8b26c56c05943cfc158793fdcb88650d78)
-
Gitlab User 37ecf54b59c7aab35770a02c4c1e99ffe1b656ea m
JAL-4548 test caught a typo - fixed
- src/jalview/project/Jalview2XML.java (version 37ecf54b59c7aab35770a02c4c1e99ffe1b656ea)
-
Gitlab User 1961f82290a1fc6e12b57c711f7f5b6c051edfa1 m
Merge branch 'development/Release_2_11_5_Branch' into improvement/JAL-4541_slight_increase_in_robustness_of_analytics_from_jalview_desktop
-
Gitlab User e72880149cfe6bd69e409e72104753a8dc652818 m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4505_install4j_background_image_and_dark_mode
-
Gitlab User 2e7917c10e1e7e618d45c24bbf2e9e302272826d m
Merge branch 'development/Release_2_11_5_Branch' into bug/JAL-4507_Some_exported_annotations_being_reloaded_as_sequences
-
Gitlab User 88f553a38184a3b06ec2b3a65c40ed374c563cc5 m
Merge branch 'patch/JAL-4428_osx_codesigning_scripts' into development/Release_2_11_5_Branch
-
Gitlab User 23eb1dd1f8720d8917dd7d63edf9f9c8552bfb8f m
Merge branch 'feature/JAL-4542_highlight_selected_annot_labels_tree_nodes' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 6058891fda12a8e71ecdc8175c94b2ae3203a436 m
Merge branch 'development/Release_2_11_5_Branch' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 8749eeaf5b855fa35c959c4e6a801fc734dfa203 m
Merge branch 'documentation/Release_2_11_5_Branch' into development/Release_2_11_5_Branch
-
Gitlab User d37fdfea34abb581289812041b664b36da02b659 m
JAL-4531 rejig release notes and document JAL-3726
- help/markdown/releases/release-2_11_5_0.md (version d37fdfea34abb581289812041b664b36da02b659)
-
Gitlab User 269525cb742dd4bfe7af8f3823a87c0655616b54 m
JAL-4436 fix rounding error -> smooth SS consensus adjustment via slider
- src/jalview/renderer/ResidueShader.java (version 269525cb742dd4bfe7af8f3823a87c0655616b54)
-
Gitlab User 75a67812752ff8542abf73b959df9340eee908f9 m
JAL-3726 restore groupwise IdColour from projects by re-initialising group associated colourschemes on restore of a view
- src/jalview/project/Jalview2XML.java (version 75a67812752ff8542abf73b959df9340eee908f9)
-
Gitlab User 40313d852b681cc08875516d1da9ead512882f34 m
JAL-4531 JAL-4548 updated example file with PDB ID metadata added to annotations
- examples/uniref50_Multiple_SS_Providers_Data.jvp (version 40313d852b681cc08875516d1da9ead512882f34)
-
Gitlab User 14dd34355819774b4564cb1950d4ad5b3d3f4dcd m
JAL-4531 JAL-4392 patch out Java 11+ methods not available in Java 8
- src/jalview/viewmodel/styles/ViewStyle.java (version 14dd34355819774b4564cb1950d4ad5b3d3f4dcd)
-
Gitlab User fec0b2c26e4cf0db8fd1ba1df362ee1853a43cb6 m
Merge branch 'feature/JAL_4548_show_PDBID_metadata_for_annot_tree' into development/Release_2_11_5_Branch
-
Gitlab User e1fbe7fb634d8221f65e493f1ee8978b50026ae7 m
Merge branch 'documentation/Release_2_11_5_Branch' into development/Release_2_11_5_Branch
-
Gitlab User 18cc2b03e4d1981f6b6068c3e300996666a602c8 m
JAL-4531 update whats new
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 18cc2b03e4d1981f6b6068c3e300996666a602c8)
-
Gitlab User 20db7440199d488c943c3dd9d63f2a899e4b4484 m
Merge branch 'feature/JAL-4583_incorrect_seq_count_ss_consensus' into development/Release_2_11_5_Branch
-
Gitlab User 10c375356ad77d454b45c564a439268af65bc296 m
JAL-3987 missing space between provider type and rest of description/label for group based secondary structure consensus
- src/jalview/datamodel/SequenceGroup.java (version 10c375356ad77d454b45c564a439268af65bc296)
-
Gitlab User f0fa97371a6821c8f1b360da688caf15bd17a675 m
JAL-4426 status panel and tooltip use same code for track & seq count reporting
- src/jalview/gui/AnnotationLabels.java (version f0fa97371a6821c8f1b360da688caf15bd17a675)
-
Gitlab User b54923c76c1cd5e78d22177ba15926c5e3509092 m
JAL-4583 JAL-4426 fix counts of sequence and counts of tracks for SS counting !
- test/jalview/analysis/AAFrequencyTest.java (version b54923c76c1cd5e78d22177ba15926c5e3509092)
- src/jalview/workers/SecondaryStructureConsensusThread.java (version b54923c76c1cd5e78d22177ba15926c5e3509092)
- src/jalview/analysis/AAFrequency.java (version b54923c76c1cd5e78d22177ba15926c5e3509092)
-
Gitlab User d31cf01540e6ed39c558e53fe39311e40d9cce80 m
JAL-4504 - use invokeLater as recommended by flatlaf 3.5.4 which otherwise raises warning at runtime when opening Jalview's preferences on OSX
- src/jalview/gui/WsPreferences.java (version d31cf01540e6ed39c558e53fe39311e40d9cce80)
-
Gitlab User a5a7b7203f914a680e26430ea6c94bc14546a1f1 m
JAL-4426 JAL-3987 JAL-4583 report numbers of sequences in Conservation, Consensus and Occupancy tracks, and verify track and sequence counts are exported/imported as key=value pairs and noted reserved words in documentation.
- test/jalview/io/AnnotationFileIOTest.java (version a5a7b7203f914a680e26430ea6c94bc14546a1f1)
- src/jalview/workers/ConsensusThread.java (version a5a7b7203f914a680e26430ea6c94bc14546a1f1)
- src/jalview/io/AnnotationFile.java (version a5a7b7203f914a680e26430ea6c94bc14546a1f1)
- src/jalview/analysis/Conservation.java (version a5a7b7203f914a680e26430ea6c94bc14546a1f1)
- help/help/html/features/annotationsFormat.html (version a5a7b7203f914a680e26430ea6c94bc14546a1f1)
-
Gitlab User 03e48537673414a943f4952c08f4def8b5346a79 m
JAL-4426 report count of tracks if available as well as sequences for annotation row
- src/jalview/gui/AnnotationLabels.java (version 03e48537673414a943f4952c08f4def8b5346a79)
- resources/lang/Messages.properties (version 03e48537673414a943f4952c08f4def8b5346a79)
-
Gitlab User 07dea6cf8a47647f43d628097c6560650f4dba76 m
JAL-4583 JAL-4426 - compare sequence and track counts for annotations in tests
- test/jalview/io/StockholmFileTest.java (version 07dea6cf8a47647f43d628097c6560650f4dba76)
-
Gitlab User af78fc59ab17f8e861ccef4d84feb5553e5f3eb2 m
JAL-4583 JAL-4426 record count of tracks as annotation row property
- src/jalview/datamodel/AlignmentAnnotation.java (version af78fc59ab17f8e861ccef4d84feb5553e5f3eb2)
-
Gitlab User 40383bdc41319d9bd3996c5f80636175863c9c6b m
JAL-4583 JAL-3987 - ss provider 'null' is treated as 'All', and verified all annotations for sequence(s) are included when the group is null. This is probably a corner case that wouldn't be use (when would this be called when source == null and sg == null ?) but at least behaviour is now specified and validated.
- test/jalview/analysis/AAFrequencyTest.java (version 40383bdc41319d9bd3996c5f80636175863c9c6b)
- src/jalview/analysis/AAFrequency.java (version 40383bdc41319d9bd3996c5f80636175863c9c6b)
-
Gitlab User 9894f569d2a339bb0e69063153ae301dc9799220 m
Merge branch 'development/Release_2_11_5_Branch' into feature/JAL-4583_incorrect_seq_count_ss_consensus
-
Gitlab User 657d0dc2d5612b7cd87a96d23020e1665776faa9 m
Merge branch 'development/Release_2_11_5_Branch' into documentation/JAL-4531_Release_2_11_5_Branch
-
Gitlab User 3cb4fbfe9c722dcb93d893022886fe82c8670301 m
JAL-4531 JAL-4454 whats new needs 'experimental' named anchor
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 3cb4fbfe9c722dcb93d893022886fe82c8670301)
-
Gitlab User 7540bfdbf4715982ebaa3787d85f690a3f688503 m
JAL-4531 - whats new wording
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 7540bfdbf4715982ebaa3787d85f690a3f688503)
-
Gitlab User 37aedafec8239ddb5df1815eecbf2135970c718e m
JAL-4531 release notes for JAL-2275,JAL-2690,JAL-3880,JAL-3914,JAL-3921,JAL-3987,JAL-4077,JAL-4333,JAL-4334,JAL-4350,JAL-4386,JAL-4392,JAL-4397,JAL-4399,JAL-4411,JAL-4435,JAL-4436,JAL-4440,JAL-4441,JAL-4474,JAL-4477,JAL-4482,JAL-4485,JAL-4486,JAL-4487,JAL-4491,JAL-4503,JAL-4504,JAL-4509,JAL-4511,JAL-4513,JAL-4515,JAL-4516,JAL-4517,JAL-4518,JAL-4527,JAL-4528,JAL-4537,JAL-4539,JAL-4542,JAL-4548,JAL-4549,JAL-4557,JAL-4562,JAL-4563,JAL-4564,JAL-4566,JAL-4568,JAL-4570,JAL-623,JAL-629
- help/markdown/releases/release-2_11_5_0.md (version 37aedafec8239ddb5df1815eecbf2135970c718e)
-
Gitlab User 27aceb064a17764e1ac85583c3fe68deaa40d724 m
Merge branch 'bug/JAL-4568_r2_11_4_2_jmol_image_deadlock' into development/Release_2_11_5_Branch
-
Gitlab User 4a1310f0d7326324bb88aff9c55a0b55b1801b2a m
Merge branch 'improvement/JAL-4570_show_tree_above_alignmentview' into development/Release_2_11_5_Branch
-
Gitlab User 7da06fcc1a1df2293443611047c3f80824abbd99 m
JAL-4531 - update release notes and remove 2.11.4.2 release notes
- help/markdown/whatsnew/whatsnew-2_11_5_0.md (version 7da06fcc1a1df2293443611047c3f80824abbd99)
- help/markdown/whatsnew/whatsnew-2_11_4_2.md (version 7da06fcc1a1df2293443611047c3f80824abbd99)
- help/markdown/releases/release-2_11_5_0.md (version 7da06fcc1a1df2293443611047c3f80824abbd99)
- help/markdown/releases/release-2_11_4_2.md (version 7da06fcc1a1df2293443611047c3f80824abbd99)
-
Gitlab User c005e91908b0220107ebc994c928705f63e553e4 m
Merge branch 'features/JAL-3914_modelqualityscores_v2115' into development/Release_2_11_5_Branch
-
Gitlab User 04ad2da7bd75d7d971b6bb7018d72965e4d6e407 m
Merge branch 'develop' into development/Release_2_11_5_Branch
-
Gitlab User 8d9b61bf9ef7a26ebab153ad92a0afd001ba3400 m
JAL-4397 patch for the other failing test too
- test/jalview/gui/AlignmentPanelTest.java (version 8d9b61bf9ef7a26ebab153ad92a0afd001ba3400)
-
Ben Soares <b.soares@dundee.ac.uk> 2db45a6b719c99041d873fbce170389096a503ac m
JAL-4397 Fixed test for macOS with HiDPI and Display -> More Space setting on max
- test/jalview/gui/AlignmentPanelTest.java (version 2db45a6b719c99041d873fbce170389096a503ac)
-
Renia Correya 54b85a194c242f990794906cd55db670f582f8f0 m
JAL-4583 Fix for incorrect seq count in ss consensus
JAL-4583
Incorrect sequence count in source specific secondary structure
consensus- test/jalview/analysis/AlignmentUtilsTests.java (version 54b85a194c242f990794906cd55db670f582f8f0)
- src/jalview/analysis/AlignmentUtils.java (version 54b85a194c242f990794906cd55db670f582f8f0)
-
Renia Correya 196bfe86c034ec4d9cb6047015e2a959e99790fc m
JAL-4542 Documentation for highlight annotations for selected sequences
- help/help/html/webServices/jnet.html (version 196bfe86c034ec4d9cb6047015e2a959e99790fc)
- help/help/html/features/viewingpdbs.html (version 196bfe86c034ec4d9cb6047015e2a959e99790fc)
-
Renia Correya ea1b39248a43cf0753c9f04dc5196d1569b3c61a m
JAL-3914 Added tests
- test/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySourceTest.java (version ea1b39248a43cf0753c9f04dc5196d1569b3c61a)
- src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java (version ea1b39248a43cf0753c9f04dc5196d1569b3c61a)
- src/jalview/datamodel/annotations/QMEANDISCORowBuilder.java (version ea1b39248a43cf0753c9f04dc5196d1569b3c61a)
-
Renia Correya 0ac01077e425ce84e9ccc754aab244ac41c1d920 m
Merge branch 'feature/JAL-4528_check_min_no_annotations_for_tree' into 'development/Release_2_11_5_Branch'
JAL-4528 Check minimum number of annotations for tree calculation
See merge request jalview/jalview!18 -
Renia Correya 9f49f2a07e051d539f8d37997cf7adc956548dd7 m
Merge branch 'patch/JAL-3987_pergroup_annotation_consensus' into 'development/Release_2_11_5_Branch'
JAL-3987 calculate secondary structure consensus over the annotations...
See merge request jalview/jalview!17 -
Renia Correya 06da00250900e8968580849922611b28293655b2 m
Merge branch 'feature/JAL-4515_Group_colouring_as_background' into 'development/Release_2_11_5_Branch'
JAL-4515 Fix for inconsistency in group colouring as background
See merge request jalview/jalview!15 -
Renia Correya 9f9c9fe496249f69c898799bb60606896dcc4ccf m
Merge branch 'development/Release_2_11_5_Branch' into 'feature/JAL-4515_Group_colouring_as_background'
# Conflicts:
# src/jalview/datamodel/SequenceGroup.java