Merge branch 'master' into jun_supervisor

Author: etpinard

CHANGELOG.md

@@ -3,6 +3,23 @@
 For more context information, please read through the
 [release notes](https://github.com/plotly/plotly.js/releases).
 
+## [1.2.0] -- 2015-12-07
+
+### Added
+- All `Plotly.____` methods now return a promise, and pass the graph-div as an argument [#77]
+- `package.json` now has `webpack` field so plotly.js can be used by webpack users [#68]
+- Add support for rgba colours in pie-charts [#63]
+
+### Changed
+- Optimized by calling window.getComputedStyle only once [#81]
+- Improved npm install process for topojson file resolve [#48]
+
+### Fixed
+- Fixed geo-plot promises [#52]
+- Typo fixed in `No DOM element` error message [#64]
+- Fix hover labels with hoverinfo 'text' [#70]
+- Fix scaling for gl3d error bars [#74]
+
 ## [1.1.1] -- 2015-12-01
 
 ### Fixed

README.md

@@ -94,12 +94,14 @@ plotly.js charts can also be created and saved online for free at [plot.ly/plot]
 |---|--------|---------|
 |**Alex C. Johnson**| [@alexcjohnson](https://github.com/alexcjohnson) | |
 |**Étienne Tétreault-Pinard**| [@etpinard](https://github.com/etpinard) | [@etpinard](https://twitter.com/etpinard) |
-|**Mikola Lysenko**| [@mikolalysenko](https://github.com/mikolalysenko) | [@MikolaLysenko](https://twitter.com/MikolaLysenko) |
+|**Mikola Lysenko**| [@mikolalysenko](https://github.com/mikolalysenko) | [@MikolaLysenko](https://twitter.com/MikolaLysenko) | |
+|**Miklós Tusz**| [@mdtusz](https://github.com/mdtusz) | [@mdtusz](https://twitter.com/mdtusz)|
+|**Chelsea Douglas**| [@cldougl](https://github.com/cldougl) | |
 |**Ben Postlethwaite**| [@bpostlethwaite](https://github.com/bpostlethwaite) | |
 |**Chris Parmer**| [@chriddyp](https://github.com/chriddyp) | |
-|**Chelsea Douglas**| [@cldougl](https://github.com/cldougl) | |
 |**Alex Vados**| [@alexander-daniel](https://github.com/alexander-daniel) | |
 
+
 ## Copyright and license
 
 Code and documentation copyright 2015 Plotly, Inc.