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 [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: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 [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:20:45 +0000 (15:20 +0100)]
JAL-1520 fix unicode translation errors.
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: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
Jim Procter [Tue, 3 Jun 2014 13:25:23 +0000 (14:25 +0100)]
JAL-690 add .jvp as default jalview project filetype
Jim Procter [Tue, 3 Jun 2014 13:24:43 +0000 (14:24 +0100)]
JAL-1503 formatting
JAL-690 add .jvp as default javaws filetype for jalview projects
Jim Procter [Tue, 3 Jun 2014 13:23:39 +0000 (14:23 +0100)]
JAL-1503 formatting build file
Jim Procter [Tue, 3 Jun 2014 09:22:01 +0000 (10:22 +0100)]
JAL-1512 comment out for 2.8.1 release
Jim Procter [Tue, 3 Jun 2014 09:20:24 +0000 (10:20 +0100)]
JAL-1512 fix calculation once again and include score matrix documentation in comments in Jalview help
Jim Procter [Tue, 3 Jun 2014 09:14:52 +0000 (10:14 +0100)]
JAL-1473 make it easier to generate HTML documentation for similarity matrices
Jim Procter [Mon, 2 Jun 2014 15:45:40 +0000 (16:45 +0100)]
JAL-1512 rejig buggy conservation-basesd score matrix calculation
Jim Procter [Wed, 28 May 2014 14:20:01 +0000 (15:20 +0100)]
Merge branch 'docs/2_8_1_release' into Release_2_8_1_Branch
Jim Procter [Wed, 28 May 2014 14:16:48 +0000 (15:16 +0100)]
JAL-1509 use local deployJava
JAL-816 reinstate hashtable include to fix regression introduced in 2.8.0b1
Jim Procter [Wed, 28 May 2014 14:15:21 +0000 (15:15 +0100)]
fix for JAL-1510 - workaround for IE9
Jim Procter [Wed, 28 May 2014 08:03:44 +0000 (09:03 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Wed, 28 May 2014 08:02:38 +0000 (09:02 +0100)]
JAL-1507 bugfix
Jim Procter [Tue, 27 May 2014 15:07:39 +0000 (16:07 +0100)]
Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch
Jim Procter [Tue, 27 May 2014 15:06:54 +0000 (16:06 +0100)]
JAL-1509 update deployJava.js from java.com/js/deployJava.js
Jim Procter [Tue, 27 May 2014 15:03:20 +0000 (16:03 +0100)]
JAL-1507 added loop to throw dummy javascript calls out to the browser to make sure it wakes up and prompts user to allow LiveConnect
Jim Procter [Tue, 27 May 2014 15:02:12 +0000 (16:02 +0100)]
JAL-1402 conditional logic to ensure annotation & label panel/canvas components not touched in validation/layout/paint routines unless layout requires them
Jim Procter [Tue, 27 May 2014 14:59:45 +0000 (15:59 +0100)]
JAL-1508 make default font size 11pt for embedded menus. workaround - not a fix
Jim Procter [Fri, 23 May 2014 11:10:57 +0000 (12:10 +0100)]
JAL-1445 updated documentation and added link in whatsNew
Jim Procter [Fri, 23 May 2014 10:57:27 +0000 (11:57 +0100)]
JAL-1445 extend functionality to select or toggle selection for columns containing/not containing features in alignment or currently selected region
Jim Procter [Thu, 22 May 2014 14:08:19 +0000 (15:08 +0100)]
remove non-utf8 characters in help pages
Jim Procter [Thu, 22 May 2014 14:06:39 +0000 (15:06 +0100)]
JAL-1503 update version in GPL header
Jim Procter [Thu, 22 May 2014 13:34:06 +0000 (14:34 +0100)]
JAL-1355 JAL-1503 update i18n note
Jim Procter [Thu, 22 May 2014 13:33:12 +0000 (14:33 +0100)]
JAL-1503 new entry for 2.8.1 release history
Jim Procter [Thu, 22 May 2014 13:31:48 +0000 (14:31 +0100)]
JAL-1503 JAL-1355 note about internationalisation in release notes
Jim Procter [Sat, 17 May 2014 11:55:19 +0000 (12:55 +0100)]
JAL-1477 documentation and tooltips
Jim Procter [Tue, 13 May 2014 14:16:16 +0000 (15:16 +0100)]
Merge branch 'bugfix/JAL-1239' into Release_2_8_1_Branch_i18n
Jim Procter [Tue, 13 May 2014 14:15:35 +0000 (15:15 +0100)]
Merge branch 'bugfix/JAL-1239' into develop
Jim Procter [Tue, 13 May 2014 14:15:24 +0000 (15:15 +0100)]
Merge branch 'bugfix/JAL-1239' into Release_2_8_1_Branch
Jim Procter [Tue, 13 May 2014 14:13:17 +0000 (15:13 +0100)]
JAL-1239 cancelled flag should be checked and counted
Jim Procter [Tue, 13 May 2014 14:12:30 +0000 (15:12 +0100)]
JAL-1239 make doubly sure sub job status is set to complete/cancelled
Jim Procter [Mon, 12 May 2014 15:07:08 +0000 (16:07 +0100)]
Merge branch 'JAL-1397' into Release_2_8_1_Branch_i18n
Jim Procter [Mon, 12 May 2014 15:06:11 +0000 (16:06 +0100)]
Merge branch 'JAL-1397' into develop
Jim Procter [Mon, 12 May 2014 15:05:53 +0000 (16:05 +0100)]
Merge branch 'JAL-1397' into Release_2_8_1_Branch
Jim Procter [Mon, 12 May 2014 14:05:11 +0000 (15:05 +0100)]
JAL-1397 catch other random version strings
Jim Procter [Mon, 12 May 2014 14:04:54 +0000 (15:04 +0100)]
patch for regression introduced JAL-1397
git://source.jalview.org / jalview.git / log