Jim Procter [Tue, 25 Oct 2016 10:25:15 +0000 (11:25 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_Branch
Jim Procter [Tue, 25 Oct 2016 10:24:04 +0000 (11:24 +0100)]
JAL-2089 update What's new for 2.10.0b1
Jim Procter [Tue, 25 Oct 2016 08:31:00 +0000 (09:31 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_Branch
Jim Procter [Tue, 25 Oct 2016 08:30:06 +0000 (09:30 +0100)]
JAL-1683 reinstate replacetoken patterns so source replacement happens!
Jim Procter [Mon, 24 Oct 2016 21:24:49 +0000 (22:24 +0100)]
Merge branch 'sourcepub' into releases/Release_2_10_Branch
Jim Procter [Mon, 24 Oct 2016 21:20:48 +0000 (22:20 +0100)]
JAL-1683 replace version and year in licence header when generating source tarsal
Jim Procter [Mon, 24 Oct 2016 15:11:45 +0000 (16:11 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Mon, 24 Oct 2016 15:11:39 +0000 (16:11 +0100)]
Merge branch 'develop' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 15:11:02 +0000 (16:11 +0100)]
JAL-2089 bump version and release branch info
Jim Procter [Mon, 24 Oct 2016 14:46:43 +0000 (15:46 +0100)]
Merge branch 'develop' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 14:46:32 +0000 (15:46 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Mon, 24 Oct 2016 14:46:14 +0000 (15:46 +0100)]
JAL-2089 release notes for JAL-2234
Jim Procter [Mon, 24 Oct 2016 14:43:56 +0000 (15:43 +0100)]
Merge branch 'patch/JAL-2234_renameFER1_ARATH' into develop
Jim Procter [Mon, 24 Oct 2016 14:43:05 +0000 (15:43 +0100)]
JAL-2234 reordered seqs (after sequence data was reordered) so files match the example project files
Jim Procter [Mon, 24 Oct 2016 14:42:12 +0000 (15:42 +0100)]
JAL-2234 rename seqs for linked jalview examples
Jim Procter [Mon, 24 Oct 2016 14:24:54 +0000 (15:24 +0100)]
Merge branch 'develop' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 14:24:45 +0000 (15:24 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Mon, 24 Oct 2016 14:23:12 +0000 (15:23 +0100)]
JAL-2089 tweak release note for JAL-2283
Jim Procter [Mon, 24 Oct 2016 14:20:07 +0000 (15:20 +0100)]
JAL-2089 documented additional JAL-2272 CMD-click issue and reformatted 2.10.0b1 release notes a little
Jim Procter [Mon, 24 Oct 2016 14:16:38 +0000 (15:16 +0100)]
Merge branch 'bug/JAL-2272cmdClickGroupEdit' into develop
Jim Procter [Mon, 24 Oct 2016 13:52:35 +0000 (14:52 +0100)]
Merge branch 'bug/JAL-2283consColourEnabled' into develop
gmungoc [Mon, 24 Oct 2016 13:50:53 +0000 (14:50 +0100)]
JAL-2272 Cmd-drag to group edit sequences on Mac (Ctrl-click for popup
menu)
gmungoc [Mon, 24 Oct 2016 13:32:23 +0000 (14:32 +0100)]
JAL-2283 corrected preferences settings for test
Jim Procter [Mon, 24 Oct 2016 13:13:04 +0000 (14:13 +0100)]
Merge branch 'develop' into releases/Release_2_10_0_Branch
Jim Procter [Mon, 24 Oct 2016 13:12:53 +0000 (14:12 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Mon, 24 Oct 2016 12:50:52 +0000 (13:50 +0100)]
JAL-2089 JAL-2195 release notes
Jim Procter [Mon, 24 Oct 2016 12:50:39 +0000 (13:50 +0100)]
JAL-2089 JAL-2283 release notes
Jim Procter [Mon, 24 Oct 2016 12:34:54 +0000 (13:34 +0100)]
Merge branch 'bug/JAL-2283consColourEnabled' into develop
Jim Procter [Mon, 24 Oct 2016 11:40:45 +0000 (12:40 +0100)]
JAL-2044 documentation
gmungoc [Mon, 24 Oct 2016 09:18:53 +0000 (10:18 +0100)]
JAL-2283 set 'by conservation' correctly when changing colour schem
Jim Procter [Thu, 20 Oct 2016 11:21:33 +0000 (12:21 +0100)]
Merge branch 'releases/Release_2_10_Branch' into releases/Release_2_10_0_Branch
Jim Procter [Thu, 20 Oct 2016 11:21:08 +0000 (12:21 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Thu, 20 Oct 2016 11:20:01 +0000 (12:20 +0100)]
JAL-2089 update release date for 2.10.0b1 to Tuesday 25th Oct and fix duplicate anchor name
Jim Procter [Thu, 20 Oct 2016 11:17:15 +0000 (12:17 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 19 Oct 2016 16:11:16 +0000 (17:11 +0100)]
JAL-2269 JAL-2195 review and revised test
* cut down DNMT1_MOUSE.pdb file to a stub and renamed to examples/testdata/localstruct.pdb
* added comments explaining test behaviour
* remove try/catch - exceptions should cause test to fail.
Jim Procter [Wed, 19 Oct 2016 15:52:33 +0000 (16:52 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 19 Oct 2016 15:26:51 +0000 (16:26 +0100)]
JAL-2089 update 2.10.0b1 release date
Jim Procter [Tue, 18 Oct 2016 16:42:37 +0000 (17:42 +0100)]
JAL-2089 release notes and new known defects
Jim Procter [Tue, 18 Oct 2016 14:22:19 +0000 (15:22 +0100)]
JAL-2039 release notes
Jim Procter [Tue, 18 Oct 2016 14:21:37 +0000 (15:21 +0100)]
JAL-2245 release notes
Jim Procter [Tue, 18 Oct 2016 14:20:48 +0000 (15:20 +0100)]
JAL-2089 2.10.0b1 release notes
Jim Procter [Tue, 18 Oct 2016 14:20:06 +0000 (15:20 +0100)]
JAL-2039 rejig instructions for Structure Chooser and clarify what happens after ‘View’ is pressed
kiramt [Mon, 17 Oct 2016 13:38:15 +0000 (14:38 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop
kiramt [Mon, 17 Oct 2016 13:36:16 +0000 (14:36 +0100)]
acceptDrop call added before getTransferable in alignment frame drag and
drop.
tcofoegbu [Mon, 17 Oct 2016 11:32:38 +0000 (12:32 +0100)]
JAL-2262 JAL-2195 Improvement to set PDBId availability in a flag
kiramt [Mon, 17 Oct 2016 08:24:58 +0000 (09:24 +0100)]
Re-attempt to fix JAL-1552 by removing extra calls to acceptDrop.
gmungoc [Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)]
Merge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties
gmungoc [Thu, 13 Oct 2016 15:43:52 +0000 (16:43 +0100)]
JAL-2253 2 second timeout on ping URL, default 5 minutes on others
Jim Procter [Thu, 13 Oct 2016 14:02:51 +0000 (15:02 +0100)]
JAL-2234 switch FER1_ARATH and FER2_ARATH in ferredoxin tree
gmungoc [Thu, 13 Oct 2016 10:13:37 +0000 (11:13 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Thu, 13 Oct 2016 09:58:06 +0000 (10:58 +0100)]
JAL-1479 revise warning message to suit all contexts
gmungoc [Thu, 13 Oct 2016 09:56:37 +0000 (10:56 +0100)]
JAL-2044 increase Jmol file load timeout from 5 to 20 seconds
gmungoc [Thu, 13 Oct 2016 09:55:42 +0000 (10:55 +0100)]
JAL-2044 ensure AAStructureBindingModel.pdbEntry has no file duplicated;
pull up modelFileNames
gmungoc [Thu, 13 Oct 2016 09:50:27 +0000 (10:50 +0100)]
JAL-2044 include model name in progress bar message opening file
Jim Procter [Wed, 12 Oct 2016 12:55:58 +0000 (13:55 +0100)]
JAL-2234 switched FER1_ARATH and FER2_ARATH in example projects
tcofoegbu [Tue, 11 Oct 2016 12:03:24 +0000 (13:03 +0100)]
Merge branch 'features/JAL-2039_Offer_cached_structurefiles_immediately' into develop
tcofoegbu [Tue, 11 Oct 2016 12:01:39 +0000 (13:01 +0100)]
JAL-2039 improvement to offer cached structure view immediately when cached structures exists
gmungoc [Tue, 11 Oct 2016 11:10:18 +0000 (12:10 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Tue, 11 Oct 2016 11:09:37 +0000 (12:09 +0100)]
JAL-2241 check for null jprovider when processing New View action
kiramt [Tue, 11 Oct 2016 11:01:23 +0000 (12:01 +0100)]
JAL-1552 added acceptDrop call before getTransferable to avoid error
with Java native dnd
gmungoc [Tue, 11 Oct 2016 08:37:28 +0000 (09:37 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Tue, 11 Oct 2016 08:33:13 +0000 (09:33 +0100)]
JAL-1479 small tidy of error message when Sifts mapping fails
gmungoc [Tue, 11 Oct 2016 08:27:33 +0000 (09:27 +0100)]
JAL-2233 reverted changes to Jmol logging levels
tcofoegbu [Mon, 10 Oct 2016 15:15:49 +0000 (16:15 +0100)]
Merge branch 'bug/JAL-2262_dnd-for-local-structure-files' into develop
tcofoegbu [Mon, 10 Oct 2016 14:59:45 +0000 (15:59 +0100)]
JAL-2262 JAL-2195 unit test for bug
tcofoegbu [Mon, 10 Oct 2016 14:58:55 +0000 (15:58 +0100)]
JAL-2262 JAL-2195 bug fix for mapping local structure files
gmungoc [Thu, 6 Oct 2016 15:16:08 +0000 (16:16 +0100)]
JAL-2254 map error text in root node of EMBL XML response
gmungoc [Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)]
Merge branch 'develop' into task/JAL-2196pdbeProperties
gmungoc [Thu, 6 Oct 2016 12:14:59 +0000 (13:14 +0100)]
JAL-2252 now buffered read of 3 lines of a time in help files
gmungoc [Thu, 6 Oct 2016 07:52:55 +0000 (08:52 +0100)]
JAL-2245 checks for null added (in case EMBL fetch finds nothing)
Jim Procter [Wed, 5 Oct 2016 22:18:27 +0000 (23:18 +0100)]
JAL-2189 update year in author.props
Jim Procter [Wed, 5 Oct 2016 22:07:28 +0000 (23:07 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 22:06:23 +0000 (23:06 +0100)]
JAL-2189 CITATION file and reorder authors: 2.10: JBP, MC, TCO...
Jim Procter [Wed, 5 Oct 2016 21:15:44 +0000 (22:15 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:15:04 +0000 (22:15 +0100)]
JAL-2252 workaround for link checker not recognising multiline anchors
Jim Procter [Wed, 5 Oct 2016 21:07:18 +0000 (22:07 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:03:24 +0000 (22:03 +0100)]
JAL-2189 updated third party licenses
Jim Procter [Wed, 5 Oct 2016 20:50:09 +0000 (21:50 +0100)]
JAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:49:04 +0000 (21:49 +0100)]
JAL-2036 rebuild menus for each panel before adding to splitframe
Jim Procter [Wed, 5 Oct 2016 20:28:36 +0000 (21:28 +0100)]
JAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:08:48 +0000 (21:08 +0100)]
JAL-2189 tidy up release notes
Jim Procter [Wed, 5 Oct 2016 19:58:12 +0000 (20:58 +0100)]
JAL-2189 tweak ensembl release notes
Jim Procter [Wed, 5 Oct 2016 16:56:39 +0000 (17:56 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
JAL-2189 merge formatting and licensing updates to develop
Jim Procter [Wed, 5 Oct 2016 16:56:17 +0000 (17:56 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 16:53:20 +0000 (17:53 +0100)]
JAL-2189 formatting and release notes
Jim Procter [Wed, 5 Oct 2016 16:52:54 +0000 (17:52 +0100)]
JAL-2189 license header
Jim Procter [Wed, 5 Oct 2016 16:32:54 +0000 (17:32 +0100)]
JAL-2189 apply license
Jim Procter [Wed, 5 Oct 2016 15:52:19 +0000 (16:52 +0100)]
JAL-2189 format help
Jim Procter [Wed, 5 Oct 2016 15:33:28 +0000 (16:33 +0100)]
JAL-2189 format tests
Jim Procter [Wed, 5 Oct 2016 15:31:57 +0000 (16:31 +0100)]
JAL-2189 formatting and GPL
Jim Procter [Wed, 5 Oct 2016 15:28:14 +0000 (16:28 +0100)]
JAL-2189 source formatting
gmungoc [Wed, 5 Oct 2016 15:17:59 +0000 (16:17 +0100)]
Merge branch 'develop' into task/JAL-2196pdbeProperties
Conflicts:
src/jalview/datamodel/PDBEntry.java
test/jalview/ws/dbsources/UniprotTest.java
tcofoegbu [Wed, 5 Oct 2016 15:13:33 +0000 (16:13 +0100)]
QQMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 5 Oct 2016 15:13:16 +0000 (16:13 +0100)]
JAL-1563 JAL-1479 minor house-keeping for Uniprot FTS & SIFTS user docs
Jim Procter [Wed, 5 Oct 2016 15:03:09 +0000 (16:03 +0100)]
Revert "JAL-2245 Castor mapping and code changes for change to ENA XML format"
This reverts commit
30b2b47cbdfa35b127b0fb09e911815cddd9ed7b.
Jim Procter [Wed, 5 Oct 2016 14:59:59 +0000 (15:59 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Jim Procter [Wed, 5 Oct 2016 14:53:01 +0000 (15:53 +0100)]
JAL-2189 release notes/whats new
Jim Procter [Wed, 5 Oct 2016 14:52:49 +0000 (15:52 +0100)]
JAL-2189 JAL-2152 Chimera 1.11.1 minimum version requirement
gmungoc [Wed, 5 Oct 2016 14:12:01 +0000 (15:12 +0100)]
JAL-1191 revert to using SequenceOntologyLite due to downstream
dependencies
gmungoc [Wed, 5 Oct 2016 13:24:54 +0000 (14:24 +0100)]
JAL-1191 configure full SO for desktop, SOLite for applet (without
breaking the build)
git://source.jalview.org / jalview.git / log