7043573aaa
Merge branch 'master' into 0.9-work
...
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
12 years ago
1d3a062833
Update copyright year to 2014.
12 years ago
d37ce8e3fe
Update examples page script paths
12 years ago
eae079f580
Add missing references and minor update on jquery.flot.js.
...
Revert the change on jquery.flot.js
Revert the change on jquery.flot.js
Add missing references and minor update on jquery.flot.js.
Revert the change on jquery.flot.js
Revert changes on jquery.flot.js.
Revert the changes to the jquery.flot.js that made by Visual Studio 2012.
13 years ago
4e66f981e2
Move non-Bower third party code under lib
13 years ago
2c4c39f472
Revert changes committed accidentally.
...
These changes were used to test the axis innermost property fix, and
should not have been committed.
13 years ago
ed3f14897e
Always set the axis innermost property.
...
It doesn't make sense to calculate the innermost property only when no
tickLength has been provided; the two have little to do with each other.
13 years ago
23005fdd4e
Move placeholder styles into .demo-placeholder.
...
This allows a page to have multiple placeholders, since we're no longer
tied to unique IDs.
13 years ago
a2718dbee6
Add the Flot version to each example's footer.
13 years ago
61a13d1059
Additional code & comments cleanup.
13 years ago
ed791745c7
Re-styled and cleaned up all the examples.
13 years ago
707c8ed845
Reorganized examples into subdirectories.
...
To improve organization with the increasing number of examples, every
example page is now the index of its own subdirectory, which contains
all the files specific to that example.
13 years ago
David Schnur
Nick Schonning
Jeff Tian