jalview.git
5 years agofix for JAL-2991 - we could do better :/ bug/JAL-2991_exporttosvgwrapview
Jim Procter [Wed, 23 May 2018 15:19:56 +0000 (16:19 +0100)]
fix for JAL-2991 - we could do better :/

5 years agoJAL-2999 release notes and version bump for jalview 2.10.4b1
Jim Procter [Wed, 23 May 2018 14:18:52 +0000 (15:18 +0100)]
JAL-2999 release notes and version bump for jalview 2.10.4b1

5 years agoJAL-2895 replace $$Jalview-Version$$ in help.jhm with build version when indexing...
Jim Procter [Wed, 23 May 2018 14:17:45 +0000 (15:17 +0100)]
JAL-2895 replace $$Jalview-Version$$ in help.jhm with build version when indexing built in help pages

5 years agoJAL-2920 release notes Release_2_10_4
Jim Procter [Thu, 10 May 2018 10:49:14 +0000 (11:49 +0100)]
JAL-2920 release notes

5 years agoMerge branch 'bug/JAL-2920_uniprotvariantfeature' into releases/Release_2_10_4_Branch
Jim Procter [Thu, 10 May 2018 10:35:44 +0000 (11:35 +0100)]
Merge branch 'bug/JAL-2920_uniprotvariantfeature' into releases/Release_2_10_4_Branch

5 years agoJAL-2920 basic test for Description from features with/out description, variation...
Jim Procter [Thu, 10 May 2018 10:35:11 +0000 (11:35 +0100)]
JAL-2920 basic test for Description from features with/out description, variation and original attributes

5 years agoJAL-2920 simplified logic and added corner cases for missing attributes (probably...
Jim Procter [Thu, 10 May 2018 10:34:23 +0000 (11:34 +0100)]
JAL-2920 simplified logic and added corner cases for missing attributes (probably not needed but..)

5 years agoJAL-2906 update release date and release notes
Jim Procter [Wed, 9 May 2018 19:46:50 +0000 (20:46 +0100)]
JAL-2906 update release date and release notes

5 years agoJAL-2931 patch IA paths for new build box
Jim Procter [Wed, 9 May 2018 19:46:04 +0000 (20:46 +0100)]
JAL-2931 patch IA paths for new build box

5 years agoJAL-2984 add pdb as sequence(s) if associate structure is declined
gmungoc [Wed, 9 May 2018 13:59:14 +0000 (14:59 +0100)]
JAL-2984 add pdb as sequence(s) if associate structure is declined

5 years agoMerge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 9 May 2018 09:39:51 +0000 (10:39 +0100)]
Merge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch

5 years agoJAL-2976 fixed bad equivalence check and implemented belt-and-braces check for quaqua...
Jim Procter [Wed, 9 May 2018 09:39:19 +0000 (10:39 +0100)]
JAL-2976 fixed bad equivalence check and implemented belt-and-braces check for quaqua in class name string of look and feel to decide when to fallback to violetlib-Aqua.

5 years agoJAL-2321 release notes
Jim Procter [Tue, 8 May 2018 09:59:37 +0000 (10:59 +0100)]
JAL-2321 release notes

5 years agoMerge branch 'patch/JAL-2321_addsecstrForDroppedPDBFile' into releases/Release_2_10_4...
Jim Procter [Tue, 8 May 2018 09:57:35 +0000 (10:57 +0100)]
Merge branch 'patch/JAL-2321_addsecstrForDroppedPDBFile' into releases/Release_2_10_4_Branch

5 years agoJAL-2321 patch test to ensure structures are actually annotated when loaded directly... patch/JAL-2321_addsecstrForDroppedPDBFile
Jim Procter [Mon, 7 May 2018 17:08:38 +0000 (18:08 +0100)]
JAL-2321 patch test to ensure structures are actually annotated when loaded directly to desktop

5 years agoJAL-2321 ensure default is ‘parseImmediately=true’
Jim Procter [Mon, 7 May 2018 17:08:11 +0000 (18:08 +0100)]
JAL-2321 ensure default is ‘parseImmediately=true’

5 years agoJAL-2321 use configured values for structure derived annotation
Jim Procter [Mon, 7 May 2018 16:43:56 +0000 (17:43 +0100)]
JAL-2321 use configured values for structure derived annotation

5 years agoJAL-2321 add secondary structure & temp factor if not already present on mapped sequences
Jim Procter [Mon, 7 May 2018 16:39:17 +0000 (17:39 +0100)]
JAL-2321 add secondary structure & temp factor if not already present on mapped sequences

5 years agoJAL-2321 use StructureImportSettings singleton settings when JmolParser.parse() calle...
Jim Procter [Mon, 7 May 2018 16:38:29 +0000 (17:38 +0100)]
JAL-2321 use StructureImportSettings singleton settings when JmolParser.parse() called from constructor

5 years agoJAL-2321 isParseImmediately() allows the parse() method to determine if it was called...
Jim Procter [Mon, 7 May 2018 16:36:28 +0000 (17:36 +0100)]
JAL-2321 isParseImmediately() allows the parse() method to determine if it was called by the constructor or after construction

5 years agoJAL-2321 allow JmolParser to be configured before parsing data
Jim Procter [Mon, 7 May 2018 16:35:18 +0000 (17:35 +0100)]
JAL-2321 allow JmolParser to be configured before parsing data

5 years agoJAL-2906 apply GPLv3 license source
Jim Procter [Mon, 7 May 2018 13:23:05 +0000 (14:23 +0100)]
JAL-2906 apply GPLv3 license source

5 years agoJAL-2960 don’t override a swing method and create infinite recursion ;) toFront now...
Jim Procter [Mon, 7 May 2018 08:53:05 +0000 (09:53 +0100)]
JAL-2960 don’t override a swing method and create infinite recursion ;) toFront now raiseViewer !

5 years agoMerge branch 'releases/Release_2_10_4_Branch' of http://source.jalview.org/git/jalvie...
Jim Procter [Mon, 7 May 2018 08:29:54 +0000 (09:29 +0100)]
Merge branch 'releases/Release_2_10_4_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_4_Branch

5 years agoJAL-2906 small tweaks to release notes
gmungoc [Fri, 4 May 2018 15:35:02 +0000 (16:35 +0100)]
JAL-2906 small tweaks to release notes

5 years agoJAL-2906 2.10.4 release for 8th May 2018
Jim Procter [Fri, 4 May 2018 14:24:49 +0000 (15:24 +0100)]
JAL-2906 2.10.4 release for 8th May 2018

5 years agoMerge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 4 May 2018 14:15:16 +0000 (15:15 +0100)]
Merge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch

5 years agoJAL-2906 removed mention of experimental features, updated what’s new for 2.10.4...
Jim Procter [Fri, 4 May 2018 14:05:41 +0000 (15:05 +0100)]
JAL-2906 removed mention of experimental features, updated what’s new for 2.10.4 release, and help TOC.

5 years agoJAL-2976 patch NPE when trying to open Uniprot FTS
Jim Procter [Fri, 4 May 2018 13:37:59 +0000 (14:37 +0100)]
JAL-2976 patch NPE when trying to open Uniprot FTS

5 years agoJAL-2929 JAL-2922 release notes
Jim Procter [Fri, 4 May 2018 13:15:45 +0000 (14:15 +0100)]
JAL-2929 JAL-2922 release notes

5 years agoJAL-2976 typo in installAnywhere build for VAqua dependency
Jim Procter [Fri, 4 May 2018 12:55:06 +0000 (13:55 +0100)]
JAL-2976 typo in installAnywhere build for VAqua dependency

5 years agoJAL-2960 release notes
Jim Procter [Fri, 4 May 2018 12:26:37 +0000 (13:26 +0100)]
JAL-2960 release notes

5 years agoJAL-2948 transfer features/annotation is now available for all users
Jim Procter [Fri, 4 May 2018 12:26:20 +0000 (13:26 +0100)]
JAL-2948 transfer features/annotation is now available for all users

5 years agoJAL-2960 raise the structure view after adding structures to it
Jim Procter [Fri, 4 May 2018 12:11:48 +0000 (13:11 +0100)]
JAL-2960 raise the structure view after adding structures to it

5 years agoJAL-2976 Vaqua fallback release notes JAL-2906
Jim Procter [Fri, 4 May 2018 09:35:33 +0000 (10:35 +0100)]
JAL-2976 Vaqua fallback release notes JAL-2906

5 years agoMerge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 4 May 2018 07:41:23 +0000 (08:41 +0100)]
Merge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch

5 years agoJAL-2976 fallback to Vaqua for Macs that don’t work for Quaqua
Jim Procter [Wed, 2 May 2018 14:41:51 +0000 (15:41 +0100)]
JAL-2976 fallback to Vaqua for Macs that don’t work for Quaqua

5 years agoJAL-2976 Vaqua(4) as a dependency
Jim Procter [Wed, 2 May 2018 14:41:15 +0000 (15:41 +0100)]
JAL-2976 Vaqua(4) as a dependency

5 years agoJAL-2899 release notes
Jim Procter [Tue, 1 May 2018 15:59:48 +0000 (16:59 +0100)]
JAL-2899 release notes

5 years agoJAL-2973 JAL-2974 known defects for 2.10.4 (JAL-2906)

Jim Procter [Tue, 1 May 2018 11:31:15 +0000 (12:31 +0100)]
JAL-2973 JAL-2974 known defects for 2.10.4 (JAL-2906)


5 years agoJAL-2925 release notes
Jim Procter [Tue, 1 May 2018 11:30:48 +0000 (12:30 +0100)]
JAL-2925 release notes

5 years agoJAL-2593 JAL-2945 JAL-2952 JAL-2954 release notes for 2.10.4 JAL-2906

Jim Procter [Tue, 1 May 2018 10:58:40 +0000 (11:58 +0100)]
JAL-2593 JAL-2945 JAL-2952 JAL-2954 release notes for 2.10.4 JAL-2906


5 years agoJAL-2223 JAL-2781 JAL-2780 JAL-2946 JAL-2906 release notes
Jim Procter [Tue, 1 May 2018 10:15:50 +0000 (11:15 +0100)]
JAL-2223 JAL-2781 JAL-2780 JAL-2946 JAL-2906 release notes

5 years agoJAL-2906 reformat release notes
Jim Procter [Tue, 1 May 2018 09:30:03 +0000 (10:30 +0100)]
JAL-2906 reformat release notes

5 years agoJAL-2906 typo
Jim Procter [Tue, 1 May 2018 09:29:46 +0000 (10:29 +0100)]
JAL-2906 typo

5 years agoJAL-2944 revised docs and structure chooser screen shots
Jim Procter [Tue, 1 May 2018 09:29:19 +0000 (10:29 +0100)]
JAL-2944 revised docs and structure chooser screen shots

5 years agoJAL-2899 colouring moved from SwingWorker to a background thread
Jim Procter [Tue, 1 May 2018 08:21:39 +0000 (09:21 +0100)]
JAL-2899 colouring moved from SwingWorker to a background thread

5 years agoMerge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch
Jim Procter [Mon, 30 Apr 2018 15:49:41 +0000 (16:49 +0100)]
Merge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch

5 years agoJAL-2906 release 2.10.4 on 1st May 2018
Jim Procter [Mon, 30 Apr 2018 09:50:14 +0000 (10:50 +0100)]
JAL-2906 release 2.10.4 on 1st May 2018

5 years agoMerge branch 'features/JAL-2944_openStructuresInSelectedView' into releases/Release_2...
Jim Procter [Wed, 25 Apr 2018 11:03:17 +0000 (12:03 +0100)]
Merge branch 'features/JAL-2944_openStructuresInSelectedView' into releases/Release_2_10_4_Branch

5 years agoJAL-2954 more efficient SearchResults.markColumns
gmungoc [Mon, 23 Apr 2018 11:27:51 +0000 (12:27 +0100)]
JAL-2954 more efficient SearchResults.markColumns

5 years agoJAL-2952 set negative TempFactor values as AlignmentAnnotation.graphMin
gmungoc [Mon, 23 Apr 2018 10:26:58 +0000 (11:26 +0100)]
JAL-2952 set negative TempFactor values as AlignmentAnnotation.graphMin

6 years agoJAL-2593 render 'duplicate' features if transparency is applied
gmungoc [Wed, 18 Apr 2018 11:28:37 +0000 (12:28 +0100)]
JAL-2593 render 'duplicate' features if transparency is applied

6 years agoMerge branch 'features/JAL-2944_openStructuresInSelectedView' of https://source.jalvi... features/JAL-2944_openStructuresInSelectedView
gmungoc [Fri, 13 Apr 2018 07:21:00 +0000 (08:21 +0100)]
Merge branch 'features/JAL-2944_openStructuresInSelectedView' of https://source.jalview.org/git/jalview.git into features/JAL-2944_openStructuresInSelectedView

6 years agoJAL-2223 don't add duplicate mappings to StructureSelectionManager
gmungoc [Thu, 12 Apr 2018 15:28:41 +0000 (16:28 +0100)]
JAL-2223 don't add duplicate mappings to StructureSelectionManager

6 years agoJAL-1847 minor post-review updates
gmungoc [Thu, 12 Apr 2018 13:28:25 +0000 (14:28 +0100)]
JAL-1847 minor post-review updates

6 years agoJAL-2944 tidies for review comments
gmungoc [Thu, 12 Apr 2018 13:01:26 +0000 (14:01 +0100)]
JAL-2944 tidies for review comments

6 years agoJAL-2946 catch unexpected SIFTS mapping exceptions and failover to Needleman and...
Jim Procter [Wed, 11 Apr 2018 15:42:02 +0000 (16:42 +0100)]
JAL-2946 catch unexpected SIFTS mapping exceptions and failover to Needleman and Wunsch mapping

6 years agoJAL-2944 ’new view’ and ‘add to view’ button rather than selecting from combo box...
Jim Procter [Mon, 9 Apr 2018 09:17:12 +0000 (10:17 +0100)]
JAL-2944 ’new view’ and ‘add to view’ button rather than selecting from combo box to make it easier to successively add structures to existing view (which is the default action when return is pressed)


6 years agoJAL-1847 superpose checkbox in structure chooser
Jim Procter [Mon, 9 Apr 2018 09:14:57 +0000 (10:14 +0100)]
JAL-1847 superpose checkbox in structure chooser

6 years agoJAL-1847 JAL-2944 make superposition step a configurable property when opening/adding...
Jim Procter [Mon, 9 Apr 2018 09:09:58 +0000 (10:09 +0100)]
JAL-1847 JAL-2944 make superposition step a configurable property when opening/adding data to a structure viewer

6 years agofailing test for JAL-2223
Jim Procter [Fri, 6 Apr 2018 10:00:02 +0000 (11:00 +0100)]
failing test for JAL-2223

6 years agoJAL-2945 resolve model as PDB file. Need to verify behaviour with multiple model...
Jim Procter [Thu, 5 Apr 2018 21:04:13 +0000 (22:04 +0100)]
JAL-2945 resolve model as PDB file. Need to verify behaviour with multiple model PDB/mmCIF files

6 years agoJAL-2945 failing test for structure mapping
Jim Procter [Thu, 5 Apr 2018 20:49:38 +0000 (21:49 +0100)]
JAL-2945 failing test for structure mapping

6 years agoJAL-2945 formatting
Jim Procter [Thu, 5 Apr 2018 20:49:16 +0000 (21:49 +0100)]
JAL-2945 formatting

6 years agoJAL-2945 provide access to last highlighted results
Jim Procter [Thu, 5 Apr 2018 20:47:46 +0000 (21:47 +0100)]
JAL-2945 provide access to last highlighted results

6 years agoJAL-2944 open selected structures in existing or a new view, and by default offer...
Jim Procter [Thu, 5 Apr 2018 13:31:56 +0000 (14:31 +0100)]
JAL-2944 open selected structures in existing or a new view, and by default offer last opened/selected structure view as target view

6 years agoJAL-2944 combo box to pick which viewer to load structures into
Jim Procter [Thu, 5 Apr 2018 13:28:10 +0000 (14:28 +0100)]
JAL-2944 combo box to pick which viewer to load structures into

6 years agoJAL-2944 methods to check existence and get a title for existing or to-be-created...
Jim Procter [Thu, 5 Apr 2018 13:27:29 +0000 (14:27 +0100)]
JAL-2944 methods to check existence and get a title for existing or to-be-created StructureViewer

6 years agoJAL-2944 allow StructureViewer proxy to be created for an existing view in order...
Jim Procter [Thu, 5 Apr 2018 13:26:26 +0000 (14:26 +0100)]
JAL-2944 allow StructureViewer proxy to be created for an existing view in order to add structures to it

6 years agoJAL-2944 get viewer’s title via toString()
Jim Procter [Thu, 5 Apr 2018 13:24:08 +0000 (14:24 +0100)]
JAL-2944 get viewer’s title via toString()

6 years agoJAL-2944 expose UI update methods in api
Jim Procter [Thu, 5 Apr 2018 13:23:02 +0000 (14:23 +0100)]
JAL-2944 expose UI update methods in api

6 years agoJAL-2944 remove modal prompt logic and expose methods for adding structure data to...
Jim Procter [Thu, 5 Apr 2018 13:17:01 +0000 (14:17 +0100)]
JAL-2944 remove modal prompt logic and expose methods for adding structure data to a view via the StructureDisplay API

6 years agoJAL-2944 pull up structure viewer discovery routine to Desktop
Jim Procter [Thu, 5 Apr 2018 13:06:47 +0000 (14:06 +0100)]
JAL-2944 pull up structure viewer discovery routine to Desktop

6 years agoJAL-2929 unit test, tidy unused/unneeded fields/parameters
gmungoc [Thu, 22 Mar 2018 09:50:46 +0000 (09:50 +0000)]
JAL-2929 unit test, tidy unused/unneeded fields/parameters

6 years agoMerge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 21 Mar 2018 17:13:49 +0000 (17:13 +0000)]
Merge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch

6 years agoJAL-2754 don’t use deprecated api for getting font metrics
Jim Procter [Wed, 21 Mar 2018 17:13:04 +0000 (17:13 +0000)]
JAL-2754 don’t use deprecated api for getting font metrics

6 years agoJAL-2754 fix eclipse compilation error about referencing deprecated API via @see
Jim Procter [Wed, 21 Mar 2018 17:12:17 +0000 (17:12 +0000)]
JAL-2754 fix eclipse compilation error about referencing deprecated API via @see

6 years agoJAL-2929 use configure Overview gap colour instead of white past end of sequence
gmungoc [Wed, 21 Mar 2018 17:05:58 +0000 (17:05 +0000)]
JAL-2929 use configure Overview gap colour instead of white past end of sequence

6 years agoMerge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 21 Mar 2018 16:46:37 +0000 (16:46 +0000)]
Merge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch

6 years agoJAL-2754 dont put '<>' in <echo> text!
Jim Procter [Wed, 21 Mar 2018 16:45:44 +0000 (16:45 +0000)]
JAL-2754 dont put '<>' in <echo> text!

6 years agoMerge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch
Jim Procter [Wed, 21 Mar 2018 16:32:59 +0000 (16:32 +0000)]
Merge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch

6 years agoJAL-2754 clean up proguard path spec and config variables
Jim Procter [Wed, 21 Mar 2018 16:32:34 +0000 (16:32 +0000)]
JAL-2754 clean up proguard path spec and config variables

6 years agoJAL-2754 renamed proguard.jar to include version number
gmungoc [Fri, 27 Oct 2017 11:20:28 +0000 (12:20 +0100)]
JAL-2754 renamed proguard.jar to include version number

6 years agoJAL-2754 5.3.3 update of proguard.jar
gmungoc [Fri, 27 Oct 2017 11:03:22 +0000 (12:03 +0100)]
JAL-2754 5.3.3 update of proguard.jar

6 years agoJAL-2754 update to specify Java 1.8(+)
gmungoc [Fri, 27 Oct 2017 09:52:05 +0000 (10:52 +0100)]
JAL-2754 update to specify Java 1.8(+)

6 years agoJAL-2754 update to Java 1.8
gmungoc [Fri, 6 Oct 2017 08:39:02 +0000 (09:39 +0100)]
JAL-2754 update to Java 1.8

6 years agoJAL-2922 update FeatureRenderer and repaint feature settings after Invert Selection
gmungoc [Fri, 16 Mar 2018 14:47:12 +0000 (14:47 +0000)]
JAL-2922 update FeatureRenderer and repaint feature settings after Invert Selection

6 years agoJAL-2893 enabling Get Crossreferences to ENSEMBLGENOMES
gmungoc [Thu, 15 Mar 2018 16:24:06 +0000 (16:24 +0000)]
JAL-2893 enabling Get Crossreferences to ENSEMBLGENOMES

6 years agoJAL-2893 include ENSEMBLGENOMES as a 'roundtrip db source'
gmungoc [Wed, 14 Mar 2018 16:36:29 +0000 (16:36 +0000)]
JAL-2893 include ENSEMBLGENOMES as a 'roundtrip db source'

6 years agoJAL-2679 reinstating changes lost in VCF merge
gmungoc [Wed, 14 Mar 2018 14:41:14 +0000 (14:41 +0000)]
JAL-2679 reinstating changes lost in VCF merge

Conflicts:
src/jalview/ext/ensembl/EnsemblLookup.java

6 years agoJAL-2930 JAL-2924 JAL-2913 JAL-2926 JAL-2906 2.10.4 release notes
Jim Procter [Wed, 14 Mar 2018 08:53:17 +0000 (08:53 +0000)]
JAL-2930 JAL-2924 JAL-2913 JAL-2926 JAL-2906 2.10.4 release notes

6 years agoJAL-2913 use FIGURE_FIXEDIDWIDTH (not FIGURE_USERIDWIDTH)
gmungoc [Tue, 13 Mar 2018 16:22:55 +0000 (16:22 +0000)]
JAL-2913 use FIGURE_FIXEDIDWIDTH (not FIGURE_USERIDWIDTH)

6 years agoJAL-2885 tests updated for code changes
gmungoc [Thu, 8 Mar 2018 14:05:51 +0000 (14:05 +0000)]
JAL-2885 tests updated for code changes

6 years agoJAL-2930 use MouseWheelEvent.getPreciseWheelRotation, not getWheelRotation
gmungoc [Thu, 8 Mar 2018 11:29:11 +0000 (11:29 +0000)]
JAL-2930 use MouseWheelEvent.getPreciseWheelRotation, not getWheelRotation

6 years agoMerge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch
gmungoc [Wed, 7 Mar 2018 12:05:23 +0000 (12:05 +0000)]
Merge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch

6 years agoJAL-2922 [2] not [1] for Boolean column of table bugs/JAL-2922
gmungoc [Wed, 7 Mar 2018 12:04:58 +0000 (12:04 +0000)]
JAL-2922 [2] not [1] for Boolean column of table

6 years agoMerge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch
gmungoc [Wed, 7 Mar 2018 11:53:57 +0000 (11:53 +0000)]
Merge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch

6 years agoJAL-2922 i18n and bespoke handler for Invert Selection
gmungoc [Wed, 7 Mar 2018 11:53:26 +0000 (11:53 +0000)]
JAL-2922 i18n and bespoke handler for Invert Selection

6 years agoMerge branch 'bug/JAL-2924nullTooltip' into releases/Release_2_10_4_Branch
gmungoc [Wed, 7 Mar 2018 11:30:09 +0000 (11:30 +0000)]
Merge branch 'bug/JAL-2924nullTooltip' into releases/Release_2_10_4_Branch