Commit Graph

  • e9c18f603d Merged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fix conflicts. Refactored linear scale fixed step size implementation. Added nbproject to .gitignore Robert Becker 2016-02-09 12:54:53 +01:00
  • eb7241cbc9 Merge pull request #1986 from nnnick/fix/1292 Evert Timberg 2016-02-07 20:09:18 -05:00
  • 84ed07a84e Update bar sample file to use elements config. Fixes #1292 etimberg 2016-02-07 20:06:50 -05:00
  • 7235d829ec Merge pull request #1985 from nnnick/fix/1144 Evert Timberg 2016-02-07 20:01:01 -05:00
  • 37883689ad Fixes #1144 with an update to the docs to indicate that labels are required for each point etimberg 2016-02-07 19:58:15 -05:00
  • ee16c1edbc Update docs for #1144 etimberg 2016-02-07 19:55:32 -05:00
  • 9cf31da4c9 Add docs for global font options etimberg 2016-02-07 19:48:39 -05:00
  • cf0b550a80 Check to ensure dom node exists when calculating size. Fixes #919 etimberg 2016-02-07 19:23:54 -05:00
  • e931276003 Merge pull request #1984 from nnnick/fix/1890 Evert Timberg 2016-02-06 09:41:34 -05:00
  • 61ca178e2b Write an almost equals function and use it in the linear scale. Added a test for this new function. Evert Timberg 2016-02-06 09:38:44 -05:00
  • ada4c8eca3 Removed nbproject folder Robert Becker 2016-02-05 14:36:37 +01:00
  • 92bc1a04cf Chart.js was missing? Robert Becker 2016-02-05 10:11:58 +01:00
  • 1692b977cd Fixed tab sizing in core.helpers.js Robert Becker 2016-02-05 09:43:20 +01:00
  • 098b05f1b2 Further reformatted scale.linear.js to match original indenting. Refactored and fixed scale calculation. Added dist files to commit. Robert Becker 2016-02-05 09:41:45 +01:00
  • 85de9fbe9c Further reformatted scale.linear.js to match original indenting. Robert Becker 2016-02-05 09:33:57 +01:00
  • 80ede9b9bb Added documentation for fixedStepSize. Reformatted scale.linear.js to match original indenting. Robert Becker 2016-02-05 09:28:50 +01:00
  • 09721407d2 Removed debug log. Robert Becker 2016-02-04 15:28:06 +01:00
  • 9a20381af4 Fixed typo in core.helpers.js. Added ticks.fixedStepSize configuration parameter to force linear scale steps. Robert Becker 2016-02-04 15:20:17 +01:00
  • df218ead82 Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev Robert Becker 2016-02-04 10:38:35 +01:00
  • ba6afa7257 Fixed label callbacks adding only a single line instead of multiple lines as stated in docs. Robert Becker 2016-02-04 10:34:29 +01:00
  • e7df265c7a Fixed label callbacks adding only a single line instead of multiple lines as stated in docs. Robert Becker 2016-02-04 10:34:29 +01:00
  • 73300e91c4 Merge pull request #1972 from nnnick/fix/1971 Evert Timberg 2016-02-02 20:18:03 -05:00
  • dfaf786e1a Always show lines by default. Evert Timberg 2016-02-02 20:14:59 -05:00
  • 25e787cbf0 Merge pull request #1964 from nnnick/feature/1954 Evert Timberg 2016-02-01 21:12:11 -05:00
  • d16f4fc5ce Add default font options Evert Timberg 2016-02-01 21:06:54 -05:00
  • aafe21db7e New built files Evert Timberg 2016-02-01 18:49:11 -05:00
  • 9ed88599d2 Merge pull request #1963 from nnnick/fix/1952 Evert Timberg 2016-02-01 18:47:07 -05:00
  • 0e8babf1d7 Fix stacked bar data limit calculation Evert Timberg 2016-02-01 18:44:39 -05:00
  • 16dc9e6167 Merge pull request #1950 from nnnick/fix/time-scale-min-max Evert Timberg 2016-02-01 18:29:56 -05:00
  • 172c088c6b Minor fix Evert Timberg 2016-01-30 17:19:32 -05:00
  • f75116a91e Update millisecond default format. Removed unnecessary space at right edge of time scale. Evert Timberg 2016-01-30 16:35:10 -05:00
  • 1afe9f1a6e Built files with latest changes Evert Timberg 2016-01-30 09:04:23 -05:00
  • 212b6d3992 Merge pull request #1938 from nnnick/testing_improvements Evert Timberg 2016-01-27 18:04:22 -05:00
  • bfd6f5f78e Radar controller tests Evert Timberg 2016-01-27 18:00:32 -05:00
  • 0890c809aa default config tests Evert Timberg 2016-01-24 15:15:36 -05:00
  • d0a0d57fe2 Initial polar area tests Evert Timberg 2016-01-24 13:29:13 -05:00
  • 6aa2933ec5 Bubble controller tests Evert Timberg 2016-01-24 10:59:19 -05:00
  • d0b67c603b Line and bar test updates Evert Timberg 2016-01-24 10:58:30 -05:00
  • 68ab74a46d Fix linear scale stacked mode Evert Timberg 2016-01-24 09:22:28 -05:00
  • 0ed39c9fd7 Fix error in math helpers. Evert Timberg 2016-01-24 09:21:10 -05:00
  • c312835eb1 Add some tests for scales. Cleaned up some minor bugs in the time scale. Wrote better helpers for helpers.min and helpers.max Evert Timberg 2016-01-23 12:44:55 -05:00
  • 888379ec5c Merge pull request #1929 from nnnick/fix/1917 Evert Timberg 2016-01-21 22:04:31 -05:00
  • 59e3ccb42a buildOrUpdateControllers now returns an array of all the new controllers that were created. Build controllers before updating the scales but only reset them afterwards because the scales need to update label moments first. Evert Timberg 2016-01-21 22:00:21 -05:00
  • 76ef7de646 Fix sample file addData button Evert Timberg 2016-01-21 21:32:59 -05:00
  • cfb06ed34d Merge pull request #1927 from nnnick/fix/1918 Evert Timberg 2016-01-21 20:55:05 -05:00
  • c8ea3af32c All sample files use CDN version of jQuery to make getting started easier. Evert Timberg 2016-01-21 20:50:48 -05:00
  • 3c614a5dfe Merge pull request #1915 from nnnick/fix/1914 Evert Timberg 2016-01-18 21:38:27 -05:00
  • 2d4e2f9889 Properly begin path before drawing line at edge of scale Evert Timberg 2016-01-18 21:35:35 -05:00
  • 62988e9768 Merge pull request #1912 from mathiask88/pointStyleFix Evert Timberg 2016-01-18 15:55:06 -05:00
  • b282a01ab6 Fixes rect size Mathias Küsel 2016-01-18 20:04:31 +01:00
  • 8e681a606d Merge pull request #1911 from mathiask88/fixResize Evert Timberg 2016-01-18 12:50:46 -05:00
  • 33303d8d8a Fixes resize() function Mathias Küsel 2016-01-18 17:46:11 +01:00
  • 00913be944 Merge pull request #1908 from nnnick/fix/1907 Evert Timberg 2016-01-17 20:39:59 -05:00
  • 1de0435feb Fix reversed ticks on linear scale + update test Evert Timberg 2016-01-17 20:37:43 -05:00
  • 2db334dbf6 Merge pull request #1905 from mathiask88/pointStyles Evert Timberg 2016-01-16 12:49:47 -05:00
  • 655c1152eb Adds different point styles Mathias Küsel 2016-01-16 18:07:57 +01:00
  • f6b18a5998 Merge pull request #1900 from mathiask88/smallOptimizations Evert Timberg 2016-01-16 09:10:11 -05:00
  • c42cb148da Transition optimizations Mathias Küsel 2016-01-15 13:06:03 +01:00
  • fa7baa1627 Do not calculate control points if we want straight lines Mathias Küsel 2016-01-15 13:05:51 +01:00
  • 19613f531c Just assign instead of extend Mathias Küsel 2016-01-15 13:05:23 +01:00
  • 4f6e86640f Adds a caching system to expensive measureText() function Mathias Küsel 2016-01-15 13:05:03 +01:00
  • 25d6c2f064 Removes unused context bindings Mathias Küsel 2016-01-14 18:17:14 +01:00
  • b756507625 Merge pull request #1887 from mathiask88/v2.0-dev Evert Timberg 2016-01-14 11:02:51 -05:00
  • 24e4a924c4 Add option to disable line drawing Mathias Küsel 2016-01-14 13:39:06 +01:00
  • 7735371f45 Merge pull request #1893 from mathiask88/updateOptimizations Evert Timberg 2016-01-12 08:22:36 -05:00
  • 977d45a3e0 Add some optimizations to often used functions Mathias Küsel 2016-01-12 09:47:55 +01:00
  • 307d02bf48 Merge pull request #1892 from davis/v2.0-dev Evert Timberg 2016-01-11 21:57:52 -05:00
  • 88fc6ecc5c Fix orf/olf being undefined Davis Kim 2016-01-11 18:54:45 -08:00
  • 3f658555ba I will try again! coolbombom 2016-01-11 12:48:09 +01:00
  • 1f1e6b4e44 minor update, missed a small detail sorry!!! coolbombom 2016-01-11 12:17:08 +01:00
  • 3ac54b8790 having differnt colors in one dataset coolbombom 2016-01-11 12:02:32 +01:00
  • ff94a54891 Merge pull request #1879 from nnnick/fix/1110 Evert Timberg 2016-01-09 14:47:24 -05:00
  • 0ed27d4474 Make sure tick string could be null / undefined Evert Timberg 2016-01-09 14:42:55 -05:00
  • 5070059ac1 Add template option for point labels + test + doc update Evert Timberg 2016-01-09 14:39:43 -05:00
  • 956b1dd1e0 Merge pull request #1878 from nnnick/fix/1871 Evert Timberg 2016-01-09 11:59:39 -05:00
  • 8c68f78ec3 Don't try to use undefined Scale constructors Evert Timberg 2016-01-09 11:55:44 -05:00
  • 126e318fef Update built files Evert Timberg 2016-01-09 10:59:52 -05:00
  • 1202c03535 Update build Evert Timberg 2016-01-09 10:48:15 -05:00
  • 6b28790223 Merge pull request #1877 from nnnick/fix/1862 Evert Timberg 2016-01-09 10:01:19 -05:00
  • 46861c9f0b Update bar controller tests Evert Timberg 2016-01-09 09:58:14 -05:00
  • d49b5b82c7 Add test for scale Evert Timberg 2016-01-09 09:51:04 -05:00
  • 0e393a3122 Update controllers Evert Timberg 2016-01-09 09:50:56 -05:00
  • 1d3cb8ec41 Merge pull request #1875 from michaelarnauts/master Evert Timberg 2016-01-09 09:40:07 -05:00
  • 57bd8c7715 Ignore null values when calculating scale Michaël Arnauts 2016-01-09 12:04:29 +01:00
  • 104143672b Merge pull request #1874 from Parent5446/patch-1 Evert Timberg 2016-01-08 23:49:32 -05:00
  • c5f141306f Added documentation about tooltip templates Tyler Romeo 2016-01-08 20:02:45 -08:00
  • 8cfa60c04d Merge pull request #1854 from nnnick/fix/1853 Evert Timberg 2016-01-08 13:16:06 -05:00
  • 46ca099265 Merge pull request #1866 from morleyzhi/v2.0-dev Evert Timberg 2016-01-07 16:21:49 -05:00
  • 203bbcec6c Fix a bug where ticks get culled when they don't need to be Morley Zhi 2016-01-07 15:57:53 -05:00
  • 6f0d32fa8c Merge pull request #1863 from morleyzhi/v2.0-dev Evert Timberg 2016-01-07 14:43:59 -05:00
  • fe57c8728e Re-enable this; turns out I was mislead by the label spacing Morley Zhi 2016-01-07 12:41:42 -05:00
  • ebf695734c Looks like maxTicksLimit already limits gridlines, so restore this Morley Zhi 2016-01-07 12:37:13 -05:00
  • f00517643e Always show the last tick Morley Zhi 2016-01-07 12:28:09 -05:00
  • 84a6eb4a3b Updates (1) Only limit gridlines when maxTicksLimit is defined, so we don't blow up the tests. (2) Add a note about running tests in CONTRIBUTING.md (3) Rebuild files Morley Zhi 2016-01-07 11:40:26 -05:00
  • 6478f93ded Use ticks.maxTicksLimit to limit gridlines (fixes #1859); use getValueOrDefault for resolving the maxTicksLimit option Morley Zhi 2016-01-07 10:44:56 -05:00
  • 1967bef9f6 Merge pull request #1850 from kirushanth-sakthivetpillai/bugfix/browserify-umd Evert Timberg 2016-01-06 21:06:36 -05:00
  • 310eada01a Do not force resize if the size has not changed Evert Timberg 2016-01-05 20:16:18 -05:00
  • 1e91cf816b Update gulpfile.js Kirushanth Sakthivetpillai 2016-01-05 11:19:48 -05:00
  • cd29ede572 Update built files Evert Timberg 2016-01-03 09:11:58 -05:00
  • ae19cfd35f Merge pull request #1848 from nnnick/fix/1461 Evert Timberg 2016-01-02 21:21:28 -05:00