Jim Procter [Wed, 9 Aug 2017 08:46:08 +0000 (09:46 +0100)]
JAL-2418 more release notes
Jim Procter [Wed, 9 Aug 2017 08:45:50 +0000 (09:45 +0100)]
JAL-2418 JAL-2611 and rejigged overview documentation
Jim Procter [Wed, 9 Aug 2017 08:09:56 +0000 (09:09 +0100)]
Merge branch 'bug/JAL-2634' into develop
Jim Procter [Wed, 9 Aug 2017 07:56:01 +0000 (08:56 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
gmungoc [Tue, 8 Aug 2017 15:44:45 +0000 (16:44 +0100)]
JAL-2560 alternative fix (reinstate lost line of code)
gmungoc [Tue, 8 Aug 2017 10:18:12 +0000 (11:18 +0100)]
JAL-2649 JAL-2650 wait for Conservation calc to complete before setting
on new View coloured by Conservation
gmungoc [Tue, 8 Aug 2017 09:08:46 +0000 (11:08 +0200)]
JAL-2650 configure new viewport settings before selecting view tab
Jim Procter [Mon, 7 Aug 2017 14:33:47 +0000 (15:33 +0100)]
Merge branch 'bug/JAL-2592userDefinedScheme' into develop
Jim Procter [Mon, 7 Aug 2017 13:31:35 +0000 (14:31 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Mon, 7 Aug 2017 13:31:13 +0000 (14:31 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Mon, 7 Aug 2017 11:24:05 +0000 (12:24 +0100)]
JAL-2418 JAL-2468 known issue
Jim Procter [Mon, 7 Aug 2017 11:07:45 +0000 (12:07 +0100)]
JAL-2482 JAL-2487 documented in release notes
Jim Procter [Mon, 7 Aug 2017 11:04:48 +0000 (12:04 +0100)]
JAL-2482 release notes
Jim Procter [Mon, 7 Aug 2017 10:56:46 +0000 (11:56 +0100)]
JAL-2418 release notes formatting
Jim Procter [Mon, 7 Aug 2017 10:56:01 +0000 (11:56 +0100)]
JAL-2418 release notes
Jim Procter [Mon, 7 Aug 2017 10:55:46 +0000 (11:55 +0100)]
JAL-2418 typo and formatting of search.html
Jim Procter [Mon, 7 Aug 2017 10:54:25 +0000 (11:54 +0100)]
JAL-1648 documentation of search history for Find command
Jim Procter [Mon, 7 Aug 2017 08:50:33 +0000 (09:50 +0100)]
JAL-2418 reformatting and scripting section in what’s new
Jim Procter [Mon, 7 Aug 2017 08:49:38 +0000 (09:49 +0100)]
JAL-2418 release notes
Jim Procter [Mon, 7 Aug 2017 08:49:10 +0000 (09:49 +0100)]
JAL-2418 formatting
Jim Procter [Mon, 7 Aug 2017 08:48:58 +0000 (09:48 +0100)]
JAL-1476 JAL-2418 insufficient columns for superposition docs/release notes
Jim Procter [Fri, 4 Aug 2017 12:40:20 +0000 (13:40 +0100)]
JAL-2418 JAL-1632 JAL-2416 calculations dialog documentation page and release notes
Jim Procter [Fri, 4 Aug 2017 10:28:36 +0000 (11:28 +0100)]
JAL-2418 new features in release notes JAL-1933 JAL-2375
Jim Procter [Fri, 4 Aug 2017 10:10:43 +0000 (11:10 +0100)]
JAL-2418 release notes
Jim Procter [Fri, 4 Aug 2017 10:10:09 +0000 (11:10 +0100)]
JAL-1551 JAL-2418 reformat releases.html to remove tabs
Jim Procter [Fri, 4 Aug 2017 08:13:06 +0000 (09:13 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into releases/Release_2_10_2_Branch
Jim Procter [Fri, 4 Aug 2017 08:12:44 +0000 (09:12 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Fri, 4 Aug 2017 08:12:35 +0000 (09:12 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
gmungoc [Thu, 3 Aug 2017 11:47:18 +0000 (13:47 +0200)]
JAL-2500 JAL-2365 lightGray changed to lightgray for backwards
compatibility!
JAL-1551 source formatting definition for eclipse
gmungoc [Thu, 3 Aug 2017 11:45:25 +0000 (13:45 +0200)]
JAL-2500 JAL-2365 lightGray changed to gray in example file for
backwards compatibility
Jim Procter [Thu, 3 Aug 2017 13:09:25 +0000 (14:09 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Thu, 3 Aug 2017 13:09:10 +0000 (14:09 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Thu, 3 Aug 2017 13:07:51 +0000 (14:07 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Thu, 3 Aug 2017 13:05:30 +0000 (14:05 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Jim Procter [Thu, 3 Aug 2017 13:05:14 +0000 (14:05 +0100)]
JAL-2418 what’s new - faster PCA, calculations UI and score model framework
Jim Procter [Thu, 3 Aug 2017 13:04:43 +0000 (14:04 +0100)]
JAL-2418 release notes
Jim Procter [Thu, 3 Aug 2017 12:59:31 +0000 (13:59 +0100)]
JAL-1551 updated source code formatting settings from gmungoc and README on how to compare between versions
gmungoc [Thu, 3 Aug 2017 12:13:00 +0000 (14:13 +0200)]
JAL-2500 JAL-2365 feature colour "gray" _not_ "lightgray" for backwards
compatibility!!
gmungoc [Thu, 3 Aug 2017 11:47:18 +0000 (13:47 +0200)]
JAL-2500 JAL-2365 lightGray changed to lightgray for backwards
compatibility!
gmungoc [Thu, 3 Aug 2017 11:45:25 +0000 (13:45 +0200)]
JAL-2500 JAL-2365 lightGray changed to gray in example file for
backwards compatibility
gmungoc [Thu, 3 Aug 2017 11:18:03 +0000 (13:18 +0200)]
JAL-2435 test for 'mirror font' option visible (not enabled) (safer)
Jim Procter [Thu, 3 Aug 2017 10:33:46 +0000 (11:33 +0100)]
Merge branch 'bug/JAL-2591overviewupdate' into develop
Jim Procter [Wed, 2 Aug 2017 16:02:06 +0000 (17:02 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 2 Aug 2017 16:01:50 +0000 (17:01 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Wed, 2 Aug 2017 16:01:02 +0000 (17:01 +0100)]
Merge branch 'bug/JAL-2321_merged' into develop
Jim Procter [Wed, 2 Aug 2017 14:31:01 +0000 (15:31 +0100)]
Merge branch 'bug/JAL-2321' into bug/JAL-2321_merged
Jim Procter [Wed, 2 Aug 2017 14:28:12 +0000 (15:28 +0100)]
JAL-2418 release notes for JAL-2582
gmungoc [Wed, 2 Aug 2017 14:02:14 +0000 (16:02 +0200)]
JAL-2418 corrected link url for "overview" target
Jim Procter [Tue, 1 Aug 2017 16:12:18 +0000 (17:12 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 1 Aug 2017 16:12:05 +0000 (17:12 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 1 Aug 2017 16:11:32 +0000 (17:11 +0100)]
JAL-2418 known defect for eggnog tree import (JAL-2590)
Jim Procter [Tue, 1 Aug 2017 15:43:09 +0000 (16:43 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 1 Aug 2017 15:42:52 +0000 (16:42 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 1 Aug 2017 15:42:43 +0000 (16:42 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Tue, 1 Aug 2017 15:42:28 +0000 (16:42 +0100)]
Merge branch 'bug/JAL-2632' into develop
Jim Procter [Tue, 1 Aug 2017 15:39:23 +0000 (16:39 +0100)]
JAL-2418 documentation
Jim Procter [Tue, 1 Aug 2017 15:16:25 +0000 (16:16 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 1 Aug 2017 15:16:05 +0000 (16:16 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 1 Aug 2017 15:15:46 +0000 (16:15 +0100)]
JAL-2631 JAL-2623 JAL-2624 JAL-2630 JAL-147 JAL-2034 release notes and signoff
Jim Procter [Tue, 1 Aug 2017 15:14:53 +0000 (16:14 +0100)]
JAL-2418 update 2.10.2 release date
gmungoc [Tue, 1 Aug 2017 10:08:34 +0000 (12:08 +0200)]
JAL-2611 reinstate missed merge - again!
gmungoc [Tue, 1 Aug 2017 09:55:35 +0000 (11:55 +0200)]
Merge branch 'feature/JAL-2611' into develop
gmungoc [Tue, 1 Aug 2017 09:39:24 +0000 (11:39 +0200)]
Merge branch 'bug/JAL-2630gradColourUpdateOverview' into develop
kiramt [Mon, 31 Jul 2017 10:01:55 +0000 (12:01 +0200)]
JAL-2634 Make overview box full height when alignment is wrapped
gmungoc [Mon, 31 Jul 2017 09:28:09 +0000 (11:28 +0200)]
JAL-2623 updated Overview/structure on input of threshold value
kiramt [Mon, 31 Jul 2017 09:23:04 +0000 (11:23 +0200)]
JAL-2634 Added null test for graphics in AnnotationPanel::fastPaint
gmungoc [Mon, 31 Jul 2017 09:20:15 +0000 (11:20 +0200)]
JAL-2622 don't vertical scroll wrapped alignment id panel from trackpad
gmungoc [Mon, 31 Jul 2017 08:36:34 +0000 (10:36 +0200)]
JAL-2631 test updated for added kd graduated feature colour
gmungoc [Mon, 31 Jul 2017 08:32:11 +0000 (10:32 +0200)]
JAL-2623 JAL-2015 set Below Threshold on FeatureColour when selected!
gmungoc [Mon, 31 Jul 2017 08:10:24 +0000 (10:10 +0200)]
JAL-2630 applet update overview on release of threshold slider
kiramt [Fri, 28 Jul 2017 15:35:32 +0000 (17:35 +0200)]
JAL-2632 Added paintAlignment(true) to show cols code
gmungoc [Fri, 28 Jul 2017 13:17:08 +0000 (15:17 +0200)]
JAL-147 corrected status bar message for wrapped scrolled right view
gmungoc [Fri, 28 Jul 2017 11:12:50 +0000 (13:12 +0200)]
JAL-2622 no vertical scroll of wrapped alignment from trackpad / mouse
button
gmungoc [Fri, 28 Jul 2017 10:06:39 +0000 (12:06 +0200)]
JAL-147 unit test for no vertical move of Overview box in wrapped mode
gmungoc [Fri, 28 Jul 2017 08:45:57 +0000 (10:45 +0200)]
JAL-2006 squash rounding errors at min/max threshold slider positions
gmungoc [Fri, 28 Jul 2017 08:12:44 +0000 (10:12 +0200)]
JAL-2631 make minimum colour not white
gmungoc [Fri, 28 Jul 2017 08:04:10 +0000 (10:04 +0200)]
JAL-2630 update Overview/structure from graduated colour options dialog
gmungoc [Fri, 28 Jul 2017 08:02:38 +0000 (10:02 +0200)]
JAL-2631 add graduated colour kdH features to example
Jim Procter [Mon, 24 Jul 2017 05:24:15 +0000 (07:24 +0200)]
Merge branch 'documentation/JAL-2418_release2102' into develop
gmungoc [Sat, 22 Jul 2017 15:38:54 +0000 (16:38 +0100)]
JAL-2624 check feature colour threshold when colouring structure
gmungoc [Sat, 22 Jul 2017 13:48:22 +0000 (14:48 +0100)]
JAL-2623 initialise colour threshold slider correctly
kiramt [Sat, 22 Jul 2017 09:18:41 +0000 (11:18 +0200)]
Merge branch 'develop' into feature/JAL-2611
Conflicts:
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/OverviewDimensionsHideHidden.java
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
Jim Procter [Tue, 18 Jul 2017 15:24:26 +0000 (16:24 +0100)]
JAL-2432 updated documentation for select/hide by annotation to include As Percentage checkbox
kiramt [Tue, 18 Jul 2017 14:44:30 +0000 (15:44 +0100)]
JAL-2611 unit tests
kiramt [Tue, 18 Jul 2017 13:45:38 +0000 (14:45 +0100)]
JAL-2611 Tidies, initial unit tests
gmungoc [Tue, 18 Jul 2017 13:44:27 +0000 (14:44 +0100)]
JAL-147 don't scroll up beyond startRes = 0
gmungoc [Tue, 18 Jul 2017 12:02:15 +0000 (13:02 +0100)]
JAL-147 corrected calculation of vertical scroll position and max
gmungoc [Tue, 18 Jul 2017 12:01:46 +0000 (13:01 +0100)]
JAL-147 draw up to last position of wrapped alignment!
kiramt [Tue, 18 Jul 2017 11:12:23 +0000 (12:12 +0100)]
JAL-2611 Better
gmungoc [Mon, 17 Jul 2017 15:20:37 +0000 (16:20 +0100)]
Merge branch 'develop' into bug/JAL-147scrollWrappedView
kiramt [Mon, 17 Jul 2017 15:02:03 +0000 (16:02 +0100)]
JAL-2611 Still not happy with behaviour
gmungoc [Mon, 17 Jul 2017 11:25:04 +0000 (12:25 +0100)]
JAL-1648 JAL-2447 Spanish translations
kiramt [Fri, 14 Jul 2017 13:31:51 +0000 (14:31 +0100)]
JAL-2611 First pass, not thrilled with hidden column behaviour
kiramt [Fri, 14 Jul 2017 09:01:25 +0000 (10:01 +0100)]
Merge branch 'feature/JAL-2613' into feature/JAL-2611
Conflicts:
src/jalview/viewmodel/OverviewDimensions.java
kiramt [Fri, 14 Jul 2017 08:59:38 +0000 (09:59 +0100)]
JAL-2611 Pre-merge checkin
kiramt [Fri, 14 Jul 2017 06:59:45 +0000 (07:59 +0100)]
JAL-2611 More unit tests
kiramt [Fri, 14 Jul 2017 06:41:09 +0000 (07:41 +0100)]
JAL-2613 Missed unit test
kiramt [Thu, 13 Jul 2017 15:54:22 +0000 (16:54 +0100)]
JAL-2611 Added overview dimensions test for position in box
kiramt [Thu, 13 Jul 2017 14:52:20 +0000 (15:52 +0100)]
JAL-2613 Unit tests and a fix. Phew.
kiramt [Wed, 12 Jul 2017 13:58:03 +0000 (14:58 +0100)]
JAL-2613 Centre alignment at click point
git://source.jalview.org / jalview.git / log