1. 22 Apr, 2014 1 commit
    • David Schnur's avatar
      Merge branch 'master' into 0.9-work · 7043573a
      David Schnur authored
      Conflicts:
      	NEWS.md
      	component.json
      	flot.jquery.json
      	jquery.flot.canvas.js
      	jquery.flot.fillbetween.js
      	jquery.flot.pie.js
      	jquery.flot.time.js
      	package.json
      	src/jquery.flot.js
      	src/plugins/jquery.flot.crosshair.js
      	src/plugins/jquery.flot.navigate.js
      	src/plugins/jquery.flot.resize.js
      7043573a
  2. 21 Apr, 2014 2 commits
  3. 20 Apr, 2014 6 commits
  4. 17 Apr, 2014 1 commit
  5. 16 Apr, 2014 3 commits
  6. 14 Apr, 2014 1 commit
    • David Schnur's avatar
      Allow x2axis/y2axis with no min/max to auto-scale. · 86f7ab1e
      David Schnur authored
      Using x2axis/y2axis to add a second axis is deprecated, but we
      currently still support it.  Historically we’ve just extended the first
      axis’s options with the second’s, but that is a problem when the first
      has min/max and the second doesn’t; it will inherit an inappropriate
      min/max.
      
      We might want to consider not extending at all, but since that’s a
      bigger change we’ll for now just ensure that if no min/max is
      specified, we respect that.
      
      Fixes #1228.
      86f7ab1e
  7. 13 Apr, 2014 3 commits
  8. 25 Mar, 2014 2 commits
  9. 07 Mar, 2014 1 commit
  10. 05 Mar, 2014 2 commits
  11. 24 Feb, 2014 1 commit
  12. 17 Feb, 2014 1 commit
  13. 12 Feb, 2014 2 commits
  14. 11 Feb, 2014 3 commits
  15. 09 Feb, 2014 1 commit
  16. 03 Feb, 2014 3 commits
  17. 28 Jan, 2014 1 commit
  18. 27 Jan, 2014 1 commit
  19. 25 Jan, 2014 4 commits
  20. 21 Jan, 2014 1 commit