tcofoegbu [Mon, 22 May 2017 16:59:04 +0000 (17:59 +0100)]
Merge branch 'features/JAL-2136_phyre2_integration' into spikes/phyre
tcofoegbu [Mon, 22 May 2017 10:59:09 +0000 (11:59 +0100)]
JAL-2136 broken build fix attempt
tcofoegbu [Mon, 1 May 2017 15:39:27 +0000 (16:39 +0100)]
Resolve properties file merge conflict with develop
tcofoegbu [Mon, 1 May 2017 14:47:15 +0000 (15:47 +0100)]
Merge branch 'develop' into spikes/phyre
tcofoegbu [Mon, 1 May 2017 14:16:24 +0000 (15:16 +0100)]
resolved merge conflict
tcofoegbu [Mon, 1 May 2017 14:05:45 +0000 (15:05 +0100)]
resolve merge conflict in SiftsClientTest
tcofoegbu [Mon, 1 May 2017 14:02:17 +0000 (15:02 +0100)]
merge develop
gmungoc [Mon, 1 May 2017 13:18:38 +0000 (14:18 +0100)]
Merge remote-tracking branch
'origin/bug/JAL-2479unitteststoNetworkGroup' into develop
gmungoc [Mon, 1 May 2017 12:51:13 +0000 (13:51 +0100)]
JAL-2434 omit unmapped positions from mapping
gmungoc [Fri, 28 Apr 2017 14:55:32 +0000 (15:55 +0100)]
JAL-2495 highlight all mapped sequences from structure pick
gmungoc [Fri, 28 Apr 2017 11:37:42 +0000 (12:37 +0100)]
JAL-2434 check all sequences when determining superposable columns
gmungoc [Fri, 28 Apr 2017 09:06:58 +0000 (10:06 +0100)]
JAL-2434 use a constant for StructureMapping.NO_CHAIN (space)
Jim Procter [Thu, 27 Apr 2017 17:29:17 +0000 (18:29 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 17:22:47 +0000 (18:22 +0100)]
JAL-1933 patch jalview/io/testProps.jvprops to show occupancy by default (allows jalview.gui.AnnotationChooserTest to pass)
Jim Procter [Thu, 27 Apr 2017 17:21:29 +0000 (18:21 +0100)]
JAL-1933 patch jalview/io/testProps.jvprops to show occupancy by default
Jim Procter [Thu, 27 Apr 2017 17:04:05 +0000 (18:04 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 17:02:54 +0000 (18:02 +0100)]
JAL-1933 don't show occupancy row when testing conservation thread runs even when only quality calculation is enabled in preferences (JAL-1306)
Jim Procter [Thu, 27 Apr 2017 16:49:30 +0000 (17:49 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 16:48:46 +0000 (17:48 +0100)]
JAL-1933 applet doc for showOccupancy parameter
Jim Procter [Thu, 27 Apr 2017 16:48:30 +0000 (17:48 +0100)]
JAL-1933 desktop documentation for show occupancy preference
Jim Procter [Thu, 27 Apr 2017 16:43:32 +0000 (17:43 +0100)]
JAL-1933 use constant for preference token
Jim Procter [Thu, 27 Apr 2017 16:40:56 +0000 (17:40 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 16:39:38 +0000 (17:39 +0100)]
JAL-1933 consensus calculation doesn’t depend on occupancy row being materialised
Jim Procter [Thu, 27 Apr 2017 16:34:47 +0000 (17:34 +0100)]
JAL-1933 desktop preferences for occupancy
Jim Procter [Thu, 27 Apr 2017 16:34:29 +0000 (17:34 +0100)]
JAL-1933 action and label for occupancy
Jim Procter [Thu, 27 Apr 2017 15:39:33 +0000 (16:39 +0100)]
JAL-1933 test for SHOW_OCCUPANCY .jalview_properties setting
Jim Procter [Thu, 27 Apr 2017 15:39:12 +0000 (16:39 +0100)]
JAL-1933 showOccupancy applet parameter and SHOW_OCCUPANCY .jalview_properties setting
Jim Procter [Thu, 27 Apr 2017 15:38:22 +0000 (16:38 +0100)]
JAL-1933 only create and add occupancy row to alignment view if showOccupancy viewport attribute is set
Jim Procter [Thu, 27 Apr 2017 15:34:03 +0000 (16:34 +0100)]
JAL-2494 fix: updated behaviour for SequenceGroup.findAnnotations
Jim Procter [Thu, 27 Apr 2017 15:32:53 +0000 (16:32 +0100)]
JAL-2494 fixed behaviour for null parameters in line with test
Jim Procter [Thu, 27 Apr 2017 15:25:24 +0000 (16:25 +0100)]
JAL-2494 javadoc for AnnotatedCollectionI.findAnnotations
Jim Procter [Thu, 27 Apr 2017 15:13:25 +0000 (16:13 +0100)]
JAL-2494 test to cover AnnotatedCollectionI.findAnnotations
Jim Procter [Thu, 27 Apr 2017 14:05:42 +0000 (15:05 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 13:58:26 +0000 (14:58 +0100)]
JAL-2432 desktop: filter/select columns by threshold as a percentage
Jim Procter [Thu, 27 Apr 2017 13:57:28 +0000 (14:57 +0100)]
JAL-1933 JAL-2432 code tidy
Jim Procter [Thu, 27 Apr 2017 13:57:13 +0000 (14:57 +0100)]
JAL-2432 left justify value shown after adjusting threshold slider
Jim Procter [Thu, 27 Apr 2017 13:56:28 +0000 (14:56 +0100)]
JAL-1933 JAL-2432 percentile filter for select/hide columns by annotation in applet
Jim Procter [Thu, 27 Apr 2017 10:57:50 +0000 (11:57 +0100)]
JAL-1933 shade occupancy from light grey to black for high -> low occupancy
Jim Procter [Thu, 27 Apr 2017 10:56:47 +0000 (11:56 +0100)]
JAL-1933 don’t show symbol counts under histogram (also loses tooltip)
Jim Procter [Thu, 27 Apr 2017 10:55:34 +0000 (11:55 +0100)]
JAL-1933 occupancy row has a space below it for counts
Jim Procter [Thu, 27 Apr 2017 10:11:48 +0000 (11:11 +0100)]
Merge branch 'develop' into features/JAL-1933_occupancy
tcofoegbu [Tue, 25 Apr 2017 14:17:58 +0000 (15:17 +0100)]
JAL-2489 edited unit test code comment
tcofoegbu [Tue, 25 Apr 2017 14:14:29 +0000 (15:14 +0100)]
JAL-2489 Unit test for bug
tcofoegbu [Tue, 25 Apr 2017 11:45:44 +0000 (12:45 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Tue, 25 Apr 2017 11:45:36 +0000 (12:45 +0100)]
JAL-2489 bug fix
gmungoc [Mon, 24 Apr 2017 13:30:45 +0000 (14:30 +0100)]
JAL-2487 remove redundant refreshGUI to minimise threading issues
kiramt [Mon, 24 Apr 2017 10:18:26 +0000 (11:18 +0100)]
JAL-2439 Fixed opposite out-by-one problem in wrapped panels
kiramt [Mon, 24 Apr 2017 09:52:12 +0000 (10:52 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Mon, 24 Apr 2017 09:51:39 +0000 (10:51 +0100)]
JAL-2439 Fix to hidden column marker being one row too short
gmungoc [Fri, 21 Apr 2017 15:12:29 +0000 (16:12 +0100)]
JAL-2295 Spanish translations for superposition / errors
gmungoc [Fri, 21 Apr 2017 14:53:55 +0000 (15:53 +0100)]
JAL-2295 Spanish translations added
gmungoc [Fri, 21 Apr 2017 14:34:04 +0000 (15:34 +0100)]
JAL-2361 Spanish text added
tcofoegbu [Fri, 21 Apr 2017 11:33:31 +0000 (12:33 +0100)]
JAL-2485 Bug fix to filter out uniprot response header row by excluding the first row
tcofoegbu [Wed, 19 Apr 2017 11:19:45 +0000 (12:19 +0100)]
JAL-2482 added null check
tcofoegbu [Tue, 18 Apr 2017 13:44:19 +0000 (14:44 +0100)]
JAL-2482 Bugfix
tcofoegbu [Tue, 18 Apr 2017 10:49:54 +0000 (11:49 +0100)]
JAL-2136 merged develop into branch to fix build failure
tcofoegbu [Tue, 18 Apr 2017 10:37:36 +0000 (11:37 +0100)]
JAL-2136 corrected error in annotation file
gmungoc [Wed, 12 Apr 2017 15:06:02 +0000 (16:06 +0100)]
JAL-2361 tweak layout of warning message
kiramt [Tue, 11 Apr 2017 13:58:08 +0000 (14:58 +0100)]
JAL-2479 Moved some network-dependent unit tests into Network group
tcofoegbu [Mon, 10 Apr 2017 16:05:21 +0000 (17:05 +0100)]
Merge branch 'bug/JAL-2255_seq-fetcher-broken-on-linux' into develop
tcofoegbu [Mon, 10 Apr 2017 16:04:13 +0000 (17:04 +0100)]
JAL-2255 Bug fix
tcofoegbu [Mon, 10 Apr 2017 15:54:07 +0000 (16:54 +0100)]
Merge branch 'develop' into bug/JAL-2255_seq-fetcher-broken-on-linux
gmungoc [Mon, 10 Apr 2017 07:48:59 +0000 (08:48 +0100)]
JAL-2361 option to save on OK of changed named colour scheme
gmungoc [Thu, 6 Apr 2017 15:52:23 +0000 (16:52 +0100)]
JAL-2361 make a modified saved scheme the backout checkpoint for Cancel
gmungoc [Wed, 5 Apr 2017 15:14:39 +0000 (16:14 +0100)]
JAL-2384 JAL-2371 update ResidueShader on change of colour by
conservation / pid
gmungoc [Wed, 5 Apr 2017 14:47:10 +0000 (15:47 +0100)]
JAL-2361 simplify constructors, select unsaved but applied user defined
colour scheme in menu
gmungoc [Wed, 5 Apr 2017 13:21:44 +0000 (14:21 +0100)]
JAL-2361 apply any saved changes to current colour scheme
gmungoc [Mon, 3 Apr 2017 15:51:10 +0000 (16:51 +0100)]
JAL-2314 made non-test method non-public
gmungoc [Mon, 3 Apr 2017 13:13:46 +0000 (14:13 +0100)]
Merge branch 'develop' into bug/JAL-2314
gmungoc [Mon, 3 Apr 2017 11:56:53 +0000 (12:56 +0100)]
Merge branch 'develop' into bug/JAL-2461
gmungoc [Fri, 31 Mar 2017 11:26:45 +0000 (12:26 +0100)]
JAL-2405 additional checks for circular reference in context or dataset
gmungoc [Fri, 31 Mar 2017 11:09:02 +0000 (12:09 +0100)]
JAL-2472 PrivilegedAccessor added
gmungoc [Fri, 31 Mar 2017 09:59:57 +0000 (10:59 +0100)]
Merge branch 'develop' into bug/JAL-2431splitFrameNewView
gmungoc [Fri, 31 Mar 2017 09:40:58 +0000 (10:40 +0100)]
JAL-2430 code tidy, unit test for Jmol hidden column colours
gmungoc [Thu, 30 Mar 2017 14:11:49 +0000 (15:11 +0100)]
Merge branch 'develop' into bug/JAL-1608createGroups
gmungoc [Thu, 30 Mar 2017 14:10:17 +0000 (15:10 +0100)]
JAL-1608 leave Create Group, Remove Group menu items enabled
gmungoc [Thu, 30 Mar 2017 13:40:56 +0000 (14:40 +0100)]
JAL-2401 code and help tidy for review comments
gmungoc [Thu, 30 Mar 2017 11:48:42 +0000 (12:48 +0100)]
JAL-2401 don't apply lower case colour to upper case
gmungoc [Thu, 30 Mar 2017 11:20:53 +0000 (12:20 +0100)]
Merge branch 'develop' into bug/JAL-2399textColour
gmungoc [Thu, 30 Mar 2017 11:16:43 +0000 (12:16 +0100)]
JAL-2346 JAL-1933 test updated to include Occupancy
gmungoc [Thu, 30 Mar 2017 11:11:12 +0000 (12:11 +0100)]
JAL-2346 always run setup!
gmungoc [Thu, 30 Mar 2017 10:59:58 +0000 (11:59 +0100)]
JAL-2346 more test coverage for AnnotationColourGradient
gmungoc [Thu, 30 Mar 2017 10:01:08 +0000 (11:01 +0100)]
Merge branch 'develop' into bug/JAL-2346annotationChoice
Conflicts:
src/jalview/gui/AnnotationRowFilter.java
gmungoc [Wed, 29 Mar 2017 15:36:03 +0000 (16:36 +0100)]
Merge branch 'develop' into bug/JAL-1608createGroups
tcofoegbu [Tue, 28 Mar 2017 18:02:33 +0000 (19:02 +0100)]
clean up mistake in the test file allhits.ann
tcofoegbu [Tue, 28 Mar 2017 17:20:10 +0000 (18:20 +0100)]
JAL-2136 JAL-2137 Added improvement to enable explicit and dynamic definition of STRUCTMODEL data via HEADER_STRUCT_MODEL annotation, updated test annotation file, and added unit test accordingly
tcofoegbu [Tue, 28 Mar 2017 17:12:43 +0000 (18:12 +0100)]
JAL-2136 fixed failing unit test for Phyre2Client
tcofoegbu [Tue, 28 Mar 2017 17:08:15 +0000 (18:08 +0100)]
JAL-2465 missed commit for refactore renaming of getPdbFile() method to getStructureFile()
tcofoegbu [Tue, 28 Mar 2017 17:04:46 +0000 (18:04 +0100)]
JAL-2465 unit test for bugfix
tcofoegbu [Tue, 28 Mar 2017 17:03:41 +0000 (18:03 +0100)]
JAL-2465 bugfix and rerefactor renamed getPdbFile() method to getStructureFile()
Jim Procter [Fri, 24 Mar 2017 15:28:49 +0000 (15:28 +0000)]
JAL-2360 fix applet build by separating castor XML dependency from jalview.schemes.ColourSchemes to jalview.schemes.ColourSchemeLoader
kiramt [Fri, 24 Mar 2017 09:44:01 +0000 (09:44 +0000)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
kiramt [Fri, 24 Mar 2017 09:43:38 +0000 (09:43 +0000)]
JAL-2314 Tidy up
kiramt [Fri, 24 Mar 2017 09:35:24 +0000 (09:35 +0000)]
JAL-2314 Fixes to DisorderAnnotExportImport test
gmungoc [Thu, 23 Mar 2017 15:10:52 +0000 (15:10 +0000)]
JAL-2464 fix cancel tree print behaviour
kiramt [Thu, 23 Mar 2017 20:40:10 +0000 (20:40 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Thu, 23 Mar 2017 20:39:51 +0000 (20:39 +0000)]
JAL-2388 unit test initialisation fix for running full suite
kiramt [Thu, 23 Mar 2017 18:47:41 +0000 (18:47 +0000)]
JAL-2314 Tweaks to stop thread sync issues
gmungoc [Thu, 23 Mar 2017 15:10:52 +0000 (15:10 +0000)]
JAL-2464 fix cancel tree print behaviour
kiramt [Thu, 23 Mar 2017 14:56:17 +0000 (14:56 +0000)]
JAL-2314 Tidies
git://source.jalview.org / jalview.git / log