Permalink
Commits on Nov 7, 2016
  1. Version 1.6.0

    * upgraded dependancies
    * support for node 4
    * support for npm run watch while developing
    * RangeSlider can accept multiple graphs
    cesine committed Nov 7, 2016
  2. Merge branch 'prs/slider'

    cesine committed Nov 7, 2016
  3. consolodating code to avoid duplication

    cesine committed Nov 6, 2016
Commits on Nov 6, 2016
  1. Merge branch 'roberttod-make-watchjs'

    cesine committed Nov 6, 2016
  2. added lint to package.json

    cesine committed Nov 6, 2016
  3. Merge branch 'make-watchjs' of https://github.com/roberttod/rickshaw

    …into roberttod-make-watchjs
    cesine committed Nov 6, 2016
  4. Merge branch 'doaboa-master'

    cesine committed Nov 6, 2016
  5. Merge branch 'master' of github.com:shutterstock/rickshaw

    cesine committed Nov 6, 2016
  6. Merge branch 'fix_bar_chart_x_axis' of https://github.com/mchataigner…

    …/rickshaw into mchataigner-fix_bar_chart_x_axis
    cesine committed Nov 6, 2016
  7. Running `make watchjs` watches src folder

    roberttod committed Nov 6, 2016
  8. Merge branch 'mchataigner-fix_bar_chart_x_axis'

    doaboa committed Nov 6, 2016
  9. added example bar chart

    doaboa committed Nov 6, 2016
Commits on Sep 10, 2016
  1. Merge pull request #547 from mathiasrw/patch-1

    Correct check for undefined variable
    cesine committed on GitHub Sep 10, 2016
  2. Correct check for undefined variable

    The code was comparing the result of `typeof` with a variable named `undefined`.
    
    As typeof returns a string it should compare to `'undefined'`
    mathiasrw committed on GitHub Sep 10, 2016
Commits on Aug 26, 2016
  1. Version 1.6.0-rc.0

    cesine committed Aug 26, 2016
  2. building css

    cesine committed Aug 26, 2016
Commits on Aug 23, 2016
  1. Merge branch 'range-slider-resize-with-original-graph' of https://git…

    …hub.com/dwt/rickshaw into prs/slider
    cesine committed Aug 23, 2016
  2. revert RangeSlider now works with multiple charts and a single slider…

    …, by using an array with the graph variables:
    
    632d1fb
    cesine committed Aug 23, 2016
  3. Multi-chart slider and colors for individual bars

    RangeSlider now works with multiple charts and a single slider, by using an array with the graph variables:
    
    var slider_three = new Rickshaw.Graph.RangeSlider({
        element: document.querySelector('#slider-range'),
        graph: [graph_one, graph_two, graph_three]
    });
    
    The bar chart renderer now looks for a proposed color for each individual bar, it will default to the chart-specific color if no color is declared:
    
    var data = [{
      data: [{ 
        x: -1893456000, y: 29389330}, { 
        x: -1577923200, y: 33125803}, { 
        x: -1262304000, y: 37857633, color:'#06f'}, { 
        x: -946771200, y: 41665901, color:'#0cf'}
      ],
        color: '#222'
      }]
    bozdoz committed with cesine Dec 19, 2012
Commits on Apr 8, 2016
  1. Merge pull request #541 from shutterstock/feature/test-coverage

    add coverage
    cesine committed Apr 8, 2016
  2. add coverage

    Jay Patel committed Apr 8, 2016
  3. Merge pull request #503 from yoursvivek/local_ticks

    fixing local time ticks
    tlackemann committed Apr 8, 2016
  4. Merge pull request #507 from mostr/fix_barchart_inconsistencies_betwe…

    …en_browsers
    
    Make calculating interval in bar chart consistent. Fixes #461
    tlackemann committed Apr 8, 2016
Commits on Apr 2, 2016