Evert Timberg 819f865723 Merge branch 'v2.0-dev' into v2.0-legend ...

Conflicts:
	src/controllers/controller.doughnut.js

2015-12-07 22:10:38 -05:00

..

element.arc.js

Fix JSHint errors

2015-10-20 20:33:51 -04:00

element.line.js

Merge branch 'v2.0-dev' into v2.0-legend

2015-12-07 22:10:38 -05:00

element.point.js

First set of tests for point. Started on a mockContext object for testing. Still need to handle property setting better (fillStyle, strokeStyle, etc)

2015-08-28 23:09:58 -04:00

element.rectangle.js

Bar and combo support for time scale

2015-09-18 11:31:25 -06:00