Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 12:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,236 Commits 8 Branches 114 Tags 67 MiB
02ad43a5cc
Commit Graph

4236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dima117
9605409838 Update 06-Advanced.md 
https://github.com/nnnick/Chart.js/issues/1060
 2015-04-13 15:39:44 +03:00
Evert Timberg
604d6bd4e3 Merge pull request #677 from rylanhalteman/fix-yLabel-padding 
add 10 to yLabelWidth on set, rather than on use
 2015-04-12 08:06:23 -04:00
Tanner Linsley
14f4fae786 Only start digest on first request. Cleanup 2015-04-12 00:05:31 -06:00
Evert Timberg
c476db0dd7 Use findNextWhere correctly. 2015-04-11 23:05:05 -04:00
Evert Timberg
0a5f92a854 Remove the minAnimationSteps option since we did not end up needing it. 2015-04-11 21:11:49 -04:00
Evert Timberg
b1cbf04f25 Remove the unused lastTimeRun from the animation service 2015-04-11 20:47:35 -04:00
Tanner Linsley
70b8bf106c Always execute last frame 2015-04-11 18:42:11 -06:00
Tanner Linsley
99bf85e913 Merge remote-tracking branch 'origin/animation-refactory' into animation-refactory 
Conflicts:
	src/Chart.Core.js
 2015-04-11 18:37:01 -06:00
Tanner Linsley
e0c208be58 Frame Dropper 2015-04-11 18:34:06 -06:00
Evert Timberg
26eca23706 Implement cancel animation frame in the animation service 2015-04-11 20:17:46 -04:00
Evert Timberg
98253fea5d Fix some bugs in the animation stuff 2015-04-11 20:08:17 -04:00
Evert Timberg
9a13dd78fc Fix a typo 2015-04-11 19:42:54 -04:00
Evert Timberg
3e59438646 Integrate animation service with chart 2015-04-11 19:33:20 -04:00
Tanner Linsley
7a6f2b4f06 Src changes... derrrr 2015-04-11 17:30:06 -06:00
Tanner Linsley
a417dd00c5 Merge pull request #1058 from tannerlinsley/animation-refactory 
Chart.AnimationService
 2015-04-11 17:23:59 -06:00
Tanner Linsley
eee5af5924 Chart.AnimationService 2015-04-11 17:19:29 -06:00
Evert Timberg
d3579334b2 Add an option to control the minimum number of animation steps. 2015-04-11 19:17:30 -04:00
Evert Timberg
0b8fd966ff Chart animations will now use the animation service provided in Chart.animationService. 2015-04-11 19:02:50 -04:00
Evert Timberg
972bc5636d Merge pull request #711 from cmweiss/master 
Default color for Doughnut/Pie
 2015-04-09 11:25:45 -04:00
dima117
ca7a39232a fix multiTooltip appearance with empty title 
https://github.com/nnnick/Chart.js/issues/1039
 2015-04-03 22:19:34 +03:00
Evert Timberg
44ed661e3b Merge pull request #1036 from dima117/master 
helpers.generateLabels throws exception #1035
 2015-04-01 18:04:12 -04:00
dima117
4009dbd6a0 helpers.generateLabels throws "labelTemplateString is not defined" exception #1035 2015-03-31 22:06:41 +03:00
pijey
2677360f4b Add offsetGridLines option to Line charts 2015-03-25 11:51:56 +01:00
Evert Timberg
e461788b2b Merge pull request #1022 from GitGal/master 
Added possible animation effects to getting started guide
 2015-03-24 19:17:06 -04:00
GitGal
f7ed97a33e Update 00-Getting-Started.md 
Move Possible effects list above animationEasing
 2015-03-24 18:17:41 +01:00
gitgal
fc0434b3da add all possible easing animations to 00-Getting-Started.md 2015-03-24 18:07:35 +01:00
Nick Downie
1408c68205 Merge pull request #1005 from zymiboxpay/master 
fix custom build bug
 2015-03-18 11:38:15 +00:00
zymiboxpay
53bc8e769f fix custom build bug 2015-03-18 16:26:17 +08:00
Evert Timberg
b5f73e2087 Merge pull request #1002 from nnnick/fix/issue927 
fixes #927
 2015-03-17 10:59:49 -04:00
William Entriken
cb113c6452 fixes #927 2015-03-17 10:12:01 -04:00
William Entriken
8e5f1d9667 Merge pull request #575 from msrocka/master 
fix #570: getDecimalPlaces throws error
 2015-03-17 09:28:54 -04:00
William Entriken
47d23601b1 Fix CodeClimate issues 2015-03-16 19:14:36 -04:00
William Entriken
212d513746 Merge pull request #999 from mbrevda/unattachedElement 
Properly size unattached canvas
 2015-03-16 10:22:39 -04:00
Moshe Brevda
3e6883bdc0 Use default canvas size if one cannot be intelligently procured 2015-03-16 13:58:09 +02:00
Evert Timberg
ae7552a916 Draw bar chart negative values down from the 0 point of the scale. If all values are negative, draw down from the top. Updated the sample file to allow for negative bars. 2015-03-15 16:04:55 -04:00
Nick Downie
930b16a0af Versioned release files 2015-03-10 11:04:30 +00:00
Nick Downie
78d9627e4d Bump bower/package versions 2015-03-10 11:03:30 +00:00
Nick Downie
785f0b64b7 Merge pull request #983 from nnnick/release/v1.0.2 
Release 1.0.2
 2015-03-09 18:41:53 +00:00
Nick Downie
d2b73bdc5b Release 1.0.2 2015-03-09 18:37:37 +00:00
Nick Downie
4b120ccbe9 Merge pull request #982 from nnnick/fix/automatic-chart-size-src 
Target src files from #142
 2015-03-09 17:20:29 +00:00
Nick Downie
1fd52e702c Merge pull request #981 from nnnick/fix/cancel-anim-frame 
Ensure cancelAnimFrame has no function context
 2015-03-09 17:16:15 +00:00
Nick Downie
de564326b0 Target src files from #142 2015-03-09 17:14:09 +00:00
Nick Downie
154ce016cc Ensure cancelAnimFrame has no function context 2015-03-09 17:05:20 +00:00
Evert Timberg
5d8df20b0d Merge pull request #962 from steaks/removeUnecessaryComment 
Removed an unnecessary comment
 2015-03-02 11:39:28 -05:00
Steven Wexler
24248120a9 Removed an unnecessary comment 2015-03-01 20:31:44 -05:00
Jake
019e985c8f Merge pull request #898 from etimberg/fix/line_chart_single_label 
Fix a divide by 0 error when there is only 1 label
 2015-02-24 15:00:53 -05:00
Mike Smiley
ff493738a2 add datasetLabel for multiTooltip on dynamically-added points 2015-02-24 14:19:01 -05:00
Nick Downie
5ea265983e Merge pull request #931 from jtibble/master 
Removed trailing comma
 2015-02-11 00:09:58 +00:00
John Tibble
c09cac1cdd Removed trailing comma 
Automated scan at my place of employment caught this trailing comma
 2015-02-10 16:13:03 -05:00
William Entriken
afd2631728 Merge pull request #917 from nnnick/fix-915 
Fixes #915
 2015-02-04 11:51:14 -05:00