Tanner Linsley b22f569e4d Merge branch 'v2.0-dev' into v2.0-dev-refactor ...

Conflicts:
	samples/line-scale-override.html
	samples/line-x-axis-filter.html
	samples/line.html
	src/controllers/controller.bar.js
	src/core/core.controller.js
	src/scales/scale.category.js

2015-09-24 14:34:26 -06: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

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

2015-09-24 14:34:26 -06:00

combo-bar-line.html

checkpoint for the morning check

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

combo-time-scale.html

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

2015-09-24 14:34:26 -06:00

doughnut.html

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

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

line-customTooltips.html

Support for custom tooltips again

2015-06-22 13:10:49 -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-scale-override.html

checkpoint for the morning check

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

line-time-scale.html

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

2015-09-24 14:34:26 -06:00

line-x-axis-filter.html

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

2015-09-24 14:34:26 -06:00

line.html

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

2015-09-24 14:34:26 -06: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

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

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

radar.html

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

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

scatter-logX.html

Update sample files

2015-09-20 19:25:17 -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