Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alternate bar chart implementation and layer-mixin [WIP] #979

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Alternate bar chart implementation and layer-mixin [WIP] #979

wants to merge 6 commits into from

Commits on Aug 10, 2015

  1. merged in changed src file from mtraynham/layer_mixin

    @alan-unravel
    alan-unravel committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    3db7617 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/dc-js/dc.js into layer_m… 

    …ixin_update

Conflicts:
	src/bar-chart.js
	src/line-chart.js
    @alan-unravel
    alan-unravel committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    cb3cf1e View commit details
    Browse the repository at this point in the history

  3. bring in current version of bar and line to implement new behaviour

    @alan-unravel
    alan-unravel committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    a38bb1f View commit details
    Browse the repository at this point in the history

  4. bar chart has not changed much, can go off mtraynhams source

    @alan-unravel
    alan-unravel committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    18514fb View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2015

  1. added layer-mixin.js to Grunt file

    @alan-unravel
    alan-unravel committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    71984a3 View commit details
    Browse the repository at this point in the history

  2. include current build of dc.js

    @alan-unravel
    alan-unravel committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    ef2fdf1 View commit details
    Browse the repository at this point in the history