Merge branch 'master' into gh-31-stop-sorting-unique-keys-and-values

gchq · Feb 20, 2019 · 60b464f · 60b464f
2 parents 30cb8dc + 7302e42
commit 60b464f
Show file tree

Hide file tree

Showing 5 changed files with 832 additions and 832 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 * Issue **#31** - Leave keys and values in original order if no sort has been specified.
 
+* Issue **#33** - Fix problem of LineChart and StackedArea ignoring interpolationMode setting.
+
+* Issue **#32** - Add support for no line interpolation to LineChart and StackedArea.
+
 ## [v3.1.0] - 2019-01-03
 
 * Issue **#29** - Add series filtering to Series Session Map.

diff --git a/stroom-content-source/LineChart.Visualisation.settings.json b/stroom-content-source/LineChart.Visualisation.settings.json
@@ -33,6 +33,7 @@
                     "type": "selection",
                     "label": "Interpolation Mode",
                     "values": [
+                        "",
                         "linear",
                         "linear-closed",
                         "step",

diff --git a/stroom-content-source/StackedArea.Visualisation.settings.json b/stroom-content-source/StackedArea.Visualisation.settings.json
@@ -33,6 +33,7 @@
                     "type": "selection",
                     "label": "Interpolation Mode",
                     "values": [
+                        "",
                         "linear",
                         "linear-closed",
                         "step",