Jim Procter [Fri, 17 Nov 2017 12:31:58 +0000 (12:31 +0000)]
Merge branch 'bug/JAL-2821' into develop
Jim Procter [Fri, 17 Nov 2017 12:26:42 +0000 (12:26 +0000)]
JAL-2840 release notes
Jim Procter [Fri, 17 Nov 2017 12:21:17 +0000 (12:21 +0000)]
Merge branch 'bug/JAL-2837' into develop
kiramt [Fri, 17 Nov 2017 12:14:59 +0000 (12:14 +0000)]
Merge branch 'develop' into bug/JAL-2837
Conflicts:
src/jalview/gui/SeqPanel.java
Jim Procter [Fri, 17 Nov 2017 12:14:21 +0000 (12:14 +0000)]
Merge branch 'doc/JAL-2494_JAL-2828_mergefindAnnotation' into develop
kiramt [Fri, 17 Nov 2017 12:09:20 +0000 (12:09 +0000)]
Merge branch 'develop' into bug/JAL-2837
Jim Procter [Fri, 17 Nov 2017 11:56:59 +0000 (11:56 +0000)]
JAL-2811 release note
Jim Procter [Fri, 17 Nov 2017 11:47:51 +0000 (11:47 +0000)]
JAL-2541 not in 2.10.3, JAL-2831 signed off.
Jim Procter [Fri, 17 Nov 2017 11:47:25 +0000 (11:47 +0000)]
JAL-2698 11th hour release today
Jim Procter [Fri, 17 Nov 2017 11:28:43 +0000 (11:28 +0000)]
Merge branch 'bug/JAL-2831' into develop
Jim Procter [Thu, 16 Nov 2017 16:50:03 +0000 (16:50 +0000)]
JAL-2541 JAL-2829 JAL-2830 JAL-2822 catch all release note entry for sequence feature relocation
Jim Procter [Thu, 16 Nov 2017 16:45:35 +0000 (16:45 +0000)]
Merge branch 'bug/JAL-2829deleteCharsWithGaps' into develop
kiramt [Thu, 16 Nov 2017 11:57:15 +0000 (11:57 +0000)]
JAL-2831 Removed unwanted hidden sequences checks
kiramt [Wed, 15 Nov 2017 16:22:21 +0000 (16:22 +0000)]
JAL-2831 Don't show cursor if position in hidden region
kiramt [Wed, 15 Nov 2017 16:05:18 +0000 (16:05 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Wed, 15 Nov 2017 13:23:00 +0000 (13:23 +0000)]
JAL-2811 Updated following review
kiramt [Wed, 15 Nov 2017 11:44:44 +0000 (11:44 +0000)]
JAL-2840 fix wrapped scrolling when using cursor at a hidden region
kiramt [Wed, 15 Nov 2017 11:17:41 +0000 (11:17 +0000)]
JAL-2834 JAL-2836 temporarily disabled wrapped mode fastpaint
kiramt [Wed, 15 Nov 2017 08:47:47 +0000 (08:47 +0000)]
JAL-2831 ported to applet
kiramt [Tue, 14 Nov 2017 19:36:53 +0000 (19:36 +0000)]
JAL-2831 tidies and tests
kiramt [Tue, 14 Nov 2017 16:03:47 +0000 (16:03 +0000)]
JAL-2831 tidy
kiramt [Tue, 14 Nov 2017 14:59:52 +0000 (14:59 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Tue, 14 Nov 2017 14:56:37 +0000 (14:56 +0000)]
JAL-2811 Changed to overlay on via graphics context, not separate image
kiramt [Tue, 14 Nov 2017 14:10:30 +0000 (14:10 +0000)]
JAL-2811 Missed commit
kiramt [Tue, 14 Nov 2017 13:43:40 +0000 (13:43 +0000)]
JAL-2811 Made it work for hidden columns/seqs too
kiramt [Tue, 14 Nov 2017 12:11:21 +0000 (12:11 +0000)]
JAL-2831 Attempt at cursor fix for wrapped mode
Jim Procter [Tue, 14 Nov 2017 12:11:04 +0000 (12:11 +0000)]
JAL-2758 update uniprot retrieval test
kiramt [Tue, 14 Nov 2017 11:12:55 +0000 (11:12 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Tue, 14 Nov 2017 10:33:33 +0000 (10:33 +0000)]
JAL-2831 deal with hidden cols and seqs in new cursor code
kiramt [Tue, 14 Nov 2017 10:15:46 +0000 (10:15 +0000)]
JAL-2831 Added move viewport event and set up cursor code to use it
kiramt [Tue, 14 Nov 2017 09:30:31 +0000 (09:30 +0000)]
Merge branch 'imp/JAL-2774' into bug/JAL-2831
Jim Procter [Mon, 13 Nov 2017 20:25:06 +0000 (20:25 +0000)]
JAL-2758 release notes
Jim Procter [Mon, 13 Nov 2017 20:22:01 +0000 (20:22 +0000)]
JAL-2698 formatting
kiramt [Mon, 13 Nov 2017 19:40:06 +0000 (19:40 +0000)]
JAL-2811 Tidy
Jim Procter [Mon, 13 Nov 2017 18:59:59 +0000 (18:59 +0000)]
Merge branch 'features/JAL-2758_shorteruniprot' into develop
Jim Procter [Mon, 13 Nov 2017 18:57:10 +0000 (18:57 +0000)]
JAL-2758 remove configurable behaviour - Uniprot sequences are only assigned IDs derived from Entry name
Jim Procter [Mon, 13 Nov 2017 18:56:22 +0000 (18:56 +0000)]
JAL-2758 typo
kiramt [Mon, 13 Nov 2017 16:42:20 +0000 (16:42 +0000)]
JAl-2811 Working for wrapped panels too
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...
kiramt [Mon, 13 Nov 2017 15:53:12 +0000 (15:53 +0000)]
JAL-2811 Add layer for cursor in SeqCanvas
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)
Jim Procter [Fri, 10 Nov 2017 16:46:15 +0000 (16:46 +0000)]
JAL-2828 allow CalcId to match on String equivalence (migrated from Alignment’s implementation of findAnnotation)
Jim Procter [Fri, 10 Nov 2017 16:37:35 +0000 (16:37 +0000)]
JAL-2828 refactored duplicate code for searching lists of AlignmentAnnotation to static methods.
gmungoc [Fri, 10 Nov 2017 15:56:11 +0000 (15:56 +0000)]
JAL-2829 fixes and unit tests
gmungoc [Fri, 10 Nov 2017 15:38:19 +0000 (15:38 +0000)]
JAL-2562 updated findPosition javadoc to match behaviour
gmungoc [Fri, 10 Nov 2017 15:10:50 +0000 (15:10 +0000)]
JAL-2829 unit tests for failing cases
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
Jim Procter [Wed, 8 Nov 2017 15:21:13 +0000 (15:21 +0000)]
Merge branch 'develop' into bug/JAL-2225mapMultipleChains
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
kiramt [Tue, 7 Nov 2017 17:13:20 +0000 (17:13 +0000)]
JAL-2774 Added javadoc for new event parameters
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
kiramt [Tue, 7 Nov 2017 17:09:30 +0000 (17:09 +0000)]
JAL-2774 Fix fastpaint of wrapped alignment
kiramt [Tue, 7 Nov 2017 17:02:31 +0000 (17:02 +0000)]
JAL-2821 refactored drawPartialGroupOutline
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
Jim Procter [Mon, 6 Nov 2017 16:41:28 +0000 (16:41 +0000)]
JAL-2756 release notes
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
kiramt [Wed, 1 Nov 2017 11:21:47 +0000 (11:21 +0000)]
Merge branch 'develop' into imp/JAL-2775
kiramt [Tue, 31 Oct 2017 15:05:01 +0000 (15:05 +0000)]
JAL-2774 Fix repaint artefacts
kiramt [Tue, 31 Oct 2017 14:24:54 +0000 (14:24 +0000)]
JAL-2774 Fixed merge issues
kiramt [Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)]
Merge remote-tracking branch 'origin/develop' into imp/JAL-2774
Conflicts:
src/jalview/gui/SeqCanvas.java
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
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
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
Jim Procter [Thu, 26 Oct 2017 10:51:35 +0000 (11:51 +0100)]
Merge branch 'bug/JAL-2776toggleGroupColour' into develop
git://source.jalview.org / jalview.git / log