jalview.git
6 years agoJAL-2527 Additional test feature/JAL-2527
kiramt [Fri, 1 Sep 2017 06:37:10 +0000 (07:37 +0100)]
JAL-2527 Additional test

6 years agoJAL-2527 Unit test for group colouring
kiramt [Fri, 1 Sep 2017 06:22:55 +0000 (07:22 +0100)]
JAL-2527 Unit test for group colouring

6 years agoJAL-2527 Unit test
kiramt [Thu, 31 Aug 2017 13:27:50 +0000 (14:27 +0100)]
JAL-2527 Unit test

6 years agoJAL-2527 Fix typo
kiramt [Thu, 31 Aug 2017 11:06:41 +0000 (12:06 +0100)]
JAL-2527 Fix typo

6 years agoJAL-2527 Updated Spanish, adjusted UI so Spanish fits
kiramt [Thu, 31 Aug 2017 11:04:39 +0000 (12:04 +0100)]
JAL-2527 Updated Spanish, adjusted UI so Spanish fits

6 years agoJAL-2527 Updates following code review
kiramt [Thu, 31 Aug 2017 10:46:14 +0000 (11:46 +0100)]
JAL-2527 Updates following code review

6 years agoJAL-2527 Code comments, tidy
kiramt [Wed, 30 Aug 2017 12:28:40 +0000 (13:28 +0100)]
JAL-2527 Code comments, tidy

6 years agoJAL-2527 Added default setting/resetting and first pass at Spanish
kiramt [Wed, 30 Aug 2017 12:22:47 +0000 (13:22 +0100)]
JAL-2527 Added default setting/resetting and first pass at Spanish

6 years agoJAL-2527 Wired up cached values to overview
kiramt [Wed, 30 Aug 2017 09:59:38 +0000 (10:59 +0100)]
JAL-2527 Wired up cached values to overview

6 years agoMerge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527
kiramt [Wed, 30 Aug 2017 08:30:11 +0000 (09:30 +0100)]
Merge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527

Conflicts:
src/jalview/renderer/OverviewRenderer.java

6 years agoMerge branch 'feature/JAL-2664' into feature/JAL-2527
kiramt [Wed, 30 Aug 2017 07:11:40 +0000 (08:11 +0100)]
Merge branch 'feature/JAL-2664' into feature/JAL-2527

6 years agoJAL-2664 Updates following review feature/JAL-2664
kiramt [Tue, 29 Aug 2017 15:27:40 +0000 (16:27 +0100)]
JAL-2664 Updates following review

6 years agoJAL-2527 Added overview prefs - don't get picked up by overview yet
kiramt [Tue, 29 Aug 2017 13:55:53 +0000 (14:55 +0100)]
JAL-2527 Added overview prefs - don't get picked up by overview yet

6 years agoJAL-2527 Started adding overview preferences
kiramt [Mon, 28 Aug 2017 15:38:03 +0000 (16:38 +0100)]
JAL-2527 Started adding overview preferences

6 years agoJAL-2588 don’t test char==gap until we know the shader won’t colour gaps itself feature/2588
Jim Procter [Mon, 21 Aug 2017 13:22:52 +0000 (14:22 +0100)]
JAL-2588 don’t test char==gap until we know the shader won’t colour gaps itself

6 years agoJAL-2588 field on overview colour finder for default gap colour
Jim Procter [Mon, 21 Aug 2017 13:21:58 +0000 (14:21 +0100)]
JAL-2588 field on overview colour finder for default gap colour

6 years agoJAL-2588 JAL-2603 JAL-2610 release notes and docs
Jim Procter [Fri, 18 Aug 2017 15:34:03 +0000 (16:34 +0100)]
JAL-2588 JAL-2603 JAL-2610 release notes and docs

6 years agoMerge branch 'feature/2588' into merge/develop_feature/2588_JAL-2588
Jim Procter [Fri, 18 Aug 2017 14:38:20 +0000 (15:38 +0100)]
Merge branch 'feature/2588' into merge/develop_feature/2588_JAL-2588

6 years agoJAL-2675 bump version for branch to 2.10.2b1
Jim Procter [Fri, 18 Aug 2017 13:15:40 +0000 (14:15 +0100)]
JAL-2675 bump version for branch to 2.10.2b1

6 years agoJAL-1551 formatting
Jim Procter [Fri, 18 Aug 2017 13:13:28 +0000 (14:13 +0100)]
JAL-1551 formatting

6 years agoJAL-2675 release notes entry for 2.10.2b1, updated what’s new and link to latest...
Jim Procter [Fri, 18 Aug 2017 13:08:03 +0000 (14:08 +0100)]
JAL-2675 release notes entry for 2.10.2b1, updated what’s new and link to latest notes in help.

6 years agoMerge remote-tracking branch 'origin/develop' into feature/JAL-2664
kiramt [Fri, 18 Aug 2017 10:53:23 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/develop' into feature/JAL-2664

6 years agoJAL-2664 Adjusted colour of hidden cols/seqs
kiramt [Fri, 18 Aug 2017 10:44:18 +0000 (11:44 +0100)]
JAL-2664 Adjusted colour of hidden cols/seqs

6 years agoJAL-2664 Correct colouring for rows
kiramt [Fri, 18 Aug 2017 10:34:46 +0000 (11:34 +0100)]
JAL-2664 Correct colouring for rows

6 years agoJAL-2418 ahem - correct year for what's new releases/Release_2_10_2_Branch
Jim Procter [Thu, 17 Aug 2017 12:07:53 +0000 (13:07 +0100)]
JAL-2418 ahem - correct year for what's new

6 years agoJAL-2418 JAL-2116 use single j2se 7+ argumant with java 9 add-modules - seems to...
Jim Procter [Thu, 17 Aug 2017 11:37:50 +0000 (12:37 +0100)]
JAL-2418 JAL-2116 use single j2se 7+ argumant with java 9 add-modules - seems to work on java 8 (windows, osx, linux) without 'use latest version' popup and also on java 9

6 years agoJAL-2418 JAL-2116 make sure java 8,7 vm args are also listed
Jim Procter [Thu, 17 Aug 2017 10:41:33 +0000 (11:41 +0100)]
JAL-2418 JAL-2116 make sure java 8,7 vm args are also listed

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 22:24:25 +0000 (23:24 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 22:24:13 +0000 (23:24 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 formatting
Jim Procter [Wed, 16 Aug 2017 22:23:59 +0000 (23:23 +0100)]
JAL-2418 formatting

6 years agoJAL-2418 occupancy row in What’s New
Jim Procter [Wed, 16 Aug 2017 22:23:53 +0000 (23:23 +0100)]
JAL-2418 occupancy row in What’s New

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 21:37:37 +0000 (22:37 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoJAL-2418 add GPL to main sources
Jim Procter [Wed, 16 Aug 2017 21:30:21 +0000 (22:30 +0100)]
JAL-2418 add GPL to main sources

6 years agoJAL-2418 source formatting
Jim Procter [Wed, 16 Aug 2017 21:22:11 +0000 (22:22 +0100)]
JAL-2418 source formatting

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 20:52:55 +0000 (21:52 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 20:52:36 +0000 (21:52 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 mirror fonts option doc tweak
Jim Procter [Wed, 16 Aug 2017 20:52:07 +0000 (21:52 +0100)]
JAL-2418 mirror fonts option doc tweak

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 19:17:43 +0000 (20:17 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 whats new for 2.10.2
Jim Procter [Wed, 16 Aug 2017 19:17:03 +0000 (20:17 +0100)]
JAL-2418 whats new for 2.10.2

6 years agoJAL-2418 reclassify some issues to features/bugs resolved
Jim Procter [Wed, 16 Aug 2017 19:16:52 +0000 (20:16 +0100)]
JAL-2418 reclassify some issues to features/bugs resolved

6 years agoJAL-2418 typos in release notes
Jim Procter [Wed, 16 Aug 2017 18:23:33 +0000 (19:23 +0100)]
JAL-2418 typos in release notes

6 years agoJAL-2418 check groovy script one-liners for restoring legacy score model behaviour
Jim Procter [Wed, 16 Aug 2017 18:16:08 +0000 (19:16 +0100)]
JAL-2418 check groovy script one-liners for restoring legacy score model behaviour

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 15 Aug 2017 16:15:25 +0000 (17:15 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 fix typo in build.xml for j2se element
Jim Procter [Tue, 15 Aug 2017 16:14:32 +0000 (17:14 +0100)]
JAL-2116 fix typo in build.xml for j2se element

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 15 Aug 2017 15:55:22 +0000 (16:55 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 15 Aug 2017 15:55:06 +0000 (16:55 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 bump release to Thursday
Jim Procter [Tue, 15 Aug 2017 14:02:19 +0000 (15:02 +0100)]
JAL-2418 bump release to Thursday

6 years agoMerge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Tue, 15 Aug 2017 13:54:20 +0000 (14:54 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Mon, 14 Aug 2017 16:25:16 +0000 (17:25 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoJAL-2418 release notes for JAL-2663
Jim Procter [Mon, 14 Aug 2017 16:23:46 +0000 (17:23 +0100)]
JAL-2418 release notes for JAL-2663

6 years agoMerge branch 'patch/JAL-2335_filterAACons' into develop
Jim Procter [Mon, 14 Aug 2017 16:21:45 +0000 (17:21 +0100)]
Merge branch 'patch/JAL-2335_filterAACons' into develop

6 years agoMerge branch 'patch/JAL-2116_java9' into develop
Jim Procter [Mon, 14 Aug 2017 16:21:16 +0000 (17:21 +0100)]
Merge branch 'patch/JAL-2116_java9' into develop

6 years agoJAL-2116 add 1.8 1.7 compatible launch string
Jim Procter [Mon, 14 Aug 2017 16:20:28 +0000 (17:20 +0100)]
JAL-2116 add 1.8 1.7 compatible launch string

6 years agoJAL-2335 choose appropriate alphabet for filtering nonstandard symbols
Jim Procter [Mon, 14 Aug 2017 13:17:35 +0000 (14:17 +0100)]
JAL-2335 choose appropriate alphabet for filtering nonstandard symbols

6 years agoJAL-2335 source formatting
Jim Procter [Mon, 14 Aug 2017 13:16:27 +0000 (14:16 +0100)]
JAL-2335 source formatting

6 years agoJAL-2335 filterNonStandardResidues configurable for jabaws clients
Jim Procter [Mon, 14 Aug 2017 13:16:17 +0000 (14:16 +0100)]
JAL-2335 filterNonStandardResidues configurable for jabaws clients

6 years agoMerge branch 'patch/JAL-2116_java9' into develop
Jim Procter [Mon, 14 Aug 2017 09:45:14 +0000 (10:45 +0100)]
Merge branch 'patch/JAL-2116_java9' into develop

6 years agoMerge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch
Jim Procter [Mon, 14 Aug 2017 09:45:05 +0000 (10:45 +0100)]
Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 switch to java.se.ee https://bugs.openjdk.java.net/browse/JDK-8166438
Jim Procter [Mon, 14 Aug 2017 09:44:25 +0000 (10:44 +0100)]
JAL-2116 switch to java.se.ee https://bugs.openjdk.java.net/browse/JDK-8166438

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Mon, 14 Aug 2017 09:35:00 +0000 (10:35 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'patch/JAL-2663_filterAACons' into develop
Jim Procter [Mon, 14 Aug 2017 09:34:44 +0000 (10:34 +0100)]
Merge branch 'patch/JAL-2663_filterAACons' into develop

6 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Mon, 14 Aug 2017 09:33:33 +0000 (10:33 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

6 years agoJAL-2663 flag and filter to exclude non-standard amino acids from submission
Jim Procter [Sun, 13 Aug 2017 14:34:58 +0000 (15:34 +0100)]
JAL-2663 flag and filter to exclude non-standard amino acids from submission

6 years agoJAL-2663 source formatting
Jim Procter [Sun, 13 Aug 2017 14:34:20 +0000 (15:34 +0100)]
JAL-2663 source formatting

6 years agoJAL-2664 Initial change to drawing hidden regions in overview
kiramt [Mon, 14 Aug 2017 08:43:47 +0000 (09:43 +0100)]
JAL-2664 Initial change to drawing hidden regions in overview

6 years agoMerge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 10 Aug 2017 20:11:21 +0000 (21:11 +0100)]
Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 try '=' syntax http://jigsaw-dev.1059479.n5.nabble.com/Java-9-EA-169-Webstar...
Jim Procter [Thu, 10 Aug 2017 20:10:23 +0000 (21:10 +0100)]
JAL-2116 try '=' syntax jigsaw-dev.1059479.n5.nabble.com/Java-9-EA-169-Webstart-NoClassDefFoundError-javax-xml-ws-Service-td5716769.html

6 years agoMerge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 10 Aug 2017 19:42:30 +0000 (20:42 +0100)]
Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 test java 9 only JNLP launch
Jim Procter [Thu, 10 Aug 2017 19:38:36 +0000 (20:38 +0100)]
JAL-2116 test java 9 only JNLP launch

6 years agoMerge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 10 Aug 2017 15:38:21 +0000 (16:38 +0100)]
Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 explicit replace j2se element with a java9 specific one since orangevolt...
Jim Procter [Thu, 10 Aug 2017 15:37:30 +0000 (16:37 +0100)]
JAL-2116 explicit replace j2se element with a java9 specific one since orangevolt-tasks don't support the java-vm-args attribute

6 years agoMerge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 10 Aug 2017 14:38:30 +0000 (15:38 +0100)]
Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch

6 years agoJAL-2116 java9 modules dependency for JNLP file
Jim Procter [Thu, 10 Aug 2017 14:37:16 +0000 (15:37 +0100)]
JAL-2116 java9 modules dependency for JNLP file

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Thu, 10 Aug 2017 11:56:12 +0000 (12:56 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

6 years agoJAL-2660 used saved value of ignoreGapsInConsensus when loading
gmungoc [Thu, 10 Aug 2017 11:29:52 +0000 (12:29 +0100)]
JAL-2660 used saved value of ignoreGapsInConsensus when loading
(/copying) viewport

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 10 Aug 2017 09:31:54 +0000 (10:31 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Thu, 10 Aug 2017 09:31:39 +0000 (10:31 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 set final release date to 15th August 2017 for 2.10.2

Jim Procter [Thu, 10 Aug 2017 09:31:23 +0000 (10:31 +0100)]
JAL-2418 set final release date to 15th August 2017 for 2.10.2


Signed-off-by: Jim Procter <jprocter@issues.jalview.org>

6 years agoJAL-2418 typo in release notes
Jim Procter [Thu, 10 Aug 2017 09:30:00 +0000 (10:30 +0100)]
JAL-2418 typo in release notes

6 years agoJAL-2418 known defect for JAL-2321 in release notes
Jim Procter [Thu, 10 Aug 2017 09:29:53 +0000 (10:29 +0100)]
JAL-2418 known defect for JAL-2321 in release notes

6 years agoJAL-2418 reorganised release notes to topic sections rather than General/Application...
Jim Procter [Thu, 10 Aug 2017 09:19:29 +0000 (10:19 +0100)]
JAL-2418 reorganised release notes to topic sections rather than General/Application/Applet

6 years agoMerge branch 'documentation/JAL-2418_release2102' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 9 Aug 2017 20:40:35 +0000 (21:40 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 9 Aug 2017 20:40:25 +0000 (21:40 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2418 JAL-2398 JAL-2397 simpler documentation for reinstating legacy behaviour
Jim Procter [Wed, 9 Aug 2017 20:40:05 +0000 (21:40 +0100)]
JAL-2418 JAL-2398 JAL-2397 simpler documentation for reinstating legacy behaviour

6 years agoMerge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 9 Aug 2017 20:15:55 +0000 (21:15 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 9 Aug 2017 20:15:27 +0000 (21:15 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2397 JAL-2398 documentation for reinstating legacy PCA calculation with asymmetri...
Jim Procter [Wed, 9 Aug 2017 20:14:58 +0000 (21:14 +0100)]
JAL-2397 JAL-2398 documentation for reinstating legacy PCA calculation with asymmetric Blosum62 matrix.

6 years agoJAL-2426 Rfam download suffix
Jim Procter [Wed, 9 Aug 2017 19:24:00 +0000 (20:24 +0100)]
JAL-2426 Rfam download suffix

6 years agoJAL-2426 JAL-1270 report Xfam download URL used if debug enabled
Jim Procter [Wed, 9 Aug 2017 18:32:05 +0000 (19:32 +0100)]
JAL-2426 JAL-1270 report Xfam download URL used if debug enabled

6 years agoJAL-2425 raw stockholm download URLs
Jim Procter [Wed, 9 Aug 2017 18:31:29 +0000 (19:31 +0100)]
JAL-2425 raw stockholm download URLs

6 years agoJAL-1270 testProps should also enable debug logging
Jim Procter [Wed, 9 Aug 2017 18:29:54 +0000 (19:29 +0100)]
JAL-1270 testProps should also enable debug logging

6 years agoJAL-2425 test for alignment metadata retrieved from Pfam and Rfam
Jim Procter [Wed, 9 Aug 2017 18:29:05 +0000 (19:29 +0100)]
JAL-2425 test for alignment metadata retrieved from Pfam and Rfam

6 years agoJAL-2425 remove overloaded getSequenceRecords method (don’t need it ?)
Jim Procter [Wed, 9 Aug 2017 18:27:53 +0000 (19:27 +0100)]
JAL-2425 remove overloaded getSequenceRecords method (don’t need it ?)

6 years agoJAL-2418 release notes
Jim Procter [Wed, 9 Aug 2017 15:44:02 +0000 (16:44 +0100)]
JAL-2418 release notes

6 years agoJAL-2418 more release notes
Jim Procter [Wed, 9 Aug 2017 08:46:08 +0000 (09:46 +0100)]
JAL-2418 more release notes

6 years agoJAL-2418 JAL-2611 and rejigged overview documentation
Jim Procter [Wed, 9 Aug 2017 08:45:50 +0000 (09:45 +0100)]
JAL-2418 JAL-2611 and rejigged overview documentation

6 years agoMerge branch 'bug/JAL-2634' into develop
Jim Procter [Wed, 9 Aug 2017 08:09:56 +0000 (09:09 +0100)]
Merge branch 'bug/JAL-2634' into develop

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 9 Aug 2017 07:56:01 +0000 (08:56 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2560 alternative fix (reinstate lost line of code)
gmungoc [Tue, 8 Aug 2017 15:44:45 +0000 (16:44 +0100)]
JAL-2560 alternative fix (reinstate lost line of code)

6 years agoJAL-2649 JAL-2650 wait for Conservation calc to complete before setting
gmungoc [Tue, 8 Aug 2017 10:18:12 +0000 (11:18 +0100)]
JAL-2649 JAL-2650 wait for Conservation calc to complete before setting
on new View coloured by Conservation