gmungoc [Mon, 13 Nov 2017 16:39:02 +0000 (16:39 +0000)]
Merge branch 'develop' into features/JAL-1793VCF
Conflicts:
.classpath
build.xml
resources/lang/Messages.properties
gmungoc [Mon, 13 Nov 2017 16:23:12 +0000 (16:23 +0000)]
JAL-2662 tweak README, format code
Jim Procter [Mon, 13 Nov 2017 16:05:37 +0000 (16:05 +0000)]
JAL-2698 what's new...
Jim Procter [Mon, 13 Nov 2017 15:41:10 +0000 (15:41 +0000)]
JAL-2810 release notes
Jim Procter [Mon, 13 Nov 2017 15:38:34 +0000 (15:38 +0000)]
Merge branch 'imp/JAL-2810_ftsIDtab' into develop
Jim Procter [Mon, 13 Nov 2017 15:32:05 +0000 (15:32 +0000)]
JAL-2698 stub for 2.10.3 new known issues entries
Jim Procter [Mon, 13 Nov 2017 15:31:05 +0000 (15:31 +0000)]
JAL-2702 groovy interpreter update and java 9 jnlp release notes
Jim Procter [Mon, 13 Nov 2017 15:03:27 +0000 (15:03 +0000)]
Merge branch 'bug/JAL-2702_groovyconsoleJava9' into develop
Jim Procter [Mon, 13 Nov 2017 14:33:06 +0000 (14:33 +0000)]
JAL-2702 --illegal-access=warn for JVM launch
gmungoc [Mon, 13 Nov 2017 14:11:08 +0000 (14:11 +0000)]
JAL-2176 removed unused Sequence.index
Jim Procter [Mon, 13 Nov 2017 13:52:48 +0000 (13:52 +0000)]
JAL-2702 update to groovy 2.4.12
Jim Procter [Mon, 13 Nov 2017 13:00:17 +0000 (13:00 +0000)]
JAL-2810 updated help docs for auto search checkbox and retrieve IDs tab
Jim Procter [Mon, 13 Nov 2017 12:44:08 +0000 (12:44 +0000)]
JAL-2810 updated screenshots in documentation
Jim Procter [Mon, 13 Nov 2017 12:43:38 +0000 (12:43 +0000)]
JAL-2810 auto search checkbox state stored as user preference. Enabled by default.
gmungoc [Mon, 13 Nov 2017 12:02:43 +0000 (12:02 +0000)]
JAL-2679 example accession changed to
CAD01290
Jim Procter [Mon, 13 Nov 2017 11:53:27 +0000 (11:53 +0000)]
JAL-2810 mainFramTabs -> tabs
Jim Procter [Mon, 13 Nov 2017 11:53:02 +0000 (11:53 +0000)]
JAL-2810 simpler tooltip (assume user will work out that pressing return will update results)
gmungoc [Fri, 10 Nov 2017 09:05:18 +0000 (09:05 +0000)]
Merge branch 'develop' into features/JAL-1793VCF
Jim Procter [Wed, 8 Nov 2017 17:02:42 +0000 (17:02 +0000)]
Merge branch 'bug/JAL-2742' into develop
Jim Procter [Wed, 8 Nov 2017 17:02:06 +0000 (17:02 +0000)]
Revert "JAL-2742 release notes - pending confirmation that there was impact to user"
-- no impact so won't include development detail in release notes.
This reverts commit
ba70dbddc08876d8d72bb303823f683b65bf13c7.
Jim Procter [Wed, 8 Nov 2017 16:57:14 +0000 (16:57 +0000)]
JAL-2225 release note
Jim Procter [Wed, 8 Nov 2017 16:52:03 +0000 (16:52 +0000)]
Merge branch 'bug/JAL-2225mapMultipleChains' into develop
gmungoc [Wed, 8 Nov 2017 15:46:56 +0000 (15:46 +0000)]
JAL-2808 i18n, widget state settings
Jim Procter [Wed, 8 Nov 2017 15:21:13 +0000 (15:21 +0000)]
Merge branch 'develop' into bug/JAL-2225mapMultipleChains
gmungoc [Wed, 8 Nov 2017 11:33:43 +0000 (11:33 +0000)]
JAL-2069 ensure threshline instantiated to avoid NPE
gmungoc [Wed, 8 Nov 2017 11:13:41 +0000 (11:13 +0000)]
JAL-2069 (helper method for) italic titled borders
Jim Procter [Tue, 7 Nov 2017 17:33:07 +0000 (17:33 +0000)]
JAL-2698 14 Nov 2017 release date for 2.10.3
Jim Procter [Tue, 7 Nov 2017 17:27:46 +0000 (17:27 +0000)]
JAL-2775 release notes
Jim Procter [Tue, 7 Nov 2017 17:25:51 +0000 (17:25 +0000)]
Merge branch 'imp/JAL-2775' into develop
Jim Procter [Tue, 7 Nov 2017 17:18:12 +0000 (17:18 +0000)]
JAL-2810 i18n tab label
Jim Procter [Tue, 7 Nov 2017 17:12:45 +0000 (17:12 +0000)]
JAL-2810 ‘Close’ is now ‘Cancel’ in SequenceFetcher panel
Jim Procter [Tue, 7 Nov 2017 17:12:08 +0000 (17:12 +0000)]
JAL-2810 working back button shown for bulk ID retrieval tab in FTS search
gmungoc [Tue, 7 Nov 2017 16:40:05 +0000 (16:40 +0000)]
JAL-2069 choice of no / min / max colour if 'no attribute value'
Jim Procter [Tue, 7 Nov 2017 16:37:34 +0000 (16:37 +0000)]
JAL-2810 bulk fetch for PDB IDs
Jim Procter [Tue, 7 Nov 2017 16:30:26 +0000 (16:30 +0000)]
JAL-2804 clearer tooltip for autosearch checkbox
gmungoc [Tue, 7 Nov 2017 13:13:46 +0000 (13:13 +0000)]
JAL-2069 corrected overloaded constructor behaviour
gmungoc [Tue, 7 Nov 2017 11:49:44 +0000 (11:49 +0000)]
Merge branch 'develop' into features/JAL-1793VCF
gmungoc [Tue, 7 Nov 2017 11:48:16 +0000 (11:48 +0000)]
JAL-2069 add 'by attribute' options to graduated feature colour
gmungoc [Tue, 7 Nov 2017 11:45:49 +0000 (11:45 +0000)]
JAL-2069 add attributeName and noValueColour to FeatureColour
gmungoc [Tue, 7 Nov 2017 11:44:50 +0000 (11:44 +0000)]
JAL-2816 tweaks to feature visibility checks
gmungoc [Tue, 7 Nov 2017 11:16:37 +0000 (11:16 +0000)]
JAL-2808 tweak to use Iterable for set of matchers
gmungoc [Tue, 7 Nov 2017 09:07:03 +0000 (09:07 +0000)]
JAL-2069 JAL-2808 utility method to build combobox with tooltips
gmungoc [Tue, 7 Nov 2017 09:01:44 +0000 (09:01 +0000)]
JAL-2820 limit length of residue tooltip
gmungoc [Mon, 6 Nov 2017 16:44:43 +0000 (16:44 +0000)]
JAL-2069 cache colours generated from labels
gmungoc [Mon, 6 Nov 2017 16:41:54 +0000 (16:41 +0000)]
JAL-2820 include attribute value used for feature colour in tooltip
Jim Procter [Mon, 6 Nov 2017 16:41:28 +0000 (16:41 +0000)]
JAL-2756 release notes
gmungoc [Mon, 6 Nov 2017 16:38:53 +0000 (16:38 +0000)]
JAL-2808 small tweak to getString to quote the pattern value
Jim Procter [Mon, 6 Nov 2017 16:34:05 +0000 (16:34 +0000)]
Merge branch 'bug/JAL-2756sequenceidmessage' into develop
Jim Procter [Fri, 3 Nov 2017 15:57:47 +0000 (15:57 +0000)]
Merge branch 'documentation/JAL-2698_release2103' into develop
Jim Procter [Fri, 3 Nov 2017 15:56:12 +0000 (15:56 +0000)]
JAL-2818 modified README for launching jalview from source build
gmungoc [Fri, 3 Nov 2017 11:51:18 +0000 (11:51 +0000)]
JAL-2808 attribute description as tooltip in dropdown if known
gmungoc [Fri, 3 Nov 2017 11:50:45 +0000 (11:50 +0000)]
JAL-2808 JAL-2069 record feature attributes descriptions and min-max
gmungoc [Thu, 2 Nov 2017 15:49:38 +0000 (15:49 +0000)]
JAL-2808 only initialise AND and OR buttons once
gmungoc [Thu, 2 Nov 2017 14:52:05 +0000 (14:52 +0000)]
JAL-2808 new Filters tab in Feature Settings
gmungoc [Thu, 2 Nov 2017 14:51:43 +0000 (14:51 +0000)]
JAL-2808 refactored getColor() checks feature visibility
gmungoc [Thu, 2 Nov 2017 14:47:10 +0000 (14:47 +0000)]
JAL-2808 feature filters held on FeatureRenderer, getColor(feature)
extracted
gmungoc [Thu, 2 Nov 2017 14:44:23 +0000 (14:44 +0000)]
JAL-2808 convenience method to get attribute as String
gmungoc [Thu, 2 Nov 2017 14:41:59 +0000 (14:41 +0000)]
JAL-2808 attribute filtering removed, extract method refactoring left in
gmungoc [Thu, 2 Nov 2017 14:41:31 +0000 (14:41 +0000)]
JAL-2808 reverted to develop (attribute filters removed)
gmungoc [Thu, 2 Nov 2017 14:36:04 +0000 (14:36 +0000)]
JAL-2808 toString modified, tests corrected
kiramt [Wed, 1 Nov 2017 11:21:47 +0000 (11:21 +0000)]
Merge branch 'develop' into imp/JAL-2775
gmungoc [Tue, 31 Oct 2017 18:12:36 +0000 (18:12 +0000)]
Merge branch 'bug/JAL-2791selectVisibleFeatures' into
features/JAL-1793VCF
Conflicts:
src/jalview/controller/AlignViewController.java
gmungoc [Tue, 31 Oct 2017 18:09:19 +0000 (18:09 +0000)]
Merge branch 'develop' into features/JAL-1793VCF
gmungoc [Tue, 31 Oct 2017 16:23:19 +0000 (16:23 +0000)]
JAL-2791 select columns by _visible_ features
gmungoc [Tue, 31 Oct 2017 15:59:04 +0000 (15:59 +0000)]
JAL-2808 revised util.matcher package, 2 filter conditions per feature
type
gmungoc [Tue, 31 Oct 2017 15:24:27 +0000 (15:24 +0000)]
JAL-2792 test updated for 3 column table
Jim Procter [Tue, 31 Oct 2017 11:03:16 +0000 (11:03 +0000)]
JAL-2810 checkbox label for Autosearch
Jim Procter [Tue, 31 Oct 2017 11:00:55 +0000 (11:00 +0000)]
JAL-2810 default border colour
kiramt [Tue, 31 Oct 2017 10:00:52 +0000 (10:00 +0000)]
JAL-2756 update for new EBI https link
gmungoc [Tue, 31 Oct 2017 08:58:11 +0000 (08:58 +0000)]
JAL-2808 reduce code with WindowAdapter
gmungoc [Mon, 30 Oct 2017 16:58:23 +0000 (16:58 +0000)]
JAL-2791 check feature visibility when selecting columns
gmungoc [Mon, 30 Oct 2017 16:57:24 +0000 (16:57 +0000)]
JAL-2808 add attribute filter options to graduate colour dialog
gmungoc [Mon, 30 Oct 2017 16:56:34 +0000 (16:56 +0000)]
JAL-2792 Javadoc updates
gmungoc [Mon, 30 Oct 2017 16:55:48 +0000 (16:55 +0000)]
JAL-2808 add attribute filter(s) to FeatureColour
gmungoc [Mon, 30 Oct 2017 16:54:55 +0000 (16:54 +0000)]
JAL-2808 remember attribute keys by feature type
gmungoc [Mon, 30 Oct 2017 16:51:40 +0000 (16:51 +0000)]
JAL-2808 classes to support filtering by attribute value
Jim Procter [Fri, 27 Oct 2017 16:26:43 +0000 (17:26 +0100)]
JAL-2810 prototype retrieve ID tab for the Uniprot FTS panel
Jim Procter [Fri, 27 Oct 2017 15:21:14 +0000 (16:21 +0100)]
JAL-2804 update search results when enter pressed or query retrieved from history
Jim Procter [Fri, 27 Oct 2017 15:18:48 +0000 (16:18 +0100)]
JAL-2804 checkbox to enable/disable auto search (with tooltip)
Jim Procter [Fri, 27 Oct 2017 15:13:53 +0000 (16:13 +0100)]
JAL-2804 kludge method to test if last key event handled was ENTER
gmungoc [Fri, 27 Oct 2017 13:15:20 +0000 (14:15 +0100)]
JAL-2526 updated javadoc
gmungoc [Fri, 27 Oct 2017 11:20:28 +0000 (12:20 +0100)]
JAL-2754 renamed proguard.jar to include version number
gmungoc [Fri, 27 Oct 2017 11:18:53 +0000 (12:18 +0100)]
JAL-2754 updated proguard.jar to 5.3.3
gmungoc [Fri, 27 Oct 2017 09:52:56 +0000 (10:52 +0100)]
JAL-2792 include source in copy constructor; null pointer check
gmungoc [Fri, 27 Oct 2017 09:52:05 +0000 (10:52 +0100)]
JAL-2754 update to specify Java 1.8(+)
gmungoc [Fri, 27 Oct 2017 08:10:40 +0000 (09:10 +0100)]
Merge branch 'develop' into features/JAL-1793VCF
gmungoc [Fri, 27 Oct 2017 07:19:01 +0000 (08:19 +0100)]
JAL-2792 capture feature metadata and render in Feature Details
Jim Procter [Thu, 26 Oct 2017 16:45:43 +0000 (17:45 +0100)]
JAL-2698 update version and cut release branch
Jim Procter [Thu, 26 Oct 2017 16:31:40 +0000 (17:31 +0100)]
JAL-2546 release notes
Jim Procter [Thu, 26 Oct 2017 16:18:57 +0000 (17:18 +0100)]
JAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml tests.
Jim Procter [Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)]
Merge branch 'feature/JAL-2488finalize' into develop
Jim Procter [Thu, 26 Oct 2017 15:20:14 +0000 (16:20 +0100)]
JAL-2036 2.10.3 release notes
Jim Procter [Thu, 26 Oct 2017 14:47:32 +0000 (15:47 +0100)]
JAL-2793 cancelling font changed dialog didn't call ap.fontChanged() to reset layout
Jim Procter [Thu, 26 Oct 2017 13:41:34 +0000 (14:41 +0100)]
JAL-2548 release notes
gmungoc [Thu, 26 Oct 2017 13:32:13 +0000 (14:32 +0100)]
Merge branch 'develop' into features/JAL-1793VCF
Conflicts:
src/jalview/util/MappingUtils.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/util/MappingUtilsTest.java
gmungoc [Thu, 26 Oct 2017 10:56:27 +0000 (11:56 +0100)]
JAL-2792 html table for Feature Details report
Jim Procter [Thu, 26 Oct 2017 10:51:35 +0000 (11:51 +0100)]
Merge branch 'bug/JAL-2776toggleGroupColour' into develop
Jim Procter [Thu, 26 Oct 2017 10:50:03 +0000 (11:50 +0100)]
JAL-2684 JAL-2685 release notes
Jim Procter [Thu, 26 Oct 2017 10:40:25 +0000 (11:40 +0100)]
JAL-2685 tidy up html doc
Jim Procter [Thu, 26 Oct 2017 10:14:38 +0000 (11:14 +0100)]
Merge branch 'features/JAL-2685pairwiseSeqLimits' into develop