Evert Timberg 95332e39f5 Merge branch 'v2.0-dev' into fix/1725 ...

Conflicts:
	src/core/core.controller.js

2015-12-12 09:01:59 -05:00

..

charts

Generate label strings using an option function. This allows new chart types to override

2015-12-06 12:53:45 -05:00

controllers

Better property picking. Added a helper function so we don't have to write a complicated ternary everywhere. Updated tests accordingly.

2015-12-12 08:52:06 -05:00

core

Merge branch 'v2.0-dev' into fix/1725

2015-12-12 09:01:59 -05:00

elements

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

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

scales

Add tooltipFormat option to time scale options.

2015-12-05 19:33:33 -05:00