gmungoc [Mon, 7 Nov 2016 11:52:23 +0000 (11:52 +0000)]
JAL-2282 show url links that need checked; remove 'www' from default
kiramt [Fri, 4 Nov 2016 16:44:59 +0000 (16:44 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Fri, 4 Nov 2016 16:43:01 +0000 (16:43 +0000)]
JAL-2315 Clear sequenceURLLinks if all sequence links are removed.
tcofoegbu [Fri, 4 Nov 2016 16:08:53 +0000 (16:08 +0000)]
JAL-2292 squashed bug that breaks feature mapping for different cased residues
tcofoegbu [Fri, 4 Nov 2016 15:40:49 +0000 (15:40 +0000)]
JAL-2292 added javadoc for compareChar(..) utility method
tcofoegbu [Fri, 4 Nov 2016 15:34:11 +0000 (15:34 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Fri, 4 Nov 2016 15:34:01 +0000 (15:34 +0000)]
JAL-2195 JAL-2262 house keeping
tcofoegbu [Fri, 4 Nov 2016 15:30:28 +0000 (15:30 +0000)]
JAL-2292 fix for wrong mapping output in sequence mapping output window where sequence residue has different case with structure residue
tcofoegbu [Fri, 4 Nov 2016 15:26:44 +0000 (15:26 +0000)]
JAL-2292 Wrote utility method for comparing two char either case sensitively or insensitively
tcofoegbu [Fri, 4 Nov 2016 15:25:21 +0000 (15:25 +0000)]
JAL-2292 Unit test for utility method for comparing two chars
kiramt [Fri, 4 Nov 2016 14:29:55 +0000 (14:29 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Fri, 4 Nov 2016 14:28:57 +0000 (14:28 +0000)]
JAL-2282 Better check for existing url links
gmungoc [Fri, 4 Nov 2016 14:02:41 +0000 (14:02 +0000)]
JAL-2272 right mouse button on Mac is not Cmd equivalent!
kiramt [Fri, 4 Nov 2016 13:26:13 +0000 (13:26 +0000)]
JAL-2282 Remove Cache dependency from applet
kiramt [Fri, 4 Nov 2016 11:10:36 +0000 (11:10 +0000)]
JAL-2282 Message box stays on top at Jalview open; checks for links
before deciding whether to display.
kiramt [Thu, 3 Nov 2016 20:58:08 +0000 (20:58 +0000)]
JAL-2282 Link menu disabled if there are no valid links
kiramt [Thu, 3 Nov 2016 20:22:40 +0000 (20:22 +0000)]
JAL-2282 Updated warn.url_must_contain
kiramt [Thu, 3 Nov 2016 19:40:41 +0000 (19:40 +0000)]
JAL-2282 If checkbox on warning dialog is unclicked, reset cache
settings for checking url links.
kiramt [Thu, 3 Nov 2016 19:33:16 +0000 (19:33 +0000)]
JAL-2281 Back out unit test update, as Mungo already added.
kiramt [Thu, 3 Nov 2016 19:29:51 +0000 (19:29 +0000)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2282
kiramt [Thu, 3 Nov 2016 19:19:00 +0000 (19:19 +0000)]
JAL-2308 Fixed hiddenColsTest
tcofoegbu [Thu, 3 Nov 2016 17:15:03 +0000 (17:15 +0000)]
JAL-2312 unit test for bug fix - repeated mapping generated from SIFTS when heuristic identification fails for some SIFTS entities
tcofoegbu [Thu, 3 Nov 2016 16:50:29 +0000 (16:50 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Thu, 3 Nov 2016 16:47:18 +0000 (16:47 +0000)]
JAL-2312 Bug fix for repeated mapping generation from SIFTS when heuristic identification fails for some SIFTS entities
gmungoc [Thu, 3 Nov 2016 09:24:58 +0000 (09:24 +0000)]
JAL-2281 test added to show searchRefs is now not case sensitive
kiramt [Thu, 3 Nov 2016 09:14:32 +0000 (09:14 +0000)]
JAL-2281 Minor unit test addition
kiramt [Wed, 2 Nov 2016 18:03:42 +0000 (18:03 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Wed, 2 Nov 2016 18:02:16 +0000 (18:02 +0000)]
JAL-2281 Unit test updates
kiramt [Wed, 2 Nov 2016 16:19:54 +0000 (16:19 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
gmungoc [Wed, 2 Nov 2016 16:06:47 +0000 (16:06 +0000)]
JAL-2301 table formatted, and corrected to match the diagram and code
kiramt [Wed, 2 Nov 2016 15:22:45 +0000 (15:22 +0000)]
JAL-2281 Use DBRefs.selectRefs to uppercase URL link target
kiramt [Wed, 2 Nov 2016 15:01:32 +0000 (15:01 +0000)]
JAL-2282 Refactor applet too
kiramt [Wed, 2 Nov 2016 15:00:37 +0000 (15:00 +0000)]
JAL-2282 Updated and checked messages, English and Spanish
kiramt [Wed, 2 Nov 2016 14:18:52 +0000 (14:18 +0000)]
JAL-2282 Updated help documentation
gmungoc [Wed, 2 Nov 2016 12:09:49 +0000 (12:09 +0000)]
JAL-98 JAL-1854 encapsulate 'magic number' threshold 3 in Conservation
gmungoc [Wed, 2 Nov 2016 11:56:49 +0000 (11:56 +0000)]
JAL-98 ProfileI interface for Profile
gmungoc [Wed, 2 Nov 2016 11:02:57 +0000 (11:02 +0000)]
JAL-98 test updated for percentage rounded
gmungoc [Wed, 2 Nov 2016 10:05:20 +0000 (10:05 +0000)]
JAL-98 Profile and ResidueCount moved from analysis to datamodel
gmungoc [Wed, 2 Nov 2016 10:04:18 +0000 (10:04 +0000)]
JAL-98 wording "negatively conserved" now "absence conserved"
kiramt [Wed, 2 Nov 2016 10:03:15 +0000 (10:03 +0000)]
JAL-2282 Code tidy
kiramt [Wed, 2 Nov 2016 09:39:10 +0000 (09:39 +0000)]
JAL-2282 Renamed internal use of sequence id / db accession for
consistency
kiramt [Wed, 2 Nov 2016 09:28:50 +0000 (09:28 +0000)]
JAL-2282 URLLink unit tests updated
gmungoc [Tue, 1 Nov 2016 16:14:18 +0000 (16:14 +0000)]
Conservation now using ResidueCount; tests added
gmungoc [Tue, 1 Nov 2016 16:13:52 +0000 (16:13 +0000)]
JAL-98 use Integer constants; tests added for propHash values
gmungoc [Tue, 1 Nov 2016 16:12:58 +0000 (16:12 +0000)]
JAL-98 typo in javadoc
gmungoc [Tue, 1 Nov 2016 16:12:27 +0000 (16:12 +0000)]
JAL-98 simplified repeat() method
gmungoc [Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
tcofoegbu [Tue, 1 Nov 2016 15:41:32 +0000 (15:41 +0000)]
JAL-2280 refactored and improved structure file identification code for drog'n'drop on AlignFrame to StructureFile class
kiramt [Tue, 1 Nov 2016 14:55:02 +0000 (14:55 +0000)]
JAL-2282 Refactor SequenceAnnotationReport to use refactored UrlLink
code.
kiramt [Tue, 1 Nov 2016 12:13:27 +0000 (12:13 +0000)]
JAL-2282 Merge
kiramt [Tue, 1 Nov 2016 12:07:06 +0000 (12:07 +0000)]
JAL-2282 Changed DB accession id token to $DB_ACCESSION$; updated
messages
kiramt [Tue, 1 Nov 2016 12:00:55 +0000 (12:00 +0000)]
JAL-2282 Refactored URL link creation into UrlLink
kiramt [Mon, 31 Oct 2016 09:58:23 +0000 (09:58 +0000)]
JAL-2282 Removed unexpected ; from code
kiramt [Mon, 31 Oct 2016 09:56:36 +0000 (09:56 +0000)]
JAL-2282 Force double-clicking to use sequence_id cases and not accession_id
cases
gmungoc [Mon, 31 Oct 2016 13:47:32 +0000 (13:47 +0000)]
JAL-98 round when formatting dec places
kiramt [Mon, 31 Oct 2016 09:56:36 +0000 (09:56 +0000)]
Force double-clicking to use sequence_id cases and not accession_id
cases
kiramt [Mon, 31 Oct 2016 09:43:56 +0000 (09:43 +0000)]
Updated messages.
kiramt [Mon, 31 Oct 2016 08:14:49 +0000 (08:14 +0000)]
Use ACCESSION_ID for database accession id, and SEQUENCE_ID for sequence
name.
gmungoc [Thu, 27 Oct 2016 15:21:31 +0000 (16:21 +0100)]
JAL-2282 test assertions for 'other' dbsource
tcofoegbu [Thu, 27 Oct 2016 14:24:27 +0000 (15:24 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Thu, 27 Oct 2016 14:24:18 +0000 (15:24 +0100)]
JAL-2280 Improvement to enable drag'n'drop association of mmCIF file structures to sequences
gmungoc [Thu, 27 Oct 2016 09:45:06 +0000 (10:45 +0100)]
JAL-98 refactor bleachColour() to ColorUtils
gmungoc [Thu, 27 Oct 2016 08:03:05 +0000 (09:03 +0100)]
JAL-2287 treat Escape like Cancel in dialog box
gmungoc [Wed, 26 Oct 2016 15:42:51 +0000 (16:42 +0100)]
JAL-2287 Cancel option on Close Chimera? dialog
gmungoc [Wed, 26 Oct 2016 15:22:45 +0000 (16:22 +0100)]
Merge branch 'bug/JAL-98consensusMemory' into develop
gmungoc [Wed, 26 Oct 2016 15:11:17 +0000 (16:11 +0100)]
JAL-2286 modal residue check + commenting
gmungoc [Wed, 26 Oct 2016 15:09:56 +0000 (16:09 +0100)]
JAL-98 null reference to globalColourScheme as it has ref to consensus
gmungoc [Wed, 26 Oct 2016 15:09:21 +0000 (16:09 +0100)]
JAL-2286 javadoc, refactor, unit tests for threshold and conservation
colouring
tcofoegbu [Wed, 26 Oct 2016 10:37:03 +0000 (11:37 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 26 Oct 2016 10:36:20 +0000 (11:36 +0100)]
Merge branch 'features/JAL-2284_export-biojsmsa-via-cli' into develop
tcofoegbu [Wed, 26 Oct 2016 10:31:53 +0000 (11:31 +0100)]
JAL-2284 basic support for exporting BioJS MSA viewer via CLI
gmungoc [Tue, 25 Oct 2016 15:35:51 +0000 (16:35 +0100)]
JAL-2286 use constant for fixed colours
gmungoc [Tue, 25 Oct 2016 15:22:21 +0000 (16:22 +0100)]
JAL-98 javadoc corrected
gmungoc [Tue, 25 Oct 2016 15:21:48 +0000 (16:21 +0100)]
JAL-98 javadoc added
gmungoc [Tue, 25 Oct 2016 15:21:17 +0000 (16:21 +0100)]
JAL-98 minor fixes to / tests for annotation derivation
Jim Procter [Tue, 25 Oct 2016 10:55:28 +0000 (11:55 +0100)]
Merge branch 'releases/Release_2_10_0_Branch_fixmaster' into develop
Jim Procter [Tue, 25 Oct 2016 10:49:32 +0000 (11:49 +0100)]
JAL-2089 patch broken merge to master for Release 2.10.0b1
Jim Procter [Tue, 25 Oct 2016 10:46:04 +0000 (11:46 +0100)]
Merge branch 'releases/Release_2_10_0_Branch'
tcofoegbu [Tue, 25 Oct 2016 10:26:33 +0000 (11:26 +0100)]
Merge branch 'bug/JAL-2277_html-output-wrapped-mode' into develop
Jim Procter [Tue, 25 Oct 2016 10:25:37 +0000 (11:25 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_0_Branch
Jim Procter [Tue, 25 Oct 2016 10:24:40 +0000 (11:24 +0100)]
Merge branch 'sourcepub' into develop
Jim Procter [Tue, 25 Oct 2016 10:24:04 +0000 (11:24 +0100)]
JAL-2089 update What's new for 2.10.0b1
tcofoegbu [Tue, 25 Oct 2016 10:22:10 +0000 (11:22 +0100)]
JAL-2277 Improvement to support html+svg export in wrap mode
gmungoc [Tue, 25 Oct 2016 09:01:38 +0000 (10:01 +0100)]
JAL-98 field comments updated
gmungoc [Tue, 25 Oct 2016 09:01:11 +0000 (10:01 +0100)]
JAL-98 small efficiency fix + commenting
gmungoc [Tue, 25 Oct 2016 09:00:25 +0000 (10:00 +0100)]
JAL-98 javadoc / comments updated
Jim Procter [Tue, 25 Oct 2016 08:32:09 +0000 (09:32 +0100)]
Merge branch 'releases/Release_2_10_0_Branch'
Jim Procter [Tue, 25 Oct 2016 08:31:18 +0000 (09:31 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_0_Branch
Jim Procter [Tue, 25 Oct 2016 08:30:43 +0000 (09:30 +0100)]
Merge branch 'sourcepub' into develop
Jim Procter [Tue, 25 Oct 2016 08:30:06 +0000 (09:30 +0100)]
JAL-1683 reinstate replacetoken patterns so source replacement happens!
Jim Procter [Mon, 24 Oct 2016 21:25:05 +0000 (22:25 +0100)]
Merge branch 'sourcepub' into develop
Jim Procter [Mon, 24 Oct 2016 21:23:29 +0000 (22:23 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 21:20:48 +0000 (22:20 +0100)]
JAL-1683 replace version and year in licence header when generating source tarsal
Jim Procter [Mon, 24 Oct 2016 20:27:52 +0000 (21:27 +0100)]
Merge branch 'releases/Release_2_10_0_Branch'
gmungoc [Mon, 24 Oct 2016 18:12:09 +0000 (19:12 +0100)]
JAL-98 fixme comment removed - nothing to do
gmungoc [Mon, 24 Oct 2016 18:11:28 +0000 (19:11 +0100)]
JAL-98 ResidueCount 100% test coverage (and bug fixes!)
kiramt [Mon, 24 Oct 2016 17:29:46 +0000 (18:29 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Mon, 24 Oct 2016 15:46:59 +0000 (16:46 +0100)]
Unit tests for UrlLink
Jim Procter [Mon, 24 Oct 2016 15:11:39 +0000 (16:11 +0100)]
Merge branch 'develop' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 15:11:02 +0000 (16:11 +0100)]
JAL-2089 bump version and release branch info
git://source.jalview.org / jalview.git / log