Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 20:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,075 Commits 8 Branches 114 Tags 67 MiB
f3c51fc624
Commit Graph

2075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evert Timberg
524493fe06 Merge pull request #2883 from Mesonyx/mesonyx/bugfix/null-tooltips 
Fix for null value label/x-axis multi-tooltip bug
 2016-07-11 10:34:20 -04:00
Evert Timberg
49c4169010 Bring back capping of bezier curve points and have an option to disable it (#2948) 2016-07-09 15:24:41 -06:00
Evert Timberg
b6686f00f4 Non numeric y (#2849) 
* Category scale can now read from the xLabels and yLabels properties.

* Update docs with section regarding the data object.

* Add sample file with non numeric Y and fix animations
 2016-07-09 09:22:25 -06:00
Evert Timberg
72813d5112 Merge branch 'amlethojalen-master' 2016-07-09 10:02:08 -04:00
Evert Timberg
a1f94b1a57 update sample to have negative numbers 2016-07-09 10:01:15 -04:00
Evert Timberg
6f392639c2 Merge branch 'master' of https://github.com/amlethojalen/Chart.js into amlethojalen-master 2016-07-09 09:39:43 -04:00
Evert Timberg
609df5fb16 Merge pull request #2885 from neilmacintyre/master 
cached index and length
 2016-07-09 09:12:57 -04:00
Evert Timberg
fc09b58a14 Merge pull request #2905 from shuson/patch-1 
add wikipedia link for DRY explanation
 2016-07-09 09:12:32 -04:00
Evert Timberg
8226f3432b Fix JSHint warnings and remove commented code 2016-07-09 09:08:41 -04:00
Evert Timberg
a452094f5d Add polar area start angle setting 2016-07-09 09:05:02 -04:00
Evert Timberg
4dacb78ae7 Merge pull request #2936 from gitname/patch-1 
Fix typo
 2016-07-07 16:17:20 -04:00
gitname
046e2effb5 Fix typo 2016-07-07 12:57:49 -07:00
amlethojalen
988423b05e Fixed up formatting suggestions/issues as per comments from zachpanz88 2016-07-07 08:35:21 +10:00
Evert Timberg
7ca5f91b10 Fix bar and line controllers to convert strings to numbers when considering the values for stacking the chart. Simplified the base calculation for the bar charts and added test coverage to ensure that strings will work correctly. 2016-07-06 18:22:42 -04:00
Evert Timberg
fca419e075 Merge pull request #2924 from jeffesp/master 
Fixes #2923: swapped tooltip xAlign & yAlign
 2016-07-06 17:57:31 -04:00
Evert Timberg
44a9866bd8 Merge pull request #2870 from chartjs/fix/2802 
Consider left and top when determining value from pixel in category s…
 2016-07-06 17:53:50 -04:00
unknown
b4d8f541bd Merge remote-tracking branch 'chartjs-origin/master' 2016-07-06 11:21:57 -06:00
jeffesp
0c5a17af00 Fixes #2923: swapped tooltip xAlign & yAlign 2016-07-06 09:49:31 -04:00
Shayne Linhart
0dccc85e3a Added usePointStyle option to label boxes 
- Closes #2252
- Allows label boxes to match the shape(pointStyle) of the corresponding data.
* Removed unused varaible from legend's draw()
 2016-07-05 20:08:29 -06:00
amlethojalen
68728fc9a7 Added ability to render a line chart as a stepped line chart. 
Added option.elements.line.stepped
Added dataset.steppedLine
Added Sample, and updated documentation.
 2016-07-06 11:13:12 +10:00
Evert Timberg
758698c354 Fix time point lines. Improved logic for using the value in the time scale. Improve value passing in the line and bubble controllers/ 2016-07-05 20:52:17 -04:00
amlethojalen
bddc870201 Added ability for drawing a Line Chart as a stepped Line Chart. (reverted from commit efd06c886d) 2016-07-06 10:25:01 +10:00
amlethojalen
efd06c886d Added ability for drawing a Line Chart as a stepped Line Chart. 2016-07-05 19:50:53 +10:00
Evert Timberg
3cdd66ca58 Merge pull request #2867 from mtanda/fix_stacked_scatter_line_chart 
Fix to work stacked scatter line chart (fixes #2878)
 2016-07-04 22:57:40 -04:00
Shusen Wang
ff9e9f1d7c add wikipedia link for DRY explanation 
DRY is a short term for Don't Repeat yourself, maybe it is not so well known by front-end developers, but it is well known among back end developers
 2016-07-04 14:51:26 +08:00
unknown
56be759d21 Removed unused varaible from legend's draw() 2016-07-03 18:40:15 -06:00
unknown
924a5d0abc Merge remote-tracking branch 'chartjs-origin/master' 
Conflicts:
	src/core/core.legend.js
 2016-07-03 18:35:21 -06:00
Evert Timberg
b197fdae42 Merge pull request #2901 from moberwasserlechner/fix/2894 
Documentation fixes
 2016-07-03 17:09:30 -04:00
unknown
d381117236 Issue #2252, added usePointStyle option to allow label boxes to match the shape(pointStyle) of the corresponding data. 2016-07-03 13:55:43 -06:00
zachpanz88
f4ccb225a3
Add more information to README on Building and Testing 2016-07-03 00:24:35 -04:00
Michael Oberwasserlechner
1485778363 Finish incomplete sentence and remove trailing spaces. 2016-07-02 16:46:29 +02:00
Michael Oberwasserlechner
aed3d40263 add id property to common configuration 2016-07-02 16:42:36 +02:00
Michael Oberwasserlechner
2feebb1cd2 remove redundant option entry 2016-07-02 16:35:33 +02:00
Michael Oberwasserlechner
ae010a91b6 stepSize defined twice. renaming the first to fixedStepSize 2016-07-02 13:55:53 +02:00
Evert Timberg
2a62d33052 Merge pull request #2897 from jimkring/patch-1 
Update 04-Bar-Chart.md
 2016-07-01 22:49:11 -04:00
Jim Kring
aa556540f4 Update 04-Bar-Chart.md 
Changed second instance of "Options for xAxes" heading to "Options for yAxes" since it is the heading for the y-axis options.
 2016-07-01 12:02:55 -07:00
Zach Panzarino
e271876f02 Merge pull request #2893 from chartjs/fix/2888 
Fix typo in docs
 2016-07-01 09:52:14 -04:00
Evert Timberg
900e1062ba Fix typo in docs 2016-07-01 08:55:35 -04:00
Neil Macintyre
8bd0c56b84 cached index and length 2016-06-30 18:10:11 -04:00
Adam Templeton
6f1344d4e9 fix for null tooltip bug 2016-06-30 11:34:53 -05:00
Mitsuhiro Tanda
2bf2be7a9c fix stacked scatter line chart 2016-06-30 22:28:21 +09:00
Evert Timberg
f2bbe32150 Merge pull request #2865 from nmac143/master 
Pie chart borders truncated #2844
 2016-06-29 20:30:02 -04:00
nmac143
426466d051 Fixed truncation of pie chart borders 2016-06-29 19:39:10 -04:00
Evert Timberg
3660d9be39 Consider left and top when determining value from pixel in category scale 2016-06-29 07:00:09 -04:00
Evert Timberg
35e3f01f01 Merge pull request #2857 from chartjs/fix/2809 
Polar area graph scale should start at 0 by default
 2016-06-28 21:59:39 -04:00
Evert Timberg
266df5e877 Merge pull request #2863 from Mesonyx/mesonyx/feature/x-axis-highlighting 
adds x-axis hover option for charts and tooltips, highlights all dots…
 2016-06-28 16:15:04 -04:00
Adam Templeton
c39b8f6c78 made table more readable 2016-06-28 15:05:04 -05:00
Adam Templeton
a0a3561eef updated docs with new option 2016-06-28 14:59:22 -05:00
Adam Templeton
103957c4e0 adds x-axis hover option for charts and tooltips, highlights all dots on x-axis upon x-axis hover 2016-06-28 14:15:12 -05:00
Evert Timberg
9082507c1c Merge pull request #2555 from simonbrunel/travis-dist 
Travis GitHub Releases
 2016-06-28 08:39:57 -04:00