]>
git.ipfire.org Git - thirdparty/Chart.js.git/log
William Entriken [Fri, 24 Apr 2015 14:28:29 +0000 (10:28 -0400)]
Merge pull request #851 from jtblin/master
Fix #507 - calculate container width and heigh without padding
Evert Timberg [Fri, 17 Apr 2015 10:33:42 +0000 (06:33 -0400)]
Merge pull request #1069 from mackuba/fix_endpoint
Prevent taking vertical space for X labels more than once
Kuba Suder [Thu, 16 Apr 2015 20:23:17 +0000 (22:23 +0200)]
prevent taking vertical space for x labels more than once
calculateXLabelRotation() subtracts space needed for x labels from
this.endPoint, but if this block is called more than once then the space
is subtracted more than once and the chart gets smaller and smaller with
every iteration
William Entriken [Thu, 16 Apr 2015 19:27:43 +0000 (15:27 -0400)]
Merge pull request #1025 from pijey/feature/offsetgridlines-linechart
Add offsetGridLines option to Line charts
William Entriken [Thu, 16 Apr 2015 19:17:36 +0000 (15:17 -0400)]
Merge branch 'chasd00-piechart-redraw-after-zero-segment-values'
William Entriken [Thu, 16 Apr 2015 19:17:28 +0000 (15:17 -0400)]
Merge #756 Fixes #661
Nick Downie [Mon, 13 Apr 2015 15:35:14 +0000 (16:35 +0100)]
Derped HTML attributes.
Nick Downie [Mon, 13 Apr 2015 15:32:41 +0000 (16:32 +0100)]
Merge pull request #1062 from dima117/patch-1
Update 06-Advanced.md
dima117 [Mon, 13 Apr 2015 12:39:44 +0000 (15:39 +0300)]
Update 06-Advanced.md
https://github.com/nnnick/Chart.js/issues/1060
Evert Timberg [Sun, 12 Apr 2015 12:06:23 +0000 (08:06 -0400)]
Merge pull request #677 from rylanhalteman/fix-yLabel-padding
add 10 to yLabelWidth on set, rather than on use
Evert Timberg [Thu, 9 Apr 2015 15:25:45 +0000 (11:25 -0400)]
Merge pull request #711 from cmweiss/master
Default color for Doughnut/Pie
Evert Timberg [Wed, 1 Apr 2015 22:04:12 +0000 (18:04 -0400)]
Merge pull request #1036 from dima117/master
helpers.generateLabels throws exception #1035
dima117 [Tue, 31 Mar 2015 19:06:41 +0000 (22:06 +0300)]
helpers.generateLabels throws "labelTemplateString is not defined" exception #1035
pijey [Wed, 25 Mar 2015 10:51:56 +0000 (11:51 +0100)]
Add offsetGridLines option to Line charts
Evert Timberg [Tue, 24 Mar 2015 23:17:06 +0000 (19:17 -0400)]
Merge pull request #1022 from GitGal/master
Added possible animation effects to getting started guide
GitGal [Tue, 24 Mar 2015 17:17:41 +0000 (18:17 +0100)]
Update 00-Getting-Started.md
Move Possible effects list above animationEasing
gitgal [Tue, 24 Mar 2015 17:07:35 +0000 (18:07 +0100)]
add all possible easing animations to 00-Getting-Started.md
Nick Downie [Wed, 18 Mar 2015 11:38:15 +0000 (11:38 +0000)]
Merge pull request #1005 from zymiboxpay/master
fix custom build bug
zymiboxpay [Wed, 18 Mar 2015 08:26:17 +0000 (16:26 +0800)]
fix custom build bug
Evert Timberg [Tue, 17 Mar 2015 14:59:49 +0000 (10:59 -0400)]
Merge pull request #1002 from nnnick/fix/issue927
fixes #927
William Entriken [Tue, 17 Mar 2015 14:12:01 +0000 (10:12 -0400)]
fixes #927
William Entriken [Tue, 17 Mar 2015 13:28:54 +0000 (09:28 -0400)]
Merge pull request #575 from msrocka/master
fix #570: getDecimalPlaces throws error
William Entriken [Mon, 16 Mar 2015 23:14:36 +0000 (19:14 -0400)]
Fix CodeClimate issues
William Entriken [Mon, 16 Mar 2015 14:22:39 +0000 (10:22 -0400)]
Merge pull request #999 from mbrevda/unattachedElement
Properly size unattached canvas
Moshe Brevda [Mon, 16 Mar 2015 11:47:25 +0000 (13:47 +0200)]
Use default canvas size if one cannot be intelligently procured
Nick Downie [Tue, 10 Mar 2015 11:04:30 +0000 (11:04 +0000)]
Versioned release files
Nick Downie [Tue, 10 Mar 2015 11:03:30 +0000 (11:03 +0000)]
Bump bower/package versions
Nick Downie [Mon, 9 Mar 2015 18:41:53 +0000 (18:41 +0000)]
Merge pull request #983 from nnnick/release/v1.0.2
Release 1.0.2
Nick Downie [Mon, 9 Mar 2015 18:37:37 +0000 (18:37 +0000)]
Release 1.0.2
Nick Downie [Mon, 9 Mar 2015 17:20:29 +0000 (17:20 +0000)]
Merge pull request #982 from nnnick/fix/automatic-chart-size-src
Target src files from #142
Nick Downie [Mon, 9 Mar 2015 17:16:15 +0000 (17:16 +0000)]
Merge pull request #981 from nnnick/fix/cancel-anim-frame
Ensure cancelAnimFrame has no function context
Nick Downie [Mon, 9 Mar 2015 17:14:09 +0000 (17:14 +0000)]
Target src files from #142
Nick Downie [Mon, 9 Mar 2015 17:05:20 +0000 (17:05 +0000)]
Ensure cancelAnimFrame has no function context
Evert Timberg [Mon, 2 Mar 2015 16:39:28 +0000 (11:39 -0500)]
Merge pull request #962 from steaks/removeUnecessaryComment
Removed an unnecessary comment
Steven Wexler [Mon, 2 Mar 2015 01:31:44 +0000 (20:31 -0500)]
Removed an unnecessary comment
Jake [Tue, 24 Feb 2015 20:00:53 +0000 (15:00 -0500)]
Merge pull request #898 from etimberg/fix/line_chart_single_label
Fix a divide by 0 error when there is only 1 label
Nick Downie [Wed, 11 Feb 2015 00:09:58 +0000 (00:09 +0000)]
Merge pull request #931 from jtibble/master
Removed trailing comma
John Tibble [Tue, 10 Feb 2015 21:13:03 +0000 (16:13 -0500)]
Removed trailing comma
Automated scan at my place of employment caught this trailing comma
William Entriken [Wed, 4 Feb 2015 16:51:14 +0000 (11:51 -0500)]
Merge pull request #917 from nnnick/fix-915
Fixes #915
William Entriken [Tue, 3 Feb 2015 19:09:17 +0000 (14:09 -0500)]
Fixes #915
William Entriken [Mon, 2 Feb 2015 21:56:43 +0000 (16:56 -0500)]
Fixes #901
Christopher Weiss [Fri, 30 Jan 2015 16:12:08 +0000 (11:12 -0500)]
Accidentally left in Array.prototype.map.
Christopher Weiss [Fri, 30 Jan 2015 16:01:44 +0000 (11:01 -0500)]
Using helper.each instead of Array.prototype.map
Jake [Fri, 30 Jan 2015 02:43:02 +0000 (21:43 -0500)]
Update .travis.yml
William Entriken [Thu, 29 Jan 2015 21:54:45 +0000 (16:54 -0500)]
Merge pull request #867 from bendxn/master
Doughnut charts handling negative values
Evert Timberg [Wed, 28 Jan 2015 22:55:47 +0000 (17:55 -0500)]
Merge pull request #889 from bjornarg/cancelanimframe-fix
Fix issue with "Illegal invocation" in cancelAnimFrame.
Jake [Wed, 28 Jan 2015 19:22:28 +0000 (14:22 -0500)]
ADD GH PR guidelines
Evert Timberg [Tue, 27 Jan 2015 23:31:03 +0000 (18:31 -0500)]
Fix a divide by 0 error when there is only 1 label
William Entriken [Tue, 27 Jan 2015 19:04:10 +0000 (14:04 -0500)]
Merge pull request #551 from mparramont/patch-1
Fix global config multiTooltipTemplate comment
William Entriken [Tue, 27 Jan 2015 19:03:13 +0000 (14:03 -0500)]
Merge pull request #553 from johnheroy/master
Documentation: change lineColor to strokeColor for the first 3 example charts
William Entriken [Tue, 27 Jan 2015 18:48:47 +0000 (13:48 -0500)]
Merge pull request #694 from spmjs/master
Add spm support
William Entriken [Tue, 27 Jan 2015 18:35:30 +0000 (13:35 -0500)]
Clean up PR process
Bjørnar Grip Fjær [Sun, 25 Jan 2015 17:31:35 +0000 (18:31 +0100)]
Fix issue with "Illegal invocation" in cancelAnimFrame.
Ben Dixon [Tue, 27 Jan 2015 00:49:17 +0000 (18:49 -0600)]
Merge remote-tracking branch 'upstream/master'
Evert Timberg [Mon, 26 Jan 2015 23:55:49 +0000 (18:55 -0500)]
Merge pull request #142 from JonRowe/automatically_size_chart
Automatically size charts based upon the canvas size.
Christopher Weiss [Mon, 26 Jan 2015 21:33:24 +0000 (16:33 -0500)]
Update 05-Pie-Doughnut-Chart.md
Christopher Weiss [Mon, 26 Jan 2015 21:28:11 +0000 (16:28 -0500)]
Removed custom hue(), using hsl()
Jon Rowe [Thu, 27 Jun 2013 06:14:48 +0000 (16:14 +1000)]
force calculated width/heights back to context, for firefox compatibility
Jon Rowe [Wed, 19 Jun 2013 05:00:37 +0000 (15:00 +1000)]
make charts dependent on calculated width
Evert Timberg [Mon, 26 Jan 2015 02:29:22 +0000 (21:29 -0500)]
Merge pull request #890 from jakesyl/master
Update CONTRIBUTING.md
Jake [Mon, 26 Jan 2015 01:48:33 +0000 (20:48 -0500)]
Update CONTRIBUTING.md
William Entriken [Fri, 23 Jan 2015 20:15:58 +0000 (15:15 -0500)]
Merge pull request #703 from etimberg/fix/polar_area_update
Ensure that scales for polar area graphs are regenerated on updates.
Ben Dixon [Thu, 15 Jan 2015 19:40:08 +0000 (13:40 -0600)]
handling negative values in doughnut charts
Ben Dixon [Thu, 15 Jan 2015 19:38:20 +0000 (13:38 -0600)]
Revert "doughnut charts handling negative values"
This reverts commit
8b3a98f24267c50dd527c16b0b3d9ca744e6e4e4 .
Ben Dixon [Thu, 15 Jan 2015 19:31:54 +0000 (13:31 -0600)]
doughnut charts handling negative values
William Entriken [Thu, 8 Jan 2015 14:40:54 +0000 (09:40 -0500)]
formatting
William Entriken [Thu, 8 Jan 2015 14:39:49 +0000 (09:39 -0500)]
typo
Nick Downie [Wed, 7 Jan 2015 22:49:33 +0000 (22:49 +0000)]
1.0.1 release builds
Nick Downie [Wed, 7 Jan 2015 22:44:59 +0000 (22:44 +0000)]
Merge pull request #611 from fntneves/feature/toggle-grid-lines
Add option to toggle grid vertical/horizontal lines
Nick Downie [Wed, 7 Jan 2015 22:44:02 +0000 (22:44 +0000)]
Merge pull request #840 from tannerlinsley/master
External Tooltips, Documentation and Samples
Tanner Linsley [Wed, 7 Jan 2015 05:53:30 +0000 (22:53 -0700)]
externalTooltips now labeled customTooltips
Evert Timberg [Wed, 7 Jan 2015 00:17:01 +0000 (19:17 -0500)]
Merge pull request #855 from nnnick/fix/reset-canvas
Restore original canvas context when destroying
Nick Downie [Wed, 7 Jan 2015 00:07:06 +0000 (00:07 +0000)]
Space between status badges
Nick Downie [Tue, 6 Jan 2015 23:44:51 +0000 (23:44 +0000)]
Restore original canvas context when destroying
Jake [Sun, 4 Jan 2015 22:14:15 +0000 (17:14 -0500)]
Merge pull request #850 from jakesyl/master
Increment Copyright Year
Jake [Sun, 4 Jan 2015 22:12:58 +0000 (17:12 -0500)]
Update Chart.Core.js
William Entriken [Sun, 4 Jan 2015 04:00:53 +0000 (23:00 -0500)]
Merge pull request #846 from nnnick/fix/ci-builds
Fix Travis builds
Nick Downie [Sat, 3 Jan 2015 17:26:21 +0000 (17:26 +0000)]
Merge pull request #842 from nnnick/fix/contributing-guidelines
Rewrite contributing guidelines
Nick Downie [Sat, 3 Jan 2015 17:19:28 +0000 (17:19 +0000)]
Remove checking .min file in CI
Nick Downie [Sat, 3 Jan 2015 15:49:58 +0000 (15:49 +0000)]
Remove email notifications
Nick Downie [Sat, 3 Jan 2015 15:40:47 +0000 (15:40 +0000)]
Remove unnecessary semicolons
Nick Downie [Sat, 3 Jan 2015 15:40:33 +0000 (15:40 +0000)]
Fix mixed whitespace
Nick Downie [Sat, 3 Jan 2015 15:30:58 +0000 (15:30 +0000)]
Add Stack Overflow tag link to README
Jake [Sat, 3 Jan 2015 03:57:33 +0000 (22:57 -0500)]
Merge pull request #844 from jakesyl/master
move build status next to code climate button
Jake [Sat, 3 Jan 2015 03:56:58 +0000 (22:56 -0500)]
move build status next to code climate
Nick Downie [Thu, 1 Jan 2015 23:49:10 +0000 (23:49 +0000)]
Link to contributing guide from readme
Nick Downie [Thu, 1 Jan 2015 23:46:02 +0000 (23:46 +0000)]
Bump copyright year in license
Nick Downie [Thu, 1 Jan 2015 23:45:52 +0000 (23:45 +0000)]
Rewrite contributing guidelines
William Entriken [Thu, 1 Jan 2015 17:57:21 +0000 (12:57 -0500)]
Add Travis CI support
Tanner Linsley [Tue, 30 Dec 2014 17:51:10 +0000 (10:51 -0700)]
External Tooltips, Documentation, and Samples
Jake [Tue, 30 Dec 2014 19:25:23 +0000 (14:25 -0500)]
Merge pull request #841 from jakesyl/codeclimate
Move Code Climate Badge
Jake [Tue, 30 Dec 2014 19:24:55 +0000 (14:24 -0500)]
Move Code Climate Badge
Jake [Tue, 30 Dec 2014 19:03:40 +0000 (14:03 -0500)]
Delete `dev` instruction
@nnnick will rewrite this
Jake [Mon, 29 Dec 2014 22:21:59 +0000 (17:21 -0500)]
Merge pull request #750 from CAYdenberg/nnnick
Added link to CAYdenberg/Chart.js
Jake [Mon, 29 Dec 2014 21:18:44 +0000 (16:18 -0500)]
Update CONTRIBUTING.md
Jake [Mon, 29 Dec 2014 20:56:52 +0000 (15:56 -0500)]
Update CONTRIBUTING.md
Jake [Mon, 29 Dec 2014 20:55:17 +0000 (15:55 -0500)]
Update CONTRIBUTING.md
Nick Downie [Mon, 29 Dec 2014 20:42:54 +0000 (20:42 +0000)]
Merge pull request #650 from fulldecent/patch-2
[CONTROVERSIAL] Update scope: new chart types are off topic
William Entriken [Mon, 29 Dec 2014 20:41:39 +0000 (15:41 -0500)]
Merge pull request #5 from fulldecent/origin/patch-2
Origin/patch 2
William Entriken [Mon, 29 Dec 2014 20:40:09 +0000 (15:40 -0500)]
Update readme about where to put new chart types