Jim Procter [Thu, 31 May 2018 12:48:14 +0000 (13:48 +0100)]
Merge branch 'spike/JAL-1950_hmmer3client' into features/mchmmer_merge_JAL-1950
Conflicts:
src/jalview/gui/AlignViewport.java
Jim Procter [Thu, 31 May 2018 12:41:36 +0000 (13:41 +0100)]
Merge branch 'develop' into spike/JAL-1950_hmmer3client
gmungoc [Wed, 30 May 2018 11:19:35 +0000 (12:19 +0100)]
JAL-2629 suppress 'Add Database' menu option in favour of file chooser argument
gmungoc [Wed, 30 May 2018 11:16:32 +0000 (12:16 +0100)]
JAL-3005 JAL-2629 file chooser argument for HMM search database
gmungoc [Wed, 30 May 2018 11:11:21 +0000 (12:11 +0100)]
JAL-3005 JAL-3008 render file chooser and radio button arguments
gmungoc [Wed, 30 May 2018 11:10:31 +0000 (12:10 +0100)]
JAL-3008 new parameter type RadioChoiceParameter
gmungoc [Wed, 30 May 2018 11:09:51 +0000 (12:09 +0100)]
JAL-3005 new argument type FileParameter for file chooser
gmungoc [Tue, 29 May 2018 16:33:08 +0000 (17:33 +0100)]
JAL-3005 refactor updateRecentlyOpened to enable reuse
Mungo Carstairs [Tue, 29 May 2018 10:24:00 +0000 (11:24 +0100)]
JAL-2994 utility method to match a list of folder/file patterns
gmungoc [Mon, 28 May 2018 14:22:54 +0000 (15:22 +0100)]
JAL-2994 restrict search to \Program Files\Chimera*
gmungoc [Mon, 28 May 2018 10:33:18 +0000 (11:33 +0100)]
JAL-2994 use pattern matches to search for chimera.exe
gmungoc [Mon, 28 May 2018 08:56:14 +0000 (09:56 +0100)]
Merge branch 'develop' into features/mchmmer
Conflicts:
src/jalview/bin/Jalview.java
gmungoc [Mon, 28 May 2018 08:23:26 +0000 (09:23 +0100)]
Merge branch 'bug/JAL-797' into develop
gmungoc [Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)]
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
Conflicts:
src/jalview/io/FeaturesFile.java
Jim Procter [Sat, 26 May 2018 12:36:41 +0000 (13:36 +0100)]
JAL-2999 release date for 2.10.4b1 set for 27th May 2018
Jim Procter [Fri, 25 May 2018 12:58:10 +0000 (13:58 +0100)]
Merge branch 'documentation/JAL-2999_r2104b1' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 12:58:01 +0000 (13:58 +0100)]
Merge branch 'bug/JAL-2992panelHeight' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 12:56:34 +0000 (13:56 +0100)]
Merge branch 'bug/JAL-1460_dragndropWindows' into releases/Release_2_10_4_Branch
gmungoc [Fri, 25 May 2018 12:49:33 +0000 (13:49 +0100)]
JAL-2992 simpler heuristic for available height
Jim Procter [Fri, 25 May 2018 10:19:58 +0000 (11:19 +0100)]
Merge branch 'bug/JAL-2991_exporttosvgwrapview' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 10:10:20 +0000 (11:10 +0100)]
Merge branch 'feature/JAL-2994chimeraPath' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 10:09:33 +0000 (11:09 +0100)]
JAL-1460 clarify release notes - and mention that shortcuts are now handled by Jalview
Jim Procter [Fri, 25 May 2018 09:59:51 +0000 (10:59 +0100)]
JAL-2994 add a few future release points for good measure in Chimera path search on Windows
Jim Procter [Fri, 25 May 2018 09:47:32 +0000 (10:47 +0100)]
JAL-1460 temp variable for clearer conditional and some extra brackets for readability only
Jim Procter [Fri, 25 May 2018 09:47:11 +0000 (10:47 +0100)]
JAL-1460 javadoc
gmungoc [Fri, 25 May 2018 08:13:35 +0000 (09:13 +0100)]
JAL-2995 tooltip on fields with double-click to browse for file
gmungoc [Fri, 25 May 2018 08:13:00 +0000 (09:13 +0100)]
JAL-2994 temporary patch with paths to Chimera for Windows
Jim Procter [Thu, 24 May 2018 15:34:34 +0000 (16:34 +0100)]
JAL-2999 issues resolved (or nearly so) for 2.10.4b1
gmungoc [Thu, 24 May 2018 14:59:49 +0000 (15:59 +0100)]
JAL-2997 additional tests
Jim Procter [Thu, 24 May 2018 13:38:59 +0000 (14:38 +0100)]
JAL-1460 tidied up the use of windows link file parser
Jim Procter [Thu, 24 May 2018 12:52:32 +0000 (13:52 +0100)]
JAL-1460 more complete drag'n'drop debugging info and bugfixes
Jim Procter [Thu, 24 May 2018 10:56:32 +0000 (11:56 +0100)]
JAL-1460 process .lnk files dragged to Jalview when on Windows using WindowsShortCutHandler class (thanks to StackOverFlow post..)
Jim Procter [Thu, 24 May 2018 10:54:26 +0000 (11:54 +0100)]
JAL-1460 new data flavor for URLs added belt-and-braces URL drop code found in Marinacci and Adamson’s ’Swing Hacks’ (https://books.google.co.uk/books?id=oNbFfcyAtv4C&lpg=PA336&ots=hflsI561Dv&dq=java%20drag%20and%20drop%20url&pg=PA337#v=onepage&q=java%20drag%20and%20drop%20url&f=false ) plus OS X bug workaround.
gmungoc [Wed, 23 May 2018 16:14:17 +0000 (17:14 +0100)]
JAL-2993 AlignFrame listen for keystrokes in OverviewPanel
gmungoc [Wed, 23 May 2018 15:49:53 +0000 (16:49 +0100)]
JAL-2997 unit test
Jim Procter [Wed, 23 May 2018 15:19:56 +0000 (16:19 +0100)]
fix for JAL-2991 - we could do better :/
gmungoc [Wed, 23 May 2018 14:33:08 +0000 (15:33 +0100)]
JAL-2997 handle tab-delimited trailing column number when parsing
Jim Procter [Wed, 23 May 2018 14:18:52 +0000 (15:18 +0100)]
JAL-2999 release notes and version bump for jalview 2.10.4b1
Jim Procter [Wed, 23 May 2018 14:17:45 +0000 (15:17 +0100)]
JAL-2895 replace $$Jalview-Version$$ in help.jhm with build version when indexing built in help pages
gmungoc [Tue, 22 May 2018 16:06:10 +0000 (17:06 +0100)]
JAL-2716 fix to reset choice parameter on Revert
gmungoc [Tue, 22 May 2018 15:05:03 +0000 (16:05 +0100)]
JAL-2716 fix broken checkIfModified behaviour
gmungoc [Tue, 22 May 2018 13:02:34 +0000 (14:02 +0100)]
JAL-2629 method refactor and menu tidying
gmungoc [Mon, 21 May 2018 14:31:34 +0000 (15:31 +0100)]
JAL-797 Cmd-W act WHEN_IN_FOCUSED_WINDOW
gmungoc [Tue, 15 May 2018 11:19:02 +0000 (12:19 +0100)]
JAL-2719 parse bit score annotation from search results
gmungoc [Tue, 15 May 2018 11:02:12 +0000 (12:02 +0100)]
JAL-1264 exclude score-only from 'Add Reference Annotations'
gmungoc [Tue, 15 May 2018 09:45:22 +0000 (10:45 +0100)]
JAL-2629 JAL-2937 respect 'align automatically' option for HMMSearch
gmungoc [Mon, 14 May 2018 13:19:31 +0000 (14:19 +0100)]
JAL-2989 refactoring to reduce code duplication
gmungoc [Mon, 14 May 2018 11:17:51 +0000 (12:17 +0100)]
JAL-2711 show short file names in search database combo box
gmungoc [Mon, 14 May 2018 11:17:18 +0000 (12:17 +0100)]
JAL-2989 support value display names for Option or Parameters combo boxes
gmungoc [Mon, 14 May 2018 10:47:12 +0000 (11:47 +0100)]
JAL-2711 removed unused and flaky utility method
gmungoc [Mon, 14 May 2018 08:17:37 +0000 (09:17 +0100)]
JAL-2939 check for hmm present when processing groups
gmungoc [Fri, 11 May 2018 15:34:35 +0000 (16:34 +0100)]
JAL-2985 show label instead of checkbox for a required (Jalview) Option
gmungoc [Fri, 11 May 2018 11:25:16 +0000 (12:25 +0100)]
Merge branch 'develop' into features/mchmmer
gmungoc [Fri, 11 May 2018 11:19:52 +0000 (12:19 +0100)]
JAL-2986 corrected findIndex for out of range residue value
gmungoc [Fri, 11 May 2018 11:17:18 +0000 (12:17 +0100)]
JAL-2986 additional asserts for SequenceCursor updates
gmungoc [Fri, 11 May 2018 10:57:56 +0000 (11:57 +0100)]
JAL-2986 failing test added
gmungoc [Thu, 10 May 2018 14:30:43 +0000 (15:30 +0100)]
JAL-2629 revert to showing Profile parameter even if only 1 choice
gmungoc [Thu, 10 May 2018 14:17:53 +0000 (15:17 +0100)]
JAL-2629 default HMMBuild to alignment if not specified by args
gmungoc [Thu, 10 May 2018 14:17:20 +0000 (15:17 +0100)]
JAL-591 reduced updating by checking/setting 'updating' flag
gmungoc [Thu, 10 May 2018 12:34:59 +0000 (13:34 +0100)]
JAL-2629 handle decline 'Add Database'
gmungoc [Thu, 10 May 2018 12:34:37 +0000 (13:34 +0100)]
JAL-2629 adjust placement and optionality of arguments/options
gmungoc [Thu, 10 May 2018 12:33:25 +0000 (13:33 +0100)]
JAL-591 show choice list with a single option
Jim Procter [Thu, 10 May 2018 10:49:14 +0000 (11:49 +0100)]
JAL-2920 release notes
Jim Procter [Thu, 10 May 2018 10:35:44 +0000 (11:35 +0100)]
Merge branch 'bug/JAL-2920_uniprotvariantfeature' into releases/Release_2_10_4_Branch
Jim Procter [Thu, 10 May 2018 10:35:11 +0000 (11:35 +0100)]
JAL-2920 basic test for Description from features with/out description, variation and original attributes
Jim Procter [Thu, 10 May 2018 10:34:23 +0000 (11:34 +0100)]
JAL-2920 simplified logic and added corner cases for missing attributes (probably not needed but..)
Jim Procter [Wed, 9 May 2018 19:46:50 +0000 (20:46 +0100)]
JAL-2906 update release date and release notes
Jim Procter [Wed, 9 May 2018 19:46:04 +0000 (20:46 +0100)]
JAL-2931 patch IA paths for new build box
gmungoc [Wed, 9 May 2018 15:57:00 +0000 (16:57 +0100)]
JAL-2714 HMMSearch cutoff by E-Value, Score or None
gmungoc [Wed, 9 May 2018 13:59:14 +0000 (14:59 +0100)]
JAL-2984 add pdb as sequence(s) if associate structure is declined
Jim Procter [Wed, 9 May 2018 09:39:51 +0000 (10:39 +0100)]
Merge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 9 May 2018 09:39:19 +0000 (10:39 +0100)]
JAL-2976 fixed bad equivalence check and implemented belt-and-braces check for quaqua in class name string of look and feel to decide when to fallback to violetlib-Aqua.
Jim Procter [Tue, 8 May 2018 09:59:37 +0000 (10:59 +0100)]
JAL-2321 release notes
Jim Procter [Tue, 8 May 2018 09:57:35 +0000 (10:57 +0100)]
Merge branch 'patch/JAL-2321_addsecstrForDroppedPDBFile' into releases/Release_2_10_4_Branch
gmungoc [Tue, 8 May 2018 09:33:48 +0000 (10:33 +0100)]
Merge branch 'develop' into features/mchmmer
Jim Procter [Mon, 7 May 2018 17:08:38 +0000 (18:08 +0100)]
JAL-2321 patch test to ensure structures are actually annotated when loaded directly to desktop
Jim Procter [Mon, 7 May 2018 17:08:11 +0000 (18:08 +0100)]
JAL-2321 ensure default is ‘parseImmediately=true’
Jim Procter [Mon, 7 May 2018 16:43:56 +0000 (17:43 +0100)]
JAL-2321 use configured values for structure derived annotation
Jim Procter [Mon, 7 May 2018 16:39:17 +0000 (17:39 +0100)]
JAL-2321 add secondary structure & temp factor if not already present on mapped sequences
Jim Procter [Mon, 7 May 2018 16:38:29 +0000 (17:38 +0100)]
JAL-2321 use StructureImportSettings singleton settings when JmolParser.parse() called from constructor
Jim Procter [Mon, 7 May 2018 16:36:28 +0000 (17:36 +0100)]
JAL-2321 isParseImmediately() allows the parse() method to determine if it was called by the constructor or after construction
Jim Procter [Mon, 7 May 2018 16:35:18 +0000 (17:35 +0100)]
JAL-2321 allow JmolParser to be configured before parsing data
gmungoc [Mon, 7 May 2018 14:16:42 +0000 (15:16 +0100)]
JAL-2808 ensure test setUp/tearDown alwaysRun
gmungoc [Mon, 7 May 2018 13:59:27 +0000 (14:59 +0100)]
Merge branch 'releases/Release_2_10_4_Branch' into develop
Conflicts:
.classpath
Jim Procter [Mon, 7 May 2018 13:23:05 +0000 (14:23 +0100)]
JAL-2906 apply GPLv3 license source
Jim Procter [Mon, 7 May 2018 08:53:05 +0000 (09:53 +0100)]
JAL-2960 don’t override a swing method and create infinite recursion ;) toFront now raiseViewer !
Jim Procter [Mon, 7 May 2018 08:29:54 +0000 (09:29 +0100)]
Merge branch 'releases/Release_2_10_4_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_4_Branch
gmungoc [Fri, 4 May 2018 15:35:02 +0000 (16:35 +0100)]
JAL-2906 small tweaks to release notes
Jim Procter [Fri, 4 May 2018 14:24:49 +0000 (15:24 +0100)]
JAL-2906 2.10.4 release for 8th May 2018
Jim Procter [Fri, 4 May 2018 14:15:16 +0000 (15:15 +0100)]
Merge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 4 May 2018 14:05:41 +0000 (15:05 +0100)]
JAL-2906 removed mention of experimental features, updated what’s new for 2.10.4 release, and help TOC.
Jim Procter [Fri, 4 May 2018 13:37:59 +0000 (14:37 +0100)]
JAL-2976 patch NPE when trying to open Uniprot FTS
Jim Procter [Fri, 4 May 2018 13:15:45 +0000 (14:15 +0100)]
JAL-2929 JAL-2922 release notes
Jim Procter [Fri, 4 May 2018 12:55:06 +0000 (13:55 +0100)]
JAL-2976 typo in installAnywhere build for VAqua dependency
Jim Procter [Fri, 4 May 2018 12:26:37 +0000 (13:26 +0100)]
JAL-2960 release notes
Jim Procter [Fri, 4 May 2018 12:26:20 +0000 (13:26 +0100)]
JAL-2948 transfer features/annotation is now available for all users
Jim Procter [Fri, 4 May 2018 12:11:48 +0000 (13:11 +0100)]
JAL-2960 raise the structure view after adding structures to it
Jim Procter [Fri, 4 May 2018 09:35:33 +0000 (10:35 +0100)]
JAL-2976 Vaqua fallback release notes JAL-2906
Jim Procter [Fri, 4 May 2018 07:41:23 +0000 (08:41 +0100)]
Merge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 2 May 2018 14:41:51 +0000 (15:41 +0100)]
JAL-2976 fallback to Vaqua for Macs that don’t work for Quaqua
git://source.jalview.org / jalview.git / log