]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
projects / thirdparty / Chart.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed4b994 951e714)
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy
authorEvert Timberg <evert.timberg@gmail.com>
Wed, 20 May 2015 13:03:22 +0000 (09:03 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Wed, 20 May 2015 13:03:22 +0000 (09:03 -0400)
commit12e2ace03904ac07a8929f34884892b74d14c2fa
tree7025effdf01761f546db5483775246c065297a72tree | snapshot
parented4b9945f8e428c46c303f5ba6b2228e7485f715commit | diff
parent951e714e779bd96ac4f0a7bc04c75685b7b68616commit | diff
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy

Conflicts:
src/Chart.Core.js

Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
17 files changed:
samples/bar.html diff1 | diff2 | blob | history
samples/doughnut.color.html diff1 | diff2 | blob | history
samples/doughnut.html diff1 | diff2 | blob | history
samples/line-customTooltips.html diff1 | diff2 | blob | history
samples/line.html diff1 | diff2 | blob | history
samples/pie-customTooltips.html diff1 | diff2 | blob | history
samples/pie.html diff1 | diff2 | blob | history
samples/polar-area.html diff1 | diff2 | blob | history
samples/radar.html diff1 | diff2 | blob | history
samples/scatter-multi-axis.html diff1 | | blob | history
samples/scatter.html diff1 | | blob | history
src/Chart.Bar.js diff1 | diff2 | blob | history
src/Chart.Core.js diff1 | diff2 | blob | history
src/Chart.Doughnut.js diff1 | diff2 | blob | history
src/Chart.PolarArea.js diff1 | diff2 | blob | history
src/Chart.Radar.js diff1 | diff2 | blob | history
src/Chart.Scatter.js diff1 | | blob | history
Mirror of https://github.com/chartjs/Chart.js.git