j.procter@dundee.ac.uk [Tue, 22 Jul 2014 20:09:45 +0000 (21:09 +0100)]
Merge branch 'features/JAL-1333' into develop
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 20:09:10 +0000 (21:09 +0100)]
JAL-1333 fix imports
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:32:59 +0000 (20:32 +0100)]
Merge branch 'features/JAL-1333' into develop
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:32:14 +0000 (20:32 +0100)]
JAL-1333 log4j/slf additional jars
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:25:09 +0000 (20:25 +0100)]
JAL-1333 add log4j-slf4j bridge
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:21:49 +0000 (20:21 +0100)]
Merge branch 'features/JAL-1333' into develop
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:21:12 +0000 (20:21 +0100)]
JAL-1333 finessing log4j and slf dependencies for strucviz and jaba-client code
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:15:23 +0000 (20:15 +0100)]
Merge branch 'features/JAL-1333' into develop
jpred + ucsf chimera bits
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 19:12:48 +0000 (20:12 +0100)]
JAL-1333 JAL-1533 todo to get Chimera superposing properly we need to specify a set of atoms from each chain (or model in chimera-speak), but for chains with multiple models, each model needs to be superposed independently (potentially)
j.procter@dundee.ac.uk [Tue, 22 Jul 2014 18:37:34 +0000 (19:37 +0100)]
JAL-1333 more superposition debugging and deadlock avoidance
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:59:26 +0000 (13:59 +0100)]
JAL-1379 Jpred JABA client test harness
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:35:32 +0000 (13:35 +0100)]
JAL-1333 allow reuse of existing chimera for new or additional structures
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:35:06 +0000 (13:35 +0100)]
JAL-1333 more refinements - deadlocks still possible with this version
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:33:42 +0000 (13:33 +0100)]
JAL-674 futzing with bugs
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:32:23 +0000 (13:32 +0100)]
JAL-795 take colour from annotation if colour is present
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:31:32 +0000 (13:31 +0100)]
ensure the dataset is instantiated before materialising alignment viewport
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 12:30:29 +0000 (13:30 +0100)]
JAL-1379 new look JPred results
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 11:08:09 +0000 (12:08 +0100)]
JAL-1520 switch between Protein and non-canonical RNA secondary structure rendering styles for an annotation row
j.procter@dundee.ac.uk [Fri, 18 Jul 2014 11:00:44 +0000 (12:00 +0100)]
JAL-1028 JAL-1142 refactor test to allow reuse of secondary structure validation routine
j.procter@dundee.ac.uk [Tue, 8 Jul 2014 19:16:49 +0000 (15:16 -0400)]
JAL-1333 allow reuse of existing viewers (of a specified or currently preferred type)
j.procter@dundee.ac.uk [Tue, 8 Jul 2014 19:15:11 +0000 (15:15 -0400)]
JAL-1333 more efficient color statement
j.procter@dundee.ac.uk [Fri, 4 Jul 2014 03:09:00 +0000 (20:09 -0700)]
JAL-1333 more abstraction and refactoring and working demo of Jalview talking to Chimera
j.procter@dundee.ac.uk [Thu, 3 Jul 2014 19:53:56 +0000 (12:53 -0700)]
Merge branch 'Release_2_8_2_Branch' into features/JAL-1333
j.procter@dundee.ac.uk [Thu, 3 Jul 2014 18:27:55 +0000 (11:27 -0700)]
Merge branch 'hotfix/JAL-1530' into develop
Conflicts:
src/jalview/gui/PopupMenu.java
j.procter@dundee.ac.uk [Thu, 3 Jul 2014 18:27:00 +0000 (11:27 -0700)]
Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch
Conflicts:
src/jalview/gui/PopupMenu.java
Jim Procter [Thu, 3 Jul 2014 18:23:48 +0000 (11:23 -0700)]
fixes JAL-1530
Jim Procter [Wed, 2 Jul 2014 22:51:00 +0000 (15:51 -0700)]
revalidate appears to have gone away ?? (java 1.7 upgrade perhaps ?)
Jim Procter [Wed, 2 Jul 2014 22:50:27 +0000 (15:50 -0700)]
formatting
Jim Procter [Wed, 2 Jul 2014 22:49:47 +0000 (15:49 -0700)]
JAL-1333 JAL-1527 refactors to create core structure viewer binding architecture and StructureViewer factory for creating structure views with the currently preferred viewer
Jim Procter [Wed, 2 Jul 2014 22:35:09 +0000 (15:35 -0700)]
JAL-1333 test suite for key functionality of java interface to chimera
Jim Procter [Wed, 2 Jul 2014 22:31:47 +0000 (15:31 -0700)]
JAL-1333 Chimera specific code extracted from the StructureViz library for opening and querying structure data managed by chimera
Jim Procter [Tue, 1 Jul 2014 22:28:04 +0000 (15:28 -0700)]
Merge branch 'feature/JAL-1333' into features/JAL-1333
Conflicts:
.classpath
Jim Procter [Mon, 23 Jun 2014 15:21:42 +0000 (16:21 +0100)]
Merge branch 'JAL-1526' into Release_2_8_2_Branch
Jim Procter [Mon, 23 Jun 2014 15:21:02 +0000 (16:21 +0100)]
JAL-1526 simple function to write a snapshot of the desktop.
Jim Procter [Thu, 12 Jun 2014 10:41:34 +0000 (11:41 +0100)]
Merge branch 'hotfix/JAL-1524' into develop
Jim Procter [Thu, 12 Jun 2014 10:41:20 +0000 (11:41 +0100)]
Merge branch 'hotfix/JAL-1524' into Release_2_8_2_Branch
Jim Procter [Thu, 12 Jun 2014 10:41:02 +0000 (11:41 +0100)]
Merge branch 'hotfix/JAL-1524' into Release_2_8_1_Branch
Jim Procter [Thu, 12 Jun 2014 10:40:15 +0000 (11:40 +0100)]
JAL-1524 fix
Jim Procter [Thu, 12 Jun 2014 08:10:38 +0000 (09:10 +0100)]
Merge branch 'feature/JAL-1379' into develop
Jim Procter [Tue, 10 Jun 2014 17:01:22 +0000 (18:01 +0100)]
Merge branch 'feature/JAL-1379' into Release_2_8_2_Branch
Jim Procter [Tue, 10 Jun 2014 16:26:30 +0000 (17:26 +0100)]
JAL-1379 a JPred v3.0.1 client via JABA 2.1
Jim Procter [Tue, 10 Jun 2014 16:24:41 +0000 (17:24 +0100)]
JAL-1379 allow services with an MSA interface to create an interactive service gui rather than a turnkey service gui
Jim Procter [Tue, 10 Jun 2014 16:21:56 +0000 (17:21 +0100)]
tidy source
Jim Procter [Tue, 10 Jun 2014 16:21:31 +0000 (17:21 +0100)]
JAL-1379 allow JABA2 tests to run on local or default service
Jim Procter [Tue, 10 Jun 2014 16:20:49 +0000 (17:20 +0100)]
JAL-1379 refactor Jws2 service client so dynamic services can be of any type of JABA client interface
Jim Procter [Fri, 6 Jun 2014 14:21:00 +0000 (15:21 +0100)]
Merge branch 'Release_2_8_2_Branch' into develop
Jim Procter [Fri, 6 Jun 2014 14:20:45 +0000 (15:20 +0100)]
JAL-1520 fix unicode translation errors.
Jim Procter [Fri, 6 Jun 2014 14:13:31 +0000 (15:13 +0100)]
Merge branch 'Release_2_8_2_Branch' into develop
Jim Procter [Fri, 6 Jun 2014 14:13:20 +0000 (15:13 +0100)]
JAL-1520 fix unicode translation errors.
Jim Procter [Fri, 6 Jun 2014 10:51:54 +0000 (11:51 +0100)]
Merge branch 'Release_2_8_2_Branch' into develop
Jim Procter [Fri, 6 Jun 2014 10:50:49 +0000 (11:50 +0100)]
JAL-1519 make the splash screen larger/more readable
Jim Procter [Fri, 6 Jun 2014 10:50:22 +0000 (11:50 +0100)]
JAL-1519 - tidy build properties management code
Jim Procter [Fri, 6 Jun 2014 10:49:38 +0000 (11:49 +0100)]
JAL-1519 fix author update issue (doh)
Jim Procter [Fri, 6 Jun 2014 09:27:30 +0000 (10:27 +0100)]
JAL-1140 Add Anne Menard to author list
Jim Procter [Fri, 6 Jun 2014 09:20:50 +0000 (10:20 +0100)]
JAL-1517 copyright and formatting
Jim Procter [Fri, 6 Jun 2014 09:20:27 +0000 (10:20 +0100)]
JAL-1518 drop Jalopy from utils directory
Jim Procter [Fri, 6 Jun 2014 09:19:11 +0000 (10:19 +0100)]
JAL-1517 copyright and formatting
Jim Procter [Fri, 6 Jun 2014 09:04:38 +0000 (10:04 +0100)]
JAL-1517 source formatting
Jim Procter [Fri, 6 Jun 2014 08:58:57 +0000 (09:58 +0100)]
JAL-1518 drop Jalopy from utils directory
Jim Procter [Fri, 6 Jun 2014 08:52:38 +0000 (09:52 +0100)]
JAL-1517 fix copyright for 2.8.2
Jim Procter [Thu, 5 Jun 2014 18:59:25 +0000 (19:59 +0100)]
JAL-1517 update copyright to version 2.8.2
Jim Procter [Thu, 5 Jun 2014 10:46:39 +0000 (11:46 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch
JAL-1517 JAL-1503 merge 2.8.1 source code updates to 2_8_2 branch
Conflicts:
RELEASE
build.xml
src/jalview/ext/varna/VarnaCommands.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/StockholmFile.java
Jim Procter [Wed, 4 Jun 2014 16:19:30 +0000 (17:19 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 16:19:00 +0000 (17:19 +0100)]
JAL-1503 typo
Jim Procter [Wed, 4 Jun 2014 16:17:13 +0000 (17:17 +0100)]
Merge branch 'develop' into Release_2_8_2_Branch
Jim Procter [Wed, 4 Jun 2014 15:45:15 +0000 (16:45 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 15:43:47 +0000 (16:43 +0100)]
JAL-1503 update author list for 2.8.1
Jim Procter [Wed, 4 Jun 2014 14:47:34 +0000 (15:47 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 14:47:03 +0000 (15:47 +0100)]
JAL-690 JAL-1503 make file associations optional for JNLP
Jim Procter [Wed, 4 Jun 2014 14:22:07 +0000 (15:22 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
Jim Procter [Wed, 4 Jun 2014 12:30:26 +0000 (13:30 +0100)]
JAL-952 fixed unresolved conflict breaking build
Jim Procter [Wed, 4 Jun 2014 13:40:16 +0000 (14:40 +0100)]
Jalview 2.8.2 release branch
Jim Procter [Wed, 4 Jun 2014 12:30:26 +0000 (13:30 +0100)]
JAL-952 fixed unresolved conflict breaking build
Jim Procter [Wed, 4 Jun 2014 12:19:02 +0000 (13:19 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 12:18:18 +0000 (13:18 +0100)]
JAL-1503 tweak whatsNew document
Jim Procter [Wed, 4 Jun 2014 11:51:50 +0000 (12:51 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 11:51:07 +0000 (12:51 +0100)]
JAL-1503 JAL-690 document .jvp in release notes
Jim Procter [Wed, 4 Jun 2014 10:41:53 +0000 (11:41 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 10:25:57 +0000 (11:25 +0100)]
JAL-1514 - add jalview.org and dundee to explore if liveConnect permissions check is buggy in Java 8
Jim Procter [Wed, 4 Jun 2014 08:36:56 +0000 (09:36 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 4 Jun 2014 08:36:30 +0000 (09:36 +0100)]
JAL-1503 tidying docs
Jim Procter [Wed, 4 Jun 2014 08:35:54 +0000 (09:35 +0100)]
JAL-1355 key typo
Jim Procter [Tue, 3 Jun 2014 16:49:50 +0000 (17:49 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Tue, 3 Jun 2014 16:49:28 +0000 (17:49 +0100)]
JAL-1503 documentation and release notes
Jim Procter [Tue, 3 Jun 2014 15:25:53 +0000 (16:25 +0100)]
JAL-690 jvp rather than jar for save/restore state file browser
Jim Procter [Tue, 3 Jun 2014 15:25:24 +0000 (16:25 +0100)]
JAL-690 JAL-1503 update file types/extensions in Jalview file browser
Jim Procter [Tue, 3 Jun 2014 14:36:35 +0000 (15:36 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Tue, 3 Jun 2014 14:36:16 +0000 (15:36 +0100)]
JAL-1503 update version/branch version for this branch
Jim Procter [Tue, 3 Jun 2014 14:35:50 +0000 (15:35 +0100)]
regress fix on JAL-690 - insert association elements with replace task
Jim Procter [Tue, 3 Jun 2014 13:35:51 +0000 (14:35 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
JAL-1503 JAL-690 test merge release and documentation and check .jvp extension association in javaws
Jim Procter [Tue, 3 Jun 2014 13:35:20 +0000 (14:35 +0100)]
JAL-1503 whats new and release history for 2.8.1 (still not complete)
Jim Procter [Tue, 3 Jun 2014 13:34:22 +0000 (14:34 +0100)]
JAL-1503 JAL-1350 rework documentation for 2.8.1
Jim Procter [Tue, 3 Jun 2014 13:33:30 +0000 (14:33 +0100)]
JAL-1164 note that feature introduced in 2.8.0b1
Jim Procter [Tue, 3 Jun 2014 13:30:21 +0000 (14:30 +0100)]
JAL-1503 JAL-1355 documentation
Jim Procter [Tue, 3 Jun 2014 13:29:45 +0000 (14:29 +0100)]
JAL-1473 exclude score models not compatible with PCA algorithm
Jim Procter [Tue, 3 Jun 2014 13:28:44 +0000 (14:28 +0100)]
JAL-1503 gui changes (score models, flanking regions, trim retrieved sequences)
Jim Procter [Tue, 3 Jun 2014 13:27:38 +0000 (14:27 +0100)]
JAL-1503 formatting
Jim Procter [Tue, 3 Jun 2014 13:27:21 +0000 (14:27 +0100)]
JAL-1503 additional tree score functions
Jim Procter [Tue, 3 Jun 2014 13:26:59 +0000 (14:26 +0100)]
JAL-1503 PAM250 documentation
Jim Procter [Tue, 3 Jun 2014 13:26:22 +0000 (14:26 +0100)]
JAL-1503 document updated PCA interface
git://source.jalview.org / jalview.git / log