kjvdheide [Sat, 28 Oct 2017 19:58:37 +0000 (20:58 +0100)]
JAL-2795 moved ForesterMatrix to ext.forester
kjvdheide [Fri, 27 Oct 2017 15:47:28 +0000 (16:47 +0100)]
JAL-2795 Added get and set values to the converted matrix
kjvdheide [Fri, 27 Oct 2017 15:42:09 +0000 (16:42 +0100)]
JAL-2795 start of Jalview's Matrix conversion
kjvdheide [Fri, 27 Oct 2017 15:33:26 +0000 (16:33 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
gmungoc [Fri, 27 Oct 2017 13:15:20 +0000 (14:15 +0100)]
JAL-2526 updated javadoc
kjvdheide [Thu, 26 Oct 2017 22:22:42 +0000 (23:22 +0100)]
Start of matrix converter
kjvdheide [Thu, 26 Oct 2017 20:57:16 +0000 (21:57 +0100)]
Added proper title to aptx trees
kjvdheide [Thu, 26 Oct 2017 20:57:01 +0000 (21:57 +0100)]
test name change
kjvdheide [Thu, 26 Oct 2017 20:37:40 +0000 (21:37 +0100)]
Made FreeUpMemoryTest compatible with modified CalculationChooser
kjvdheide [Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into kjvdh/features/PhylogenyViewer
Conflicts:
src/jalview/gui/TreePanel.java
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.
kjvdheide [Thu, 26 Oct 2017 15:58:22 +0000 (16:58 +0100)]
Added getters for scoremodel & scoreparams in TreeBuilder
Jim Procter [Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)]
Merge branch 'feature/JAL-2488finalize' into develop
kjvdheide [Thu, 26 Oct 2017 15:20:25 +0000 (16:20 +0100)]
TreeBuilder now stores the used ScoreModel and ScoreParams
Jim Procter [Thu, 26 Oct 2017 15:20:14 +0000 (16:20 +0100)]
JAL-2036 2.10.3 release notes
kjvdheide [Thu, 26 Oct 2017 15:12:17 +0000 (16:12 +0100)]
small name fixes in TreeBuilder
kjvdheide [Thu, 26 Oct 2017 15:12:04 +0000 (16:12 +0100)]
Added TreeBuilder as parameter to the converter constructor
kjvdheide [Thu, 26 Oct 2017 15:10:25 +0000 (16:10 +0100)]
Name changed of aptx treebuilder to treeconverter
kjvdheide [Thu, 26 Oct 2017 14:49:56 +0000 (15:49 +0100)]
added getSeqData to TreeBuilder
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
kjvdheide [Thu, 26 Oct 2017 14:46:08 +0000 (15:46 +0100)]
Added full names to the tree algorithm enum
kjvdheide [Thu, 26 Oct 2017 14:17:58 +0000 (15:17 +0100)]
added abbreviations
kjvdheide [Thu, 26 Oct 2017 14:10:58 +0000 (15:10 +0100)]
added enum for the different tree algorithms
kjvdheide [Thu, 26 Oct 2017 13:59:22 +0000 (14:59 +0100)]
Couple more thread names
kjvdheide [Thu, 26 Oct 2017 13:53:04 +0000 (14:53 +0100)]
named most Jalview threads
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
Jim Procter [Thu, 26 Oct 2017 10:50:03 +0000 (11:50 +0100)]
JAL-2684 JAL-2685 release notes
Jim Procter [Thu, 26 Oct 2017 10:40:25 +0000 (11:40 +0100)]
JAL-2685 tidy up html doc
Jim Procter [Thu, 26 Oct 2017 10:14:38 +0000 (11:14 +0100)]
Merge branch 'features/JAL-2685pairwiseSeqLimits' into develop
Jim Procter [Thu, 26 Oct 2017 09:57:13 +0000 (10:57 +0100)]
JAL-2392 test asserts for progressbar creation on the Swing GUI thread.
kjvdheide [Thu, 26 Oct 2017 09:10:23 +0000 (10:10 +0100)]
removed accidental added enters, commented out broken memory test line
kjvdheide [Wed, 25 Oct 2017 18:27:36 +0000 (19:27 +0100)]
finished up tests for trees made from jalview data
kjvdheide [Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
kjvdheide [Wed, 25 Oct 2017 18:15:53 +0000 (19:15 +0100)]
Implemented distance tests
kjvdheide [Wed, 25 Oct 2017 17:30:02 +0000 (18:30 +0100)]
Implemented tree title test for tree made from Jalview
kjvdheide [Wed, 25 Oct 2017 17:26:09 +0000 (18:26 +0100)]
Added tree title test
kjvdheide [Wed, 25 Oct 2017 17:03:14 +0000 (18:03 +0100)]
Removed redundant annotations
Jim Procter [Wed, 25 Oct 2017 16:24:27 +0000 (17:24 +0100)]
JAL-2617 release notes
Jim Procter [Wed, 25 Oct 2017 16:23:03 +0000 (17:23 +0100)]
Merge branch 'bug/JAL-2617mappedStopCodon' into develop
Jim Procter [Wed, 25 Oct 2017 15:45:05 +0000 (16:45 +0100)]
JAL-2636 release notes
Jim Procter [Wed, 25 Oct 2017 15:37:57 +0000 (16:37 +0100)]
JAL-2667 release notes
Jim Procter [Wed, 25 Oct 2017 15:33:01 +0000 (16:33 +0100)]
Merge branch 'bug/JAL-2667mouseWheelWrapped' into develop
Jim Procter [Wed, 25 Oct 2017 15:08:20 +0000 (16:08 +0100)]
JAL-2727 release notes
kjvdheide [Wed, 25 Oct 2017 15:08:16 +0000 (16:08 +0100)]
Added branch name tests
Jim Procter [Wed, 25 Oct 2017 15:06:31 +0000 (16:06 +0100)]
JAL-2727 add not to Test failed message recommending re-running manually as per Mungo’s recommendation in comments
Jim Procter [Wed, 25 Oct 2017 14:53:29 +0000 (15:53 +0100)]
Merge branch 'bug/JAL-2727closeAllFreeMemory' into develop
kjvdheide [Wed, 25 Oct 2017 14:51:38 +0000 (15:51 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
kjvdheide [Wed, 25 Oct 2017 14:50:40 +0000 (15:50 +0100)]
Added abstract class for tree viewer testing, rearranged existing tests
Jim Procter [Wed, 25 Oct 2017 14:38:06 +0000 (15:38 +0100)]
JAL-2732 JAL-1900 JAL-1625 release notes
Jim Procter [Wed, 25 Oct 2017 14:37:16 +0000 (15:37 +0100)]
Merge branch 'bugs/JAL-2779_osx_dialogsequencingbroke' into develop
Jim Procter [Wed, 25 Oct 2017 14:36:42 +0000 (15:36 +0100)]
JAL-2779 remove empty block and if statement
Jim Procter [Wed, 25 Oct 2017 14:25:26 +0000 (15:25 +0100)]
JAL-2790 JAL-2392 release notes
Jim Procter [Wed, 25 Oct 2017 14:17:55 +0000 (15:17 +0100)]
Merge branch 'bug/JAL-2392_deadlockonpdbdisplay' into develop
Jim Procter [Wed, 25 Oct 2017 14:14:17 +0000 (15:14 +0100)]
JAL-2790 provide a cancel button for JABAWS and AACon jobs
Jim Procter [Wed, 25 Oct 2017 13:58:11 +0000 (14:58 +0100)]
JAL-2392 auto boxing rather than explicit Long as key
Jim Procter [Tue, 24 Oct 2017 16:55:12 +0000 (17:55 +0100)]
JAL-2495 release notes
gmungoc [Fri, 28 Apr 2017 14:55:32 +0000 (15:55 +0100)]
JAL-2495 highlight all mapped sequences from structure pick
Jim Procter [Tue, 24 Oct 2017 16:50:01 +0000 (17:50 +0100)]
JAL-2643 JAL-2524 release notes
Jim Procter [Tue, 24 Oct 2017 16:44:27 +0000 (17:44 +0100)]
JAL-2524 release notes
Jim Procter [Tue, 24 Oct 2017 16:42:16 +0000 (17:42 +0100)]
JAL-2733 JAL-2658 release notes
Jim Procter [Tue, 24 Oct 2017 16:33:08 +0000 (17:33 +0100)]
JAL-1980 release notes (retrodoc for 2.10.0)
Jim Procter [Tue, 24 Oct 2017 16:24:52 +0000 (17:24 +0100)]
JAL-2687 JAL-2608 release notes
Jim Procter [Tue, 24 Oct 2017 16:09:42 +0000 (17:09 +0100)]
Merge branch 'features/JAL-2608closeOverview' into develop
Jim Procter [Tue, 24 Oct 2017 15:58:27 +0000 (16:58 +0100)]
JAL-2542 release notes
kjvdheide [Tue, 24 Oct 2017 14:40:48 +0000 (15:40 +0100)]
Tests for Aptx tree created from a Phylogeny object added
gmungoc [Tue, 24 Oct 2017 10:28:56 +0000 (11:28 +0100)]
JAL-2788 corrected merge error in propertyChange
gmungoc [Tue, 24 Oct 2017 08:31:38 +0000 (09:31 +0100)]
JAL-2787 set start/end seq explicitly for test
kjvdheide [Tue, 24 Oct 2017 08:17:45 +0000 (09:17 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
Jim Procter [Mon, 23 Oct 2017 16:17:09 +0000 (17:17 +0100)]
Merge branch 'bug/JAL-2609attemptedmerge' into develop
Jim Procter [Mon, 23 Oct 2017 16:15:51 +0000 (17:15 +0100)]
JAL-2609 remove unused AlignPanel.fastPaint flag and broken conditional preventing repaints on vertical scroll
Jim Procter [Mon, 23 Oct 2017 15:37:29 +0000 (16:37 +0100)]
Merge branch 'bug/JAL-2609attemptedmerge' into develop
Jim Procter [Mon, 23 Oct 2017 15:36:14 +0000 (16:36 +0100)]
JAL-2768 release notes
Jim Procter [Mon, 23 Oct 2017 15:27:46 +0000 (16:27 +0100)]
JAL-2739 release notes
Jim Procter [Mon, 23 Oct 2017 15:20:54 +0000 (16:20 +0100)]
Merge branch 'bug/JAL-2739' into develop
Jim Procter [Mon, 23 Oct 2017 15:09:23 +0000 (16:09 +0100)]
JAL-2682 release notes
Jim Procter [Mon, 23 Oct 2017 14:59:30 +0000 (15:59 +0100)]
Merge branch 'bug/JAL-2682parseId' into develop
gmungoc [Mon, 23 Oct 2017 14:48:11 +0000 (15:48 +0100)]
JAL-2776 repaint everything on toggle group colour
Jim Procter [Mon, 23 Oct 2017 14:33:12 +0000 (15:33 +0100)]
JAL-2253 release notes
Jim Procter [Mon, 23 Oct 2017 14:00:38 +0000 (15:00 +0100)]
Merge branch 'bug/JAL-2253' into develop
JAL-2253 resolve diffrences between patches post-code review and diverging develop
gmungoc [Mon, 23 Oct 2017 10:25:42 +0000 (11:25 +0100)]
JAL-1854 keep fallthrough but with comment to suppress error
gmungoc [Mon, 23 Oct 2017 09:58:44 +0000 (10:58 +0100)]
JAL-1854 remove fallthrough of switch case (Checkstyle error)
gmungoc [Mon, 23 Oct 2017 09:57:54 +0000 (10:57 +0100)]
JAL-2737 JAL-1854 corrected package suppressions, updated import
controls
Jim Procter [Fri, 20 Oct 2017 16:03:19 +0000 (17:03 +0100)]
JAL-2779 keep a reference to original Aqua manager so we can iconise/deiconise windows still
Jim Procter [Fri, 20 Oct 2017 14:48:16 +0000 (15:48 +0100)]
JAL-2779 remove OSX platform specific import (not needed anyway it seems ?)
Jim Procter [Fri, 20 Oct 2017 14:28:47 +0000 (15:28 +0100)]
Merge branch 'patch/JAL-547_pid_groovyscript' into develop
Jim Procter [Fri, 20 Oct 2017 14:28:08 +0000 (15:28 +0100)]
JAL-547 fix NPE when no selection available
Jim Procter [Fri, 20 Oct 2017 14:25:49 +0000 (15:25 +0100)]
JAL-547 only generate matrix for current selection if available. better comments.
Jim Procter [Fri, 20 Oct 2017 14:12:49 +0000 (15:12 +0100)]
JAL-547 PID script in release notes
Jim Procter [Fri, 20 Oct 2017 14:10:56 +0000 (15:10 +0100)]
Merge branch 'patch/JAL-547_pid_groovyscript' into develop
Jim Procter [Fri, 20 Oct 2017 14:09:29 +0000 (15:09 +0100)]
JAL-547 updated the PID script for 2.10.x series score model architecture
gmungoc [Fri, 20 Oct 2017 13:05:40 +0000 (14:05 +0100)]
JAL-2253 pull up constant, additional unit test
gmungoc [Fri, 20 Oct 2017 07:44:17 +0000 (08:44 +0100)]
JAL-2609 fully erase scale above, tidy code change
gmungoc [Thu, 19 Oct 2017 15:45:56 +0000 (16:45 +0100)]
JAL-2609 adjustments for test findings
kiramt [Thu, 19 Oct 2017 13:14:59 +0000 (14:14 +0100)]
Merge branch 'develop' into bug/JAL-2609attemptedmerge
Jim Procter [Wed, 18 Oct 2017 16:17:30 +0000 (17:17 +0100)]
JAL-2779 switch order for updating the current alignment frame reference in response to gain/lost focus events
Jim Procter [Wed, 18 Oct 2017 16:16:01 +0000 (17:16 +0100)]
JAL-2779 remove dead code
Jim Procter [Wed, 18 Oct 2017 16:14:46 +0000 (17:14 +0100)]
JAL-2779 hook in our own AquaInternalFrameManager when on OSX
git://source.jalview.org / jalview.git / log