Evert Timberg 2a9b3e5221 Merge branch 'v2.0-dev' into v2.0-legend ...

Conflicts:
	src/core/core.controller.js

2015-11-21 09:23:33 -05:00

..

bar-multi-axis.html

Create interfaces similar to the old interfaces. Ensure that scales always have IDs before controllers are built.

2015-06-16 19:20:26 -04:00

bar-stacked.html

Checkpoint 1, Pew!!!!

2015-09-22 19:31:26 -06:00

bar.html

Update samples with some hidden datasets

2015-10-07 19:54:53 -04:00

bubble.html

Bubble Chart Type and Bubble Controller

2015-10-05 12:40:28 -06:00

combo-bar-line.html

Update samples with some hidden datasets

2015-10-07 19:54:53 -04:00

combo-time-scale.html

Time Scale Samples updated to import moment beforehand

2015-09-28 12:46:25 -06:00

doughnut.html

Doughnut, polar area, and radar samples should use the same canvas style

2015-11-11 19:06:36 -05:00

line-customTooltips.html

Only call custom tooltips when elements have changed. But be sure to call update internally any time that tooltips need to be redrawn.

2015-11-01 13:56:36 -07:00

line-legend.html

Line Sample Updated

2015-10-27 02:34:31 -06:00

line-logarithmic.html

Update samples to no longer use old functions and instead modify the data directly

2015-09-21 21:00:58 -04:00

line-multi-axis.html

Create interfaces similar to the old interfaces. Ensure that scales always have IDs before controllers are built.

2015-06-16 19:20:26 -04:00

line-skip-points.html

Update samples

2015-11-15 11:17:02 -05:00

line-stacked-area.html

Stacked Area Example

2015-10-31 22:45:11 -06:00

line-time-point-data.html

Labels are now optional for the time scale.

2015-10-19 19:20:08 -04:00

line-time-scale.html

Time scales now support passing in data as points. Added this to the time scale sample file.

2015-10-18 18:00:46 -04:00

line-x-axis-filter.html

Update samples with some hidden datasets

2015-10-07 19:54:53 -04:00

line.html

Update line sample to change the entire data object

2015-11-13 10:01:38 -05:00

pie.html

Update samples to no longer use old functions and instead modify the data directly

2015-09-21 21:00:58 -04:00

polar-area.html

Doughnut, polar area, and radar samples should use the same canvas style

2015-11-11 19:06:36 -05:00

radar-skip-points.html

Update samples

2015-11-15 11:17:02 -05:00

radar.html

Merge pull request #1642 from nnnick/fix/1527

2015-11-16 16:10:24 -07:00

scatter-logX.html

Update logX sample to use correct label callback

2015-09-26 16:50:59 -04:00

scatter-multi-axis.html

Reverse scale on radar/polar area

2015-09-02 23:21:39 +02:00

scatter.html

checkpoint for the morning check

2015-09-24 02:25:21 -06:00

tooltip-hooks.html

All tooltip callbacks support arrays for lines, and no drawing invisible tooltips.

2015-10-17 15:53:33 -06:00