Commit Graph

12 Commits (0.9-work)

Author SHA1 Message Date
David Schnur 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
David Schnur 1d3a062833 Update copyright year to 2014. 12 years ago
David Schnur 4964dcb3c1 Fix zoom to selection box when using jQuery 1.9+.
Fixes #1250.
12 years ago
soenter 38f7a8c58d Improve the performance of large data processing(fix spaces -> tabs) 12 years ago
Nick Schonning d37ce8e3fe Update examples page script paths 12 years ago
soenter b9c6359c22 Improve the performance of large data processing 12 years ago
Jeff Tian 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
Nick Schonning 4e66f981e2 Move non-Bower third party code under lib 13 years ago
David Schnur 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
David Schnur a2718dbee6 Add the Flot version to each example's footer. 13 years ago
David Schnur ed791745c7 Re-styled and cleaned up all the examples. 13 years ago
David Schnur 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