jalview.git
4 years agoJAL-3070 tidying
Jim Procter [Tue, 24 Sep 2019 17:29:10 +0000 (18:29 +0100)]
JAL-3070 tidying

4 years agoJAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...
Jim Procter [Mon, 23 Sep 2019 15:52:31 +0000 (16:52 +0100)]
JAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annotation style web services

4 years agoJAL-3066 Annotation Service Instance stub
Mateusz Warowny [Mon, 23 Sep 2019 15:01:54 +0000 (16:01 +0100)]
JAL-3066 Annotation Service Instance stub

4 years agoSlivkaWSDiscoverer formatting fix
Mateusz Warowny [Mon, 23 Sep 2019 15:01:34 +0000 (16:01 +0100)]
SlivkaWSDiscoverer formatting fix

4 years agoJAL-3066 Move common web service methods to abstract SlivkaWSInstance
Mateusz Warowny [Mon, 23 Sep 2019 13:07:43 +0000 (14:07 +0100)]
JAL-3066 Move common web service methods to abstract SlivkaWSInstance

ServiceWithParameters and JalviewWebService overriden methods would be common to both Msa and Annotation services thus they are moved to the common abstract base class.

4 years agoMerge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka...
Jim Procter [Mon, 23 Sep 2019 10:45:14 +0000 (11:45 +0100)]
Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration

4 years agoJAL-3070 configure annotation service manager from service’s input validation flags
Jim Procter [Mon, 23 Sep 2019 10:30:06 +0000 (11:30 +0100)]
JAL-3070 configure annotation service manager from service’s input validation flags

4 years agoJAL-3070 rename AbstractJabaCalcWorker to SeqAnnotationServiceCalcWorker
Jim Procter [Mon, 23 Sep 2019 09:36:19 +0000 (10:36 +0100)]
JAL-3070 rename AbstractJabaCalcWorker to SeqAnnotationServiceCalcWorker

4 years agoJAL-3070 ensure RNAAliFold annotation rows display correctly
Jim Procter [Mon, 23 Sep 2019 09:29:44 +0000 (10:29 +0100)]
JAL-3070 ensure RNAAliFold annotation rows display correctly

4 years agoJAL-3070 formatting
Jim Procter [Mon, 23 Sep 2019 08:38:40 +0000 (09:38 +0100)]
JAL-3070 formatting

4 years agoJAL-3070 detect presence of existing JABA RNAAliFold client
Jim Procter [Mon, 23 Sep 2019 08:38:33 +0000 (09:38 +0100)]
JAL-3070 detect presence of existing JABA RNAAliFold client

4 years agoJAL-3070 match AbstractJabaCalcWorker’s annotation service interface with class from...
Jim Procter [Mon, 23 Sep 2019 08:15:32 +0000 (09:15 +0100)]
JAL-3070 match AbstractJabaCalcWorker’s annotation service interface with class from the aaui field to enable/disable tick box

4 years agoJAL-3070 javadoc for (mostly) jabaws specific methods
Jim Procter [Mon, 23 Sep 2019 08:14:18 +0000 (09:14 +0100)]
JAL-3070 javadoc for (mostly) jabaws specific methods

4 years agoJAL-3070 rough-and-ready refactor of JABA SequenceAnnotation style services - needs...
Jim Procter [Fri, 20 Sep 2019 16:01:57 +0000 (17:01 +0100)]
JAL-3070 rough-and-ready refactor of JABA SequenceAnnotation style services - needs some review and refinement

4 years agoJAL-3070 JAL-1379 deferred work on annotation based on JABAWS MSA service (e.g. Jpred...
Jim Procter [Fri, 20 Sep 2019 15:56:01 +0000 (16:56 +0100)]
JAL-3070 JAL-1379 deferred work on annotation based on JABAWS MSA service (e.g. Jpred3 Jabaws 2.1 deprecated service)

4 years agoJAL-3070 JAL-2507 fix up test output and honour the ‘ignoreFeatures’ flag when testin...
Jim Procter [Fri, 20 Sep 2019 12:06:13 +0000 (13:06 +0100)]
JAL-3070 JAL-2507 fix up test output and honour the ‘ignoreFeatures’ flag when testing alignment equivalence (this broke disorderAnnotExportImport tests)

4 years agoJAL-3066 Auto discover multiple sequence alignment services
Mateusz Warowny [Thu, 19 Sep 2019 13:35:46 +0000 (14:35 +0100)]
JAL-3066 Auto discover multiple sequence alignment services

4 years agoJAL-3432 hide the slider when validator has no min or max
Jim Procter [Tue, 17 Sep 2019 10:53:42 +0000 (11:53 +0100)]
JAL-3432 hide the slider when validator has no min or max

4 years agoSet the initial value of the choice field to the default value.
Mateusz Warowny [Mon, 16 Sep 2019 12:17:12 +0000 (13:17 +0100)]
Set the initial value of the choice field to the default value.

4 years agoAdd the remaining msa services to the Discoverer
Mateusz Warowny [Mon, 16 Sep 2019 12:16:43 +0000 (13:16 +0100)]
Add the remaining msa services to the Discoverer

4 years agoChange choice field to use dropbox instead of radio buttons.
Mateusz Warowny [Wed, 11 Sep 2019 10:19:28 +0000 (11:19 +0100)]
Change choice field to use dropbox instead of radio buttons.

4 years agoCreate generic msa service instance
Mateusz Warowny [Wed, 11 Sep 2019 10:18:38 +0000 (11:18 +0100)]
Create generic msa service instance

4 years agoMerge remote-tracking branch 'origin/alpha/JAL-3066_Jalview_212_slivka-integration...
Mateusz Warowny [Fri, 6 Sep 2019 17:09:48 +0000 (18:09 +0100)]
Merge remote-tracking branch 'origin/alpha/JAL-3066_Jalview_212_slivka-integration' into alpha/JAL-3066_Jalview_212_slivka-integration

4 years agoJAL-3066 Working custom parameters for clustalo
Mateusz Warowny [Fri, 6 Sep 2019 17:07:04 +0000 (18:07 +0100)]
JAL-3066 Working custom parameters for clustalo

4 years agoJAL-3066 fix compile error (@matesuz - this will conflict :) )
Jim Procter [Fri, 6 Sep 2019 16:04:55 +0000 (17:04 +0100)]
JAL-3066 fix compile error (@matesuz - this will conflict :) )

4 years agoJAL_1426 JAL-3066 update Apache James mime parser and fix deprecation warnings with...
Jim Procter [Fri, 6 Sep 2019 16:04:13 +0000 (17:04 +0100)]
JAL_1426 JAL-3066 update Apache James mime parser and fix deprecation warnings with HttpMultiPartEntity


4 years agoJAL-1426 Replacing old apache-http jars.
Mateusz Warowny [Fri, 6 Sep 2019 14:22:02 +0000 (15:22 +0100)]
JAL-1426 Replacing old apache-http jars.

4 years agoJAL-3066 Implement clustaloWS using slivka system.
Mateusz Warowny [Thu, 5 Sep 2019 16:00:38 +0000 (17:00 +0100)]
JAL-3066 Implement clustaloWS using slivka system.

4 years agoJAL-3362 keep Java 1.8 build happy by specifying generic type arguments
Jim Procter [Tue, 13 Aug 2019 15:50:58 +0000 (16:50 +0100)]
JAL-3362 keep Java 1.8 build happy by specifying generic type arguments

4 years agoMerge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212
Jim Procter [Tue, 13 Aug 2019 15:22:01 +0000 (16:22 +0100)]
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212

4 years agoJAL-3187 removal of variant feature (non-virtual) transfer to protein
gmungoc [Fri, 9 Aug 2019 08:01:10 +0000 (09:01 +0100)]
JAL-3187 removal of variant feature (non-virtual) transfer to protein

4 years agoJAL-3187 (fudge) look in both alignments for stored mappings feature/JAL-3187linkedFeatures
gmungoc [Wed, 7 Aug 2019 09:25:09 +0000 (10:25 +0100)]
JAL-3187 (fudge) look in both alignments for stored mappings

4 years agoMerge branch 'develop' into feature/JAL-3187linkedFeatures
gmungoc [Wed, 7 Aug 2019 08:42:01 +0000 (09:42 +0100)]
Merge branch 'develop' into feature/JAL-3187linkedFeatures

4 years agoJAL-3389 add .py to restored Chimera session filename so it opens!
gmungoc [Wed, 31 Jul 2019 11:59:39 +0000 (12:59 +0100)]
JAL-3389 add .py to restored Chimera session filename so it opens!

4 years agoMerge branch 'bug/JAL-3388structureChooserSorting' into develop
gmungoc [Wed, 31 Jul 2019 08:10:11 +0000 (09:10 +0100)]
Merge branch 'bug/JAL-3388structureChooserSorting' into develop

4 years agoJAL-3198 more efficient Sequence.getDisplayId()
gmungoc [Tue, 30 Jul 2019 17:45:21 +0000 (18:45 +0100)]
JAL-3198 more efficient Sequence.getDisplayId()

4 years agoJAL-3388 correct class for column 0 Ref Sequence bug/JAL-3388structureChooserSorting
gmungoc [Tue, 30 Jul 2019 16:51:13 +0000 (17:51 +0100)]
JAL-3388 correct class for column 0 Ref Sequence

4 years agoJAL-3386 correct wrapped width calculation for headless image export
gmungoc [Mon, 29 Jul 2019 14:48:30 +0000 (15:48 +0100)]
JAL-3386 correct wrapped width calculation for headless image export

4 years agoJAL-3377 more reused of SeqCanvas.computeWrappedGeometry
gmungoc [Mon, 29 Jul 2019 14:35:22 +0000 (15:35 +0100)]
JAL-3377 more reused of SeqCanvas.computeWrappedGeometry

4 years agoJAL-3377 add seq-annotations gap to cheight not to hgap
gmungoc [Mon, 29 Jul 2019 10:44:06 +0000 (11:44 +0100)]
JAL-3377 add seq-annotations gap to cheight not to hgap

4 years agoJAL-3377 Javadoc added for getWrappedHeight()
gmungoc [Mon, 29 Jul 2019 10:34:05 +0000 (11:34 +0100)]
JAL-3377 Javadoc added for getWrappedHeight()

4 years agoJAL-3377 corrected wrapped widths height for IdCanvas
gmungoc [Sun, 28 Jul 2019 10:05:32 +0000 (11:05 +0100)]
JAL-3377 corrected wrapped widths height for IdCanvas

4 years agoJAL-3377 include seq-annotation spacing in getWrappedHeight()
gmungoc [Mon, 29 Jul 2019 10:20:44 +0000 (11:20 +0100)]
JAL-3377 include seq-annotation spacing in getWrappedHeight()

4 years agoMerge branch 'features/JAL-3375vcfValidation' into
gmungoc [Fri, 26 Jul 2019 18:42:30 +0000 (20:42 +0200)]
Merge branch 'features/JAL-3375vcfValidation' into
feature/JAL-3187linkedFeatures

Conflicts:
src/jalview/io/vcf/VCFLoader.java
test/jalview/io/vcf/VCFLoaderTest.java

4 years agoJAL-1793 only decode specific special characters in VCF data
gmungoc [Fri, 26 Jul 2019 16:52:01 +0000 (18:52 +0200)]
JAL-1793 only decode specific special characters in VCF data

4 years agoJAL-3376 capture VCF POS, ID, QUAL, FILTER as feature attributes features/JAL-3375vcfValidation
gmungoc [Fri, 26 Jul 2019 15:58:06 +0000 (17:58 +0200)]
JAL-3376 capture VCF POS, ID, QUAL, FILTER as feature attributes

4 years agoJAL-3375 format validate VCF Integer and Float fields
gmungoc [Fri, 26 Jul 2019 13:40:28 +0000 (15:40 +0200)]
JAL-3375 format validate VCF Integer and Float fields

4 years agoJAL-3375 ignore '.' values for VCF data
gmungoc [Thu, 25 Jul 2019 10:48:33 +0000 (12:48 +0200)]
JAL-3375 ignore '.' values for VCF data

4 years agoMerge branch 'develop' into feature/JAL-3187linkedFeatures
gmungoc [Tue, 16 Jul 2019 16:13:19 +0000 (17:13 +0100)]
Merge branch 'develop' into feature/JAL-3187linkedFeatures

4 years agoJAL-2987 tolerate null double values when formatting JTable
gmungoc [Tue, 16 Jul 2019 10:23:35 +0000 (11:23 +0100)]
JAL-2987 tolerate null double values when formatting JTable

4 years agoMerge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_21...
Jim Procter [Mon, 15 Jul 2019 16:21:05 +0000 (17:21 +0100)]
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha

4 years agoJAL-2629 can now choose number of jackhmmer iterations merge/JAL-3285_mchmmer_with_211_develop
Thomas [Fri, 12 Jul 2019 14:46:32 +0000 (15:46 +0100)]
JAL-2629 can now choose number of jackhmmer iterations

4 years agoJAL-2629 fix faulty label in a MessageManager.getString() call
Thomas [Fri, 12 Jul 2019 13:44:44 +0000 (14:44 +0100)]
JAL-2629 fix faulty label in a MessageManager.getString() call

4 years agoJAL-2629 add sort by evalue and bit score
Thomas [Fri, 12 Jul 2019 13:43:55 +0000 (14:43 +0100)]
JAL-2629 add sort by evalue and bit score

4 years agoJAL-2629 hmmer searches now read domain rather than full scores
Thomas [Fri, 12 Jul 2019 13:42:48 +0000 (14:42 +0100)]
JAL-2629 hmmer searches now read domain rather than full scores

4 years agoMerge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_21...
Jim Procter [Thu, 11 Jul 2019 15:59:28 +0000 (16:59 +0100)]
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha

4 years agoJAL-2629 hmmer searches include seqs past inclusion threshold in output
Thomas [Thu, 11 Jul 2019 14:11:52 +0000 (15:11 +0100)]
JAL-2629 hmmer searches include seqs past inclusion threshold in output

4 years agoJAL-2629 hmm search UI and structural improvements, inclusion thresholds
Thomas [Thu, 11 Jul 2019 13:47:42 +0000 (14:47 +0100)]
JAL-2629 hmm search UI and structural improvements, inclusion thresholds

4 years agoJAL-3070 standard way of storing/recovering documentation URL for service
Jim Procter [Wed, 10 Jul 2019 16:46:23 +0000 (17:46 +0100)]
JAL-3070 standard way of storing/recovering documentation URL for service

4 years agoJAL-3070 remove final reference to Jws2Instance
Jim Procter [Wed, 10 Jul 2019 16:33:25 +0000 (17:33 +0100)]
JAL-3070 remove final reference to Jws2Instance

4 years agoMerge branch 'develop' into feature/JAL-3187linkedFeatures
gmungoc [Wed, 10 Jul 2019 16:03:42 +0000 (17:03 +0100)]
Merge branch 'develop' into feature/JAL-3187linkedFeatures

4 years agoJAL-2629 fix hmmsearch/jackhmmer assigning incorrect evalues and scores
tva [Wed, 10 Jul 2019 15:49:50 +0000 (16:49 +0100)]
JAL-2629 fix hmmsearch/jackhmmer assigning incorrect evalues and scores

4 years agoMerge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3362_Jalview_212_alpha
Jim Procter [Wed, 10 Jul 2019 14:53:07 +0000 (15:53 +0100)]
Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3362_Jalview_212_alpha

4 years agoJAL-2629 fix hmsearch and jackhmmer not being able to search alignment
tva [Wed, 10 Jul 2019 14:39:41 +0000 (15:39 +0100)]
JAL-2629 fix hmsearch and jackhmmer not being able to search alignment

4 years agoJAL-3289 bamboo properties for ‘BUILD’ getdown channel - fix
Jim Procter [Wed, 10 Jul 2019 13:09:18 +0000 (14:09 +0100)]
JAL-3289 bamboo properties for ‘BUILD’ getdown channel - fix

4 years agoJAL-3289 bamboo properties for ‘BUILD’ getdown channel
Jim Procter [Wed, 10 Jul 2019 12:55:56 +0000 (13:55 +0100)]
JAL-3289 bamboo properties for ‘BUILD’ getdown channel

4 years agoJAL-2629 hmmsearch # of new sequences now only displayed when specified
tva [Wed, 10 Jul 2019 14:12:58 +0000 (15:12 +0100)]
JAL-2629 hmmsearch # of new sequences now only displayed when specified

4 years agoJAL-2629 fix incorrect hmmbuild on groups behaviour
tva [Wed, 10 Jul 2019 13:41:40 +0000 (14:41 +0100)]
JAL-2629 fix incorrect hmmbuild on groups behaviour

4 years agoJAL-3289 bamboo properties for ‘BUILD’ getdown channel - fix
Jim Procter [Wed, 10 Jul 2019 13:09:18 +0000 (14:09 +0100)]
JAL-3289 bamboo properties for ‘BUILD’ getdown channel - fix

4 years agoJAL-3289 bamboo properties for ‘BUILD’ getdown channel
Jim Procter [Wed, 10 Jul 2019 12:55:56 +0000 (13:55 +0100)]
JAL-3289 bamboo properties for ‘BUILD’ getdown channel

4 years agoMerge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_21...
Jim Procter [Wed, 10 Jul 2019 12:05:46 +0000 (13:05 +0100)]
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha

4 years agoJAL-2629 fix hmmsearch/jackhmmer being unable to search through DB file
tva [Wed, 10 Jul 2019 12:05:12 +0000 (13:05 +0100)]
JAL-2629 fix hmmsearch/jackhmmer being unable to search through DB file

4 years agoJAL-3187 derived peptide variants tweaks and tests
gmungoc [Mon, 8 Jul 2019 10:47:06 +0000 (11:47 +0100)]
JAL-3187 derived peptide variants tweaks and tests

4 years agoJAL-2629 uniquify all hmmer command sequence outputs
tva [Fri, 5 Jul 2019 14:59:00 +0000 (15:59 +0100)]
JAL-2629 uniquify all hmmer command sequence outputs

4 years agoJAL-3187 initial refactoring towards peptide variant in tooltip
gmungoc [Fri, 5 Jul 2019 10:44:14 +0000 (11:44 +0100)]
JAL-3187 initial refactoring towards peptide variant in tooltip

4 years agoJAL-2629 fix file format issues preventing hmmsearch, jackhmmer running
tva [Fri, 5 Jul 2019 09:58:52 +0000 (10:58 +0100)]
JAL-2629 fix file format issues preventing hmmsearch, jackhmmer running

4 years agoJAL-1544 fixed a html encoding of '<' (%lt; -> &lt;) in commandline.html
Ben Soares [Fri, 5 Jul 2019 09:43:30 +0000 (10:43 +0100)]
JAL-1544 fixed a html encoding of '<' (%lt; -> &lt;) in commandline.html

4 years agoJAL-1793 apply URL decoding when saving VCF attribute values (%3D -> =)
gmungoc [Fri, 5 Jul 2019 09:09:12 +0000 (10:09 +0100)]
JAL-1793 apply URL decoding when saving VCF attribute values (%3D -> =)

4 years agoJAL-3111 correct JVL appbase for 2.10.5 via getdown
Jim Procter [Thu, 4 Jul 2019 15:40:13 +0000 (16:40 +0100)]
JAL-3111 correct JVL appbase for 2.10.5 via getdown

4 years agoMerge branch 'task/JAL-3337-rm-lib-update-sourceDist' into develop
Jim Procter [Thu, 4 Jul 2019 15:34:12 +0000 (16:34 +0100)]
Merge branch 'task/JAL-3337-rm-lib-update-sourceDist' into develop

4 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Thu, 4 Jul 2019 15:33:48 +0000 (16:33 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

4 years agoJAL-3337 round-and-round the process source files again
Jim Procter [Thu, 4 Jul 2019 15:31:47 +0000 (16:31 +0100)]
JAL-3337 round-and-round the process source files again

4 years agoJAL-3337 more includes and excludes
Jim Procter [Thu, 4 Jul 2019 15:23:16 +0000 (16:23 +0100)]
JAL-3337 more includes and excludes

4 years agoJAL-3337 remove the old lib directory ! task/JAL-3337-rm-lib-update-sourceDist
Jim Procter [Thu, 4 Jul 2019 14:52:05 +0000 (15:52 +0100)]
JAL-3337 remove the old lib directory !

4 years agoJAL-3337 rejig the source distribution generation to process and replace tokens in...
Jim Procter [Thu, 4 Jul 2019 14:51:28 +0000 (15:51 +0100)]
JAL-3337 rejig the source distribution generation to process and replace tokens in source files

4 years agoJAL-3111 replace year in header for help pages and put processed help in build/distri...
Jim Procter [Thu, 4 Jul 2019 14:36:07 +0000 (15:36 +0100)]
JAL-3111 replace year in header for help pages and put processed help in build/distributions

4 years agoJAL-3225 try/catch for non-deprecated/deprecated property in sourceDist which is...
Ben Soares [Thu, 4 Jul 2019 13:43:47 +0000 (14:43 +0100)]
JAL-3225 try/catch for non-deprecated/deprecated property in sourceDist which is not available on older eclipses

4 years agoJAL-3353 Change to build.gradle to use the file:// enabled getdown-launcher-local...
Ben Soares [Thu, 4 Jul 2019 13:16:14 +0000 (14:16 +0100)]
JAL-3353 Change to build.gradle to use the file:// enabled getdown-launcher-local.jar for LOCAL and ARCHIVELOCAL builds only. Otherwise the getdown-launcher.jar (with no local file enabled) will be used

4 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Thu, 4 Jul 2019 12:09:21 +0000 (13:09 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

4 years agoJAL-3111 help pages minor corrections
gmungoc [Thu, 4 Jul 2019 12:09:13 +0000 (13:09 +0100)]
JAL-3111 help pages minor corrections

4 years agoJAL-3348 fixed an internal href in help to allow building
Ben Soares [Thu, 4 Jul 2019 11:26:37 +0000 (12:26 +0100)]
JAL-3348 fixed an internal href in help to allow building

4 years agoJAL-3337 adjusted building doc as sourceDist uses gradle 5.2 or above properties
Ben Soares [Thu, 4 Jul 2019 11:25:43 +0000 (12:25 +0100)]
JAL-3337 adjusted building doc as sourceDist uses gradle 5.2 or above properties

4 years agoMerge branch 'task/JAL-3348_document_cli_memory_settings_when_launching_jalview'...
Jim Procter [Thu, 4 Jul 2019 08:08:21 +0000 (09:08 +0100)]
Merge branch 'task/JAL-3348_document_cli_memory_settings_when_launching_jalview' into develop

4 years agoJAL-3111 JAL-3348 JVL file documentation
Jim Procter [Thu, 4 Jul 2019 08:05:12 +0000 (09:05 +0100)]
JAL-3111 JAL-3348 JVL file documentation

4 years agoJAL-3348 revised bsoares memory settings documentation and updated docs for launching...
Jim Procter [Thu, 4 Jul 2019 07:36:42 +0000 (08:36 +0100)]
JAL-3348 revised bsoares memory settings documentation and updated docs for launching jalview from command line

4 years agoMerge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching...
Ben Soares [Thu, 4 Jul 2019 00:04:51 +0000 (01:04 +0100)]
Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching_jalview

merging in develop

4 years agoJAL-3348 memory.html documentation finished for 2.11.0
Ben Soares [Wed, 3 Jul 2019 23:59:39 +0000 (00:59 +0100)]
JAL-3348 memory.html documentation finished for 2.11.0

4 years agoJAL-3348 jvmmempc in jvl file now works in linux
Ben Soares [Wed, 3 Jul 2019 22:42:35 +0000 (23:42 +0100)]
JAL-3348 jvmmempc in jvl file now works in linux

4 years agoJAL-3348 jvmmempc multiple values shouldn't be merged
Ben Soares [Wed, 3 Jul 2019 22:14:41 +0000 (23:14 +0100)]
JAL-3348 jvmmempc multiple values shouldn't be merged

4 years agoJAL-3111 tidy up lists/indentation for release notes
Jim Procter [Wed, 3 Jul 2019 19:58:37 +0000 (20:58 +0100)]
JAL-3111 tidy up lists/indentation for release notes