Merge remote-tracking branch 'origin/develop' into develop

Conflicts: dist/vis.js
xorsnn · Aug 12, 2015 · 84ba9e7 · 84ba9e7
2 parents ad0916b + 9b83e2c
commit 84ba9e7
Show file tree

Hide file tree

Showing 6 changed files with 1,403 additions and 1,471 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -12,6 +12,8 @@ http://visjs.org
 
 - Fixed #1152, updating images now works.
 - Fixed cleaning up of nodes.
+- Improved the positioning and CSS of the configurator and the color picker.
+- Fixed dynamic updating of label properties.
 
 
 ## 2015-07-27, version 4.7.0