jalview.git
9 years agoJAL-1626 added missing gap character and fixed typo in example file
Jim Procter [Tue, 8 Sep 2015 15:20:48 +0000 (16:20 +0100)]
JAL-1626 added missing gap character and fixed typo in example file

9 years agomerge
tcofoegbu [Tue, 8 Sep 2015 13:42:04 +0000 (14:42 +0100)]
merge

9 years agoupdated help to include BioJS option in export.html
tcofoegbu [Tue, 8 Sep 2015 13:40:38 +0000 (14:40 +0100)]
updated help to include BioJS option in export.html

9 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Tue, 8 Sep 2015 12:33:54 +0000 (13:33 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

9 years agoJAL-1551 crlf change
Jim Procter [Tue, 8 Sep 2015 12:32:24 +0000 (13:32 +0100)]
JAL-1551 crlf change

9 years agocommited jmol/Jmol2.js diff with origin shows no change, seems to be an issue with...
tcofoegbu [Tue, 8 Sep 2015 11:56:04 +0000 (12:56 +0100)]
commited jmol/Jmol2.js diff with origin shows no change, seems to be an issue with line endings as git gave the following warning: 'CRLF will be replaced by LF'

9 years agoJAL-857 revert show equivalent decoration link
tcofoegbu [Tue, 8 Sep 2015 10:38:42 +0000 (11:38 +0100)]
JAL-857 revert show equivalent decoration link

9 years agomerge
tcofoegbu [Tue, 8 Sep 2015 09:31:38 +0000 (10:31 +0100)]
merge

9 years agoJAL-857 removed 'development' as active link and added links to decorated html equiva...
tcofoegbu [Tue, 8 Sep 2015 09:30:54 +0000 (10:30 +0100)]
JAL-857 removed 'development' as active link and added links to decorated html equivalent pages when the example pages are viewed directly

9 years agoJAL-1859 reverted to signed JalviewApplet.jar!
gmungoc [Tue, 8 Sep 2015 09:12:50 +0000 (10:12 +0100)]
JAL-1859 reverted to signed JalviewApplet.jar!

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Tue, 8 Sep 2015 09:09:08 +0000 (10:09 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agoJAL-1859 Jmol applet black background; fix _jvmols table key
gmungoc [Tue, 8 Sep 2015 09:08:57 +0000 (10:08 +0100)]
JAL-1859 Jmol applet black background; fix _jvmols table key

9 years agomerge
tcofoegbu [Tue, 8 Sep 2015 08:09:07 +0000 (09:09 +0100)]
merge

9 years agodeleted jbake example directory and the old biojs template directory
tcofoegbu [Tue, 8 Sep 2015 08:08:26 +0000 (09:08 +0100)]
deleted jbake example directory and the old biojs template directory

9 years agoJAL-1859 Jmol linked applet updated to use Jmol2.js
gmungoc [Mon, 7 Sep 2015 20:20:48 +0000 (21:20 +0100)]
JAL-1859 Jmol linked applet updated to use Jmol2.js

9 years agoMerge branch 'features/JAL-857_dynamic-example-files' into develop
Jim Procter [Mon, 7 Sep 2015 15:37:39 +0000 (16:37 +0100)]
Merge branch 'features/JAL-857_dynamic-example-files' into develop

9 years agoJAL-1636 translate stop codon as '*', mouseover * as STOP
gmungoc [Mon, 7 Sep 2015 14:34:58 +0000 (15:34 +0100)]
JAL-1636 translate stop codon as '*', mouseover * as STOP

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Mon, 7 Sep 2015 14:33:45 +0000 (15:33 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agomerge
tcofoegbu [Mon, 7 Sep 2015 14:25:57 +0000 (15:25 +0100)]
merge

9 years agoJAL-1831 updated BioJSON schema
tcofoegbu [Mon, 7 Sep 2015 14:25:25 +0000 (15:25 +0100)]
JAL-1831 updated BioJSON schema

9 years agoJAL-1152 check 'autocalculated' not 'null sequenceRef'; sort by sequence
gmungoc [Mon, 7 Sep 2015 13:32:04 +0000 (14:32 +0100)]
JAL-1152 check 'autocalculated' not 'null sequenceRef'; sort by sequence
respects autocalc above/below

9 years agoMerge branch 'features/JAL-857_dynamic-example-files' into develop
Jim Procter [Mon, 7 Sep 2015 13:14:30 +0000 (14:14 +0100)]
Merge branch 'features/JAL-857_dynamic-example-files' into develop
Minor tweaks due to Mungo's cleaning up of the embeddedWJmol example

9 years agoJAL-1522 report commit id and branch in installation type (may move this to separate...
Jim Procter [Mon, 7 Sep 2015 12:08:27 +0000 (13:08 +0100)]
JAL-1522 report commit id and branch in installation type (may move this to separate property in future?)

9 years agoJAL-1522 make installation default 'applet' for the applet
Jim Procter [Mon, 7 Sep 2015 12:06:06 +0000 (13:06 +0100)]
JAL-1522 make installation default 'applet' for the applet

9 years agoJAL-1701 added links to example files. will probably remove them later
Jim Procter [Mon, 7 Sep 2015 10:10:42 +0000 (11:10 +0100)]
JAL-1701 added links to example files. will probably remove them later

9 years agoJAL-1655 transfer setting option only displayed in development version of Jalview
Jim Procter [Sun, 6 Sep 2015 16:43:04 +0000 (17:43 +0100)]
JAL-1655 transfer setting option only displayed in development version of Jalview

9 years agoJAL-1368 JAL-1863 JAL-1304 reformatting and revision of wording, clarify RNA secondar...
Jim Procter [Sun, 6 Sep 2015 16:31:21 +0000 (17:31 +0100)]
JAL-1368 JAL-1863 JAL-1304 reformatting and revision of wording, clarify RNA secondary structure example

9 years agoJAL-1368 JAL-1628 revise documentation in line with code for VIEW_SETREF, VIEW_HIDECO...
Jim Procter [Sun, 6 Sep 2015 16:17:49 +0000 (17:17 +0100)]
JAL-1368 JAL-1628 revise documentation in line with code for VIEW_SETREF, VIEW_HIDECOLS, and VIEW_HIDE_INSERTIONS.

9 years agoJAL-1645 JAL-1355 UI/i18n: added missing messages, moved ‘…’ into action messages...
Jim Procter [Sun, 6 Sep 2015 13:47:57 +0000 (14:47 +0100)]
JAL-1645 JAL-1355 UI/i18n: added missing messages, moved ‘…’ into action messages for actions needing more user input, title caps for menu entries and dialog titles

9 years agoJAL-1871 JAL-1553 don’t modify selection/view colour scheme again after OK is pressed.
Jim Procter [Sat, 5 Sep 2015 17:43:21 +0000 (18:43 +0100)]
JAL-1871 JAL-1553 don’t modify selection/view colour scheme again after OK is pressed.

9 years agoJAL-1871 choose a new RNA Helices palette when annotation colouring is updated
Jim Procter [Sat, 5 Sep 2015 17:40:05 +0000 (18:40 +0100)]
JAL-1871 choose a new RNA Helices palette when annotation colouring is updated

9 years agoJAL-1871 don’t change the palette every time an edit occurs
Jim Procter [Sat, 5 Sep 2015 17:38:57 +0000 (18:38 +0100)]
JAL-1871 don’t change the palette every time an edit occurs

9 years agoJAL-1871 reinstate random generation of palette when applying RNA Helices colouring
Jim Procter [Sat, 5 Sep 2015 17:37:17 +0000 (18:37 +0100)]
JAL-1871 reinstate random generation of palette when applying RNA Helices colouring

9 years agoJAL-1869 make per-sequence RNA helix colours each time Colour By Annotation is opened
Jim Procter [Thu, 9 Jul 2015 16:21:22 +0000 (17:21 +0100)]
JAL-1869 make per-sequence RNA helix colours each time Colour By Annotation is opened

9 years agoMerge branch 'bugfix/JAL-841_JAL-1081' into develop
Jim Procter [Sat, 5 Sep 2015 11:34:23 +0000 (12:34 +0100)]
Merge branch 'bugfix/JAL-841_JAL-1081' into develop

9 years agoJAL-1805 move misassigned test from Functional to Network
Jim Procter [Sat, 5 Sep 2015 11:17:53 +0000 (12:17 +0100)]
JAL-1805 move misassigned test from Functional to Network

9 years agoJAL-1233 tidy up and use same RNA helix colours in colour by annotation and RNA helix...
Jim Procter [Sat, 5 Sep 2015 09:24:36 +0000 (10:24 +0100)]
JAL-1233 tidy up and use same RNA helix colours in colour by annotation and RNA helix colouring

9 years agoJAL-1081 JAL-891 don’t overwrite global colour scheme with base pair consensus
Jim Procter [Sat, 5 Sep 2015 09:21:45 +0000 (10:21 +0100)]
JAL-1081 JAL-891 don’t overwrite global colour scheme with base pair consensus

9 years agoJAL-1081 JAL-841 JAL-1053 JAL-1081 use same selection criteria for secondary structur...
Jim Procter [Sat, 5 Sep 2015 09:13:54 +0000 (10:13 +0100)]
JAL-1081 JAL-841 JAL-1053 JAL-1081 use same selection criteria for secondary structure annotation employed for structure consensus and colour by helices

9 years agoJAL-1847 Merge branch 'thiago' into develop
Jim Procter [Fri, 4 Sep 2015 16:31:52 +0000 (17:31 +0100)]
JAL-1847 Merge branch 'thiago' into develop

9 years agoJAL-1847 added AUTOSUPERIMPOSE property which can be used to disable automatic superp...
Jim Procter [Fri, 4 Sep 2015 16:31:35 +0000 (17:31 +0100)]
JAL-1847 added AUTOSUPERIMPOSE property which can be used to disable automatic superposition when loading multiple structures

9 years agoJAL-793 added ability to visualise raw BioJSON in the exported HTML using facebox
tcofoegbu [Fri, 4 Sep 2015 16:24:16 +0000 (17:24 +0100)]
JAL-793 added ability to visualise raw BioJSON in the exported HTML using facebox

9 years agoJAL-1859 jmolFindTarget not JmolFindTarget
gmungoc [Fri, 4 Sep 2015 15:43:17 +0000 (16:43 +0100)]
JAL-1859 jmolFindTarget not JmolFindTarget

9 years agoJAL-1859 embedded Jmol applet example updated for Jmol 14.2 javascript
gmungoc [Fri, 4 Sep 2015 15:03:38 +0000 (16:03 +0100)]
JAL-1859 embedded Jmol applet example updated for Jmol 14.2 javascript

9 years agoJAL-1863 allow RNA secondary structure rows exported by Jalview to be imported again
Jim Procter [Thu, 3 Sep 2015 21:19:34 +0000 (22:19 +0100)]
JAL-1863 allow RNA secondary structure rows exported by Jalview to be imported again

9 years agoJAL-961 efficiency TODO: decouple overview updates from sequence colour broadcasts
Jim Procter [Thu, 3 Sep 2015 21:00:18 +0000 (22:00 +0100)]
JAL-961 efficiency TODO: decouple overview updates from sequence colour broadcasts

9 years agoJAL-1680 JAL-1576 JAL-1233 all conservation and consensus calculation triggers and...
Jim Procter [Thu, 3 Sep 2015 20:35:49 +0000 (21:35 +0100)]
JAL-1680 JAL-1576 JAL-1233 all conservation and consensus calculation triggers and applying colour schemes to subgroups are refactored to viewport model

9 years agoJAL-1576 fix: trigger broadcast of colour change with paintAlignment(true)
Jim Procter [Thu, 3 Sep 2015 20:30:29 +0000 (21:30 +0100)]
JAL-1576 fix: trigger broadcast of colour change with paintAlignment(true)

9 years agoJAL-961 TODO use workers for calculations supporting colour schemes
Jim Procter [Thu, 3 Sep 2015 20:28:32 +0000 (21:28 +0100)]
JAL-961 TODO use workers for calculations supporting colour schemes

9 years agoJAL-1551 source tidy
Jim Procter [Thu, 3 Sep 2015 20:23:42 +0000 (21:23 +0100)]
JAL-1551 source tidy

9 years agoJAL-1550 JAL-1551 formatting
Jim Procter [Thu, 3 Sep 2015 20:21:08 +0000 (21:21 +0100)]
JAL-1550 JAL-1551 formatting

9 years agoJAL-1233 JAL-1576 copy constructor to propagate helix colours and applyTo implementat...
Jim Procter [Thu, 3 Sep 2015 20:20:13 +0000 (21:20 +0100)]
JAL-1233 JAL-1576 copy constructor to propagate helix colours and applyTo implementation to clone colour scheme to subgroups

9 years agomerge features/JAL-857_dynamic-example-files
tcofoegbu [Thu, 3 Sep 2015 16:07:42 +0000 (17:07 +0100)]
merge

9 years agoJAL-1859 JAL-857 house keeping
tcofoegbu [Thu, 3 Sep 2015 16:04:49 +0000 (17:04 +0100)]
JAL-1859 JAL-857 house keeping

9 years agoJAL-1859 JAL-857 updated all reference of JmolApplet-12.2.4.jar to JmolApplet-14...
tcofoegbu [Thu, 3 Sep 2015 15:24:47 +0000 (16:24 +0100)]
JAL-1859 JAL-857 updated all reference of JmolApplet-12.2.4.jar to JmolApplet-14.2.14_2015.06.11.jar

9 years agohouse keeping
tcofoegbu [Thu, 3 Sep 2015 15:11:24 +0000 (16:11 +0100)]
house keeping

9 years agomerge
tcofoegbu [Thu, 3 Sep 2015 14:01:03 +0000 (15:01 +0100)]
merge

9 years agoJAL-1861 disable the action buttons for 1500 millisec when the ok button is clicked
tcofoegbu [Thu, 3 Sep 2015 14:00:34 +0000 (15:00 +0100)]
JAL-1861 disable the action buttons for 1500 millisec when the ok button is clicked

9 years agoJAL-1859 removed unneeded dependency on package not in Jmol applet lib
gmungoc [Thu, 3 Sep 2015 13:36:50 +0000 (14:36 +0100)]
JAL-1859 removed unneeded dependency on package not in Jmol applet lib

9 years agoanother merge from develop
tcofoegbu [Thu, 3 Sep 2015 11:04:13 +0000 (12:04 +0100)]
another merge from develop

9 years agoupdated examples index page
tcofoegbu [Thu, 3 Sep 2015 10:39:03 +0000 (11:39 +0100)]
updated examples index page

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Thu, 3 Sep 2015 10:37:28 +0000 (11:37 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agoJAL-1690 scaleProteinAsCdna new optional attribute on Viewport in
gmungoc [Thu, 3 Sep 2015 10:37:16 +0000 (11:37 +0100)]
JAL-1690 scaleProteinAsCdna new optional attribute on Viewport in
project file

9 years agomerge
tcofoegbu [Thu, 3 Sep 2015 10:33:47 +0000 (11:33 +0100)]
merge

9 years agoJAL-793 use default custom export settings for html exports
tcofoegbu [Thu, 3 Sep 2015 10:27:46 +0000 (11:27 +0100)]
JAL-793 use default custom export settings for html exports

9 years agoJAL-857 increased callback timeout to accomodated applet load delay
tcofoegbu [Thu, 3 Sep 2015 09:29:54 +0000 (10:29 +0100)]
JAL-857 increased callback timeout to accomodated applet load delay

9 years agoJAL-1828 lookup table to convert MSE to MET when parsing PDB data
gmungoc [Thu, 3 Sep 2015 09:22:15 +0000 (10:22 +0100)]
JAL-1828 lookup table to convert MSE to MET when parsing PDB data

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Thu, 3 Sep 2015 09:21:01 +0000 (10:21 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agomerge from develop
tcofoegbu [Thu, 3 Sep 2015 08:48:07 +0000 (09:48 +0100)]
merge from develop

9 years agoJAL-1835 updated documentation in preferences
tcofoegbu [Wed, 2 Sep 2015 18:55:13 +0000 (19:55 +0100)]
JAL-1835 updated documentation in preferences

9 years agoJAL-1740 migrated BioJSMSAViewer git repo to https://github.com/jalview/exporter...
tcofoegbu [Wed, 2 Sep 2015 16:45:24 +0000 (17:45 +0100)]
JAL-1740 migrated BioJSMSAViewer git repo to https://github.com/jalview/exporter-templates/tree/master/biojs

9 years agomerge
tcofoegbu [Wed, 2 Sep 2015 15:50:52 +0000 (16:50 +0100)]
merge

9 years agoJAL-1805 JAL-1700 house keeping
tcofoegbu [Wed, 2 Sep 2015 15:48:07 +0000 (16:48 +0100)]
JAL-1805 JAL-1700  house keeping

9 years agoJAL-1739 reverted BioJSON schema to use one main version for the whole schema and...
tcofoegbu [Wed, 2 Sep 2015 15:44:25 +0000 (16:44 +0100)]
JAL-1739 reverted BioJSON schema to use one main version for the whole schema and remove every other versioning for different fragments of the schema

9 years agoJAL-1544 spelling
gmungoc [Wed, 2 Sep 2015 15:34:56 +0000 (16:34 +0100)]
JAL-1544 spelling

9 years agoJAL-1355 User error text externalised to message bundle
gmungoc [Wed, 2 Sep 2015 15:34:24 +0000 (16:34 +0100)]
JAL-1355 User error text externalised to message bundle

9 years agoJAL-1768 set initial 'enabled' state for id width label as well
gmungoc [Wed, 2 Sep 2015 15:31:43 +0000 (16:31 +0100)]
JAL-1768 set initial 'enabled' state for id width label as well

9 years agoJAL-1264 test made i18n robust
gmungoc [Wed, 2 Sep 2015 15:27:56 +0000 (16:27 +0100)]
JAL-1264 test made i18n robust

9 years agoJAL-1768 enable fixed width output when auto-width _not_ enabled
gmungoc [Wed, 2 Sep 2015 15:21:55 +0000 (16:21 +0100)]
JAL-1768 enable fixed width output when auto-width _not_ enabled

9 years agoJAL-1843 fixed input/add from textbox; added @Override to Desktop
gmungoc [Wed, 2 Sep 2015 14:55:17 +0000 (15:55 +0100)]
JAL-1843 fixed input/add from textbox; added @Override to Desktop

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Wed, 2 Sep 2015 12:40:32 +0000 (13:40 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agomerge
tcofoegbu [Wed, 2 Sep 2015 12:15:52 +0000 (13:15 +0100)]
merge

9 years agoJAL-1805 JAL-1782 added a draft documentation for TestNG to jalview doc directory
tcofoegbu [Wed, 2 Sep 2015 12:14:00 +0000 (13:14 +0100)]
JAL-1805 JAL-1782 added a draft documentation for TestNG to jalview doc directory

9 years agoJAL-1853 add test to list for ant task
Jim Procter [Wed, 2 Sep 2015 11:40:14 +0000 (12:40 +0100)]
JAL-1853 add test to list for ant task

9 years agoJAL-1619 additions, standardised menu item symbols
gmungoc [Wed, 2 Sep 2015 11:10:01 +0000 (12:10 +0100)]
JAL-1619 additions, standardised menu item symbols

9 years agoJAL-1681 mention of cDNA consensus added
gmungoc [Wed, 2 Sep 2015 11:08:47 +0000 (12:08 +0100)]
JAL-1681 mention of cDNA consensus added

9 years agoJAL-535 todo: refactor logic to desktop controller class
Jim Procter [Wed, 2 Sep 2015 10:59:53 +0000 (11:59 +0100)]
JAL-535 todo: refactor logic to desktop controller class

9 years agoJAL-1772 non-functional test added. not doing any more work for 2.9 release
Jim Procter [Wed, 2 Sep 2015 10:58:05 +0000 (11:58 +0100)]
JAL-1772 non-functional test added. not doing any more work for 2.9 release

9 years agoJAL-1673 new test to verify transferRESNUMFeatures()
gmungoc [Wed, 2 Sep 2015 10:11:32 +0000 (11:11 +0100)]
JAL-1673 new test to verify transferRESNUMFeatures()

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Wed, 2 Sep 2015 08:27:10 +0000 (09:27 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

9 years agoMerge branch 'bug/JAL-1853_gapchar_output' into develop
Jim Procter [Tue, 1 Sep 2015 16:40:17 +0000 (17:40 +0100)]
Merge branch 'bug/JAL-1853_gapchar_output' into develop

9 years agoJAL-1853 add test to Functional group
Jim Procter [Tue, 1 Sep 2015 16:39:15 +0000 (17:39 +0100)]
JAL-1853 add test to Functional group

9 years agoJAL-1853 make getVisibleSeqs more memory efficient by clipping sequences as the seque...
Jim Procter [Tue, 1 Sep 2015 16:20:13 +0000 (17:20 +0100)]
JAL-1853 make getVisibleSeqs more memory efficient by clipping sequences as the sequence vector is populated

9 years agoJAL-1853 refactor clip routine from getSequenceStrings
Jim Procter [Tue, 1 Sep 2015 16:19:38 +0000 (17:19 +0100)]
JAL-1853 refactor clip routine from getSequenceStrings

9 years agopatch for JAL-1853 - use given gap character to reconstruct alignment
Jim Procter [Tue, 1 Sep 2015 16:15:21 +0000 (17:15 +0100)]
patch for JAL-1853 - use given gap character to reconstruct alignment

9 years agoJAL-1853 test origin of gapChar bug in AlignView method
Jim Procter [Tue, 1 Sep 2015 16:10:01 +0000 (17:10 +0100)]
JAL-1853 test origin of gapChar bug in AlignView method

9 years agoJAL-1693 split frame opened for get xrefs, translate as cDNA
gmungoc [Tue, 1 Sep 2015 15:39:16 +0000 (16:39 +0100)]
JAL-1693 split frame opened for get xrefs, translate as cDNA

9 years agoJAL-1853 test demonstrating bug
Jim Procter [Tue, 1 Sep 2015 15:36:09 +0000 (16:36 +0100)]
JAL-1853 test demonstrating bug

9 years agoJAL-1672 additional assertions added
gmungoc [Tue, 1 Sep 2015 12:47:37 +0000 (13:47 +0100)]
JAL-1672 additional assertions added

9 years agoJAL-1355 user error message text externalised
gmungoc [Tue, 1 Sep 2015 12:47:05 +0000 (13:47 +0100)]
JAL-1355 user error message text externalised