Evert Timberg bcbd9a85e6 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems ...

Conflicts:
	gulpfile.js

2015-09-18 18:38:47 -04:00

..

charts

Attempting to make resize better

2015-09-14 18:50:52 -04:00

controllers

Add line controller tests. Fixed an issue when the number of data points changes. When adding the tension to a point, get the same tension as the line if it has been overridden at the dataset level. When setting the hover style of a point, allow setting the radius independently of the regular radius. Use the hoverRadius property in point.custom or the dataset.pointHoverRadius. Allow setting the border width independently at the dataset level. Use dataset.pointHoverBorderWidth. This can be an array or a number.

2015-08-30 17:42:42 -04:00

core

Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems

2015-09-18 18:38:47 -04:00

elements

Initial line element tests. Did not test the skipNull functionality since it seems to be broken.

2015-08-29 14:16:37 -04:00

scales

Unit tests for logarithmic scale. Fixed some issues in stacked mode since it's not possible for a 0 crossing to occur with a log scale.

2015-09-17 20:29:41 -04:00