merge master

Author: mikolalysenko

CHANGELOG.md

@@ -9,6 +9,22 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+## [1.7.0] -- 2016-03-22
+
+### Added
+
+- Custom surface color functionality (for 4D plotting) is added to surface traces [#347]
+- Top-level `Plotly.purge` method (which returns the graph div in its
+  pre-Plotly.plot state) is added [#300]
+- Support for custom hover labels on multiple subplots in `Plotly.Fx.hover` is
+  added [#301]
+
+### Fixed
+- Error bars node ordering now respect the trace ordering [#343]
+- Geo traces nodes now update properly on streaming plot calls [#324]
+- jQuery check in event module is made more robust [#328]
+
+
 ## [1.6.3] -- 2016-03-07
 
 ### Fixed

build/plotcss.js

@@ -8,6 +8,7 @@ var rules = {
     "X a": "text-decoration:none;",
     "X a:hover": "text-decoration:none;",
     "X .crisp": "shape-rendering:crispEdges;",
+    "X .user-select-none": "-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;",
     "X svg": "overflow:hidden;",
     "X svg a": "fill:#447adb;",
     "X svg a:hover": "fill:#3c6dc5;",

devtools/test_dashboard/test_gl3d.js

@@ -35,7 +35,8 @@ plots['marker-arrays'] = require('@mocks/gl3d_marker-arrays.json');
 plots['scatter3d-colorscale'] = require('@mocks/gl3d_scatter3d-colorscale.json');
 plots['autocolorscale'] = require('@mocks/gl3d_autocolorscale.json');
 plots['nan-holes'] = require('@mocks/gl3d_nan-holes.json');
-plots['tetrahedra'] = require('@mocks/gl3d_tet.json');
 plots['connectgaps'] = require('@mocks/gl3d_scatter3d-connectgaps.json');
+plots['tet'] = require('@mocks/gl3d_tet.json');
+plots['surface_intensity'] = require('@mocks/gl3d_surface_intensity.json');
 
 plotButtons(plots, figDir);