Code

Mixed chart#5134

Code

Closed

loicbourgois wants to merge 18 commits intochartjs:masterchartjs/Chart.js:masterfrom loicbourgois:mixedloicbourgois/Chart.js:mixedCopy head branch name to clipboard

+356-4

Commits

Commits on Jan 11, 2018

• Better mixed graph support

  Show description for 619d1f6
  loicbourgois

  committed
  619d1f6

  Copy full SHA for 619d1f6

• Set back lineEnabled()

  loicbourgois

  committed
  ee8e195

  Copy full SHA for ee8e195

• Move bar scale default value check to getIndexScale()

  loicbourgois

  committed
  76b13d1

  Copy full SHA for 76b13d1

Commits on Jan 12, 2018

• Improved mixed charts with support for empty main type

  loicbourgois

  committed
  cd75f9b

  Copy full SHA for cd75f9b

• Add example for mixed charts

  loicbourgois

  committed
  1a32e89

  Copy full SHA for 1a32e89

• Add example for mixed charts

  loicbourgois

  committed
  7cdd680

  Copy full SHA for 7cdd680

• Rollback controller.bar.js

  loicbourgois

  committed
  a01f580

  Copy full SHA for a01f580

• Update mixed chart example

  loicbourgois

  committed
  042920e

  Copy full SHA for 042920e

Commits on Jan 13, 2018

• Add more samples + Remove duplicated code

  loicbourgois

  committed
  05669ed

  Copy full SHA for 05669ed

• Always merge child options to parent

  loicbourgois

  committed
  2f9727b

  Copy full SHA for 2f9727b

Commits on Jan 14, 2018

• Merge branch 'master' of https://github.com/chartjs/Chart.js into mixed

  loicbourgois

  committed
  6e84627

  Copy full SHA for 6e84627

• Add test + Generalize controller and sample

  loicbourgois

  committed
  de80075

  Copy full SHA for de80075

• Add test + Generalize controller and sample

  loicbourgois

  committed
  f24d979

  Copy full SHA for f24d979

• Make sure the all the chart options are taken into account

  loicbourgois

  committed
  8ea9ee6

  Copy full SHA for 8ea9ee6

• Update example

  loicbourgois

  committed
  32f14aa

  Copy full SHA for 32f14aa

• Simplify merging

  loicbourgois

  committed
  892dc15

  Copy full SHA for 892dc15

• Revert changes for scatter and line controllers

  loicbourgois

  committed
  25119d4

  Copy full SHA for 25119d4

Commits on Jan 15, 2018

• Add check for type

  loicbourgois

  committed
  780f4eb

  Copy full SHA for 780f4eb