]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoMerge pull request #1092 from tannerlinsley/negative-arcs-fix 1698/head
Evert Timberg [Tue, 17 Nov 2015 02:17:46 +0000 (21:17 -0500)] 
Merge pull request #1092 from tannerlinsley/negative-arcs-fix

Only draw positive radius arcs Fixes #592

9 years agoTypo: consistent capitalization
William Entriken [Mon, 16 Nov 2015 23:11:22 +0000 (18:11 -0500)] 
Typo: consistent capitalization

9 years agoMerge pull request #1621 from jakesyl/add-composer
Jake [Sun, 8 Nov 2015 19:37:41 +0000 (14:37 -0500)] 
Merge pull request #1621 from jakesyl/add-composer

Add Composer file

9 years agoadd composer file 1621/head
Jake [Thu, 5 Nov 2015 18:22:04 +0000 (13:22 -0500)] 
add composer file

add composer file

9 years agoMerge pull request #1589 from zachpanz88/patch-1
Jake [Wed, 4 Nov 2015 18:07:25 +0000 (13:07 -0500)] 
Merge pull request #1589 from zachpanz88/patch-1

Change license link

9 years agoMerge pull request #1190 from Nek-/patch-1
Evert Timberg [Sun, 1 Nov 2015 22:16:22 +0000 (17:16 -0500)] 
Merge pull request #1190 from Nek-/patch-1

Added ignore section

9 years agoMerge pull request #1262 from mattclegg/master
Evert Timberg [Sun, 1 Nov 2015 22:11:24 +0000 (17:11 -0500)] 
Merge pull request #1262 from mattclegg/master

Call onAnimationComplete when reached last frame

9 years agoChange license link 1589/head
Zach Panzarino [Thu, 29 Oct 2015 01:22:41 +0000 (21:22 -0400)] 
Change license link

The link to the license now points to the direct license that applies for chart.js, rather than a generic MIT license

9 years agoUpdate README.md
Tanner Linsley [Mon, 26 Oct 2015 18:44:48 +0000 (12:44 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Mon, 26 Oct 2015 18:43:50 +0000 (12:43 -0600)] 
Update README.md

9 years agoMerge pull request #1577 from yanarchy/patch-1
Tanner Linsley [Mon, 26 Oct 2015 18:42:54 +0000 (12:42 -0600)] 
Merge pull request #1577 from yanarchy/patch-1

Add npm info to getting started doc.

9 years agoAdd npm info to getting started doc. 1577/head
Yan Fan [Mon, 26 Oct 2015 18:41:01 +0000 (11:41 -0700)] 
Add npm info to getting started doc.

9 years agoUpdate README.md
Tanner Linsley [Sun, 25 Oct 2015 00:07:26 +0000 (18:07 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sun, 25 Oct 2015 00:06:59 +0000 (18:06 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sun, 25 Oct 2015 00:06:36 +0000 (18:06 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sun, 25 Oct 2015 00:05:24 +0000 (18:05 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sat, 24 Oct 2015 23:56:28 +0000 (17:56 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sat, 24 Oct 2015 23:55:34 +0000 (17:55 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sat, 24 Oct 2015 23:43:51 +0000 (17:43 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sat, 24 Oct 2015 23:37:18 +0000 (17:37 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Sat, 24 Oct 2015 23:26:10 +0000 (17:26 -0600)] 
Update README.md

9 years agoUpdate README.md
Tanner Linsley [Wed, 30 Sep 2015 18:06:26 +0000 (12:06 -0600)] 
Update README.md

9 years agoAdded Current 2.0 release to Readme
Tanner Linsley [Wed, 30 Sep 2015 17:59:09 +0000 (11:59 -0600)] 
Added Current 2.0 release to Readme

9 years agoMerge pull request #1476 from nnnick/v1.0-readme-update
Tanner Linsley [Fri, 25 Sep 2015 04:34:00 +0000 (22:34 -0600)] 
Merge pull request #1476 from nnnick/v1.0-readme-update

Update v1.x readme to reflect release status

9 years agoUpdate README.md 1476/head
Tanner Linsley [Fri, 25 Sep 2015 04:33:05 +0000 (22:33 -0600)] 
Update README.md

9 years agoUpdate v1.x readme to reflect release status
Tanner Linsley [Mon, 21 Sep 2015 20:28:10 +0000 (14:28 -0600)] 
Update v1.x readme to reflect release status

9 years agoMerge pull request #1067 from rvaidya/master
Evert Timberg [Thu, 17 Sep 2015 21:28:00 +0000 (17:28 -0400)] 
Merge pull request #1067 from rvaidya/master

Added a scaleBackgroundColors configuration option for radar charts, to...

9 years agoMerge pull request #1450 from nlzet/fix-legend-template-doc
Evert Timberg [Mon, 14 Sep 2015 22:44:04 +0000 (18:44 -0400)] 
Merge pull request #1450 from nlzet/fix-legend-template-doc

Fix span closed before appending the label

9 years agoFix span closed before appending the label 1450/head
NLZ13 [Sat, 12 Sep 2015 22:33:51 +0000 (00:33 +0200)] 
Fix span closed before appending the label

9 years agoMerge pull request #1449 from bgvianyc/master
Evert Timberg [Sat, 12 Sep 2015 15:10:40 +0000 (11:10 -0400)] 
Merge pull request #1449 from bgvianyc/master

adding template language reference to docs

9 years agoadding template language reference to docs 1449/head
Barry Gitarts [Sat, 12 Sep 2015 13:02:26 +0000 (09:02 -0400)] 
adding template language reference to docs

9 years agoMerge pull request #1439 from bengesoff/patch-2
Evert Timberg [Fri, 4 Sep 2015 17:49:49 +0000 (13:49 -0400)] 
Merge pull request #1439 from bengesoff/patch-2

fixed very small typo

9 years agofixed very small typo 1439/head
Ben Gesoff [Fri, 4 Sep 2015 16:08:58 +0000 (17:08 +0100)] 
fixed very small typo

wrong it's

10 years agoMerge pull request #1397 from coolbombom/patch-3
Tanner Linsley [Fri, 28 Aug 2015 22:29:30 +0000 (16:29 -0600)] 
Merge pull request #1397 from coolbombom/patch-3

Fix scale error before animation complete

10 years agoMerge pull request #1402 from hrniels/tooltip
Tanner Linsley [Fri, 28 Aug 2015 22:28:11 +0000 (16:28 -0600)] 
Merge pull request #1402 from hrniels/tooltip

Added tooltipTitleTemplate option.

10 years agoMerge pull request #1389 from ericjperry/fix/datasetStroke
Evert Timberg [Sat, 22 Aug 2015 13:39:20 +0000 (09:39 -0400)] 
Merge pull request #1389 from ericjperry/fix/datasetStroke

The datasetStroke option has been fixed for line graphs

10 years agoMerge pull request #1390 from internalfx/patch-1
Evert Timberg [Sat, 22 Aug 2015 13:38:03 +0000 (09:38 -0400)] 
Merge pull request #1390 from internalfx/patch-1

Closes #1309

10 years agoAdded tooltipTitleTemplate option. 1402/head
Nils Asmussen [Sat, 22 Aug 2015 11:47:01 +0000 (13:47 +0200)] 
Added tooltipTitleTemplate option.

10 years agoerror thrown 1397/head
coolbombom [Fri, 21 Aug 2015 08:53:52 +0000 (10:53 +0200)] 
error thrown

error thrown (TypeError: this.scale is undefined) if destroy is called before animation is complete, this update fix this error!

10 years agoCloses #1309 1390/head
Internalfx [Wed, 19 Aug 2015 01:39:11 +0000 (18:39 -0700)] 
Closes #1309

Doughnut.addData() broken for index of 0 #1309

10 years agoThe datasetStroke option has been fixed for line graphs 1389/head
Eric Perry [Tue, 18 Aug 2015 21:56:19 +0000 (17:56 -0400)] 
The datasetStroke option has been fixed for line graphs

10 years agoMerge pull request #1382 from bengesoff/patch-1
Evert Timberg [Tue, 18 Aug 2015 14:42:11 +0000 (10:42 -0400)] 
Merge pull request #1382 from bengesoff/patch-1

fixed two typos

10 years agofixed two typos 1382/head
Ben Gesoff [Mon, 17 Aug 2015 15:37:01 +0000 (16:37 +0100)] 
fixed two typos

wrong it's

10 years agoMerge pull request #1308 from eunicekokor/patch-1
Tanner Linsley [Wed, 22 Jul 2015 17:32:08 +0000 (11:32 -0600)] 
Merge pull request #1308 from eunicekokor/patch-1

Update 00-Getting-Started.md

10 years agoMerge pull request #1181 from paulmasson/master
Evert Timberg [Sat, 18 Jul 2015 12:01:29 +0000 (08:01 -0400)] 
Merge pull request #1181 from paulmasson/master

Update CDN link

10 years agoUpdate 00-Getting-Started.md 1308/head
eunice [Tue, 14 Jul 2015 00:45:27 +0000 (17:45 -0700)] 
Update 00-Getting-Started.md

Closes a small issue I found while going through the documentation https://github.com/nnnick/Chart.js/issues/1307

10 years agoMerge pull request #1268 from klaemo/patch-1
Evert Timberg [Wed, 1 Jul 2015 13:04:44 +0000 (09:04 -0400)] 
Merge pull request #1268 from klaemo/patch-1

add license to package.json

10 years agoadd license to package.json 1268/head
Clemens Stolle [Wed, 1 Jul 2015 09:03:00 +0000 (11:03 +0200)] 
add license to package.json

just to be a good npm citizen :)

10 years agoMerge branch 'master' of github.com:nnnick/Chart.js 1262/head
mattclegg [Tue, 30 Jun 2015 10:13:37 +0000 (11:13 +0100)] 
Merge branch 'master' of github.com:nnnick/Chart.js

# By Amir E. Aharoni
# Via Amir E. Aharoni (1) and Evert Timberg (1)
* 'master' of github.com:nnnick/Chart.js:
  Fix the spelling of "separate"

10 years agoCall onAnimationComplete when reached last frame
mattclegg [Tue, 30 Jun 2015 10:13:30 +0000 (11:13 +0100)] 
Call onAnimationComplete when reached last frame

10 years agoMerge pull request #1241 from amire80/spelling
Evert Timberg [Mon, 22 Jun 2015 22:12:38 +0000 (18:12 -0400)] 
Merge pull request #1241 from amire80/spelling

Fix the spelling of "separate"

10 years agoFix the spelling of "separate" 1241/head
Amir E. Aharoni [Mon, 22 Jun 2015 22:01:59 +0000 (01:01 +0300)] 
Fix the spelling of "separate"

10 years agoAdded ignore section 1190/head
Maxime Veber [Wed, 10 Jun 2015 20:32:23 +0000 (22:32 +0200)] 
Added ignore section

10 years agoUpdate CDN link 1181/head
paulmasson [Mon, 8 Jun 2015 23:45:47 +0000 (16:45 -0700)] 
Update CDN link

10 years agoMerge pull request #1127 from leighquince/fix/radar-datasetfill-option 1239/head
Evert Timberg [Wed, 20 May 2015 21:54:17 +0000 (17:54 -0400)] 
Merge pull request #1127 from leighquince/fix/radar-datasetfill-option

fix for radar chart ignoring datasetFill option

10 years agofix for radar chart ignoring datasetFill option 1127/head
Leigh Quince [Wed, 20 May 2015 19:43:29 +0000 (21:43 +0200)] 
fix for radar chart ignoring datasetFill option

10 years agoMerge pull request #1122 from ismeta/fix-span-tag
Evert Timberg [Sat, 16 May 2015 12:37:38 +0000 (08:37 -0400)] 
Merge pull request #1122 from ismeta/fix-span-tag

Fixes #886 - Close span tags properly in legend generation template.

10 years agoFixes #886 - Close span tags properly in legend generation template. 1122/head
Vanessa Ung [Sat, 16 May 2015 05:31:56 +0000 (15:31 +1000)] 
Fixes #886 - Close span tags properly in legend generation template.

10 years agoRevert "Merge pull request #856 from tannerlinsley/editable-chart-config"
Tanner Linsley [Tue, 12 May 2015 00:57:14 +0000 (18:57 -0600)] 
Revert "Merge pull request #856 from tannerlinsley/editable-chart-config"

This reverts commit a8063de6b8a744b0ad117d20ef7c9138147212f3, reversing
changes made to 7f513b87eefc7319f31a4e5590bdd916398ca44d.

10 years agoMerge pull request #1066 from tannerlinsley/add-stacked-area
Evert Timberg [Thu, 7 May 2015 00:31:27 +0000 (20:31 -0400)] 
Merge pull request #1066 from tannerlinsley/add-stacked-area

Add StackedArea chart type to community extensions

10 years agoMerge pull request #1098 from WouterSioen/fix-typo
Evert Timberg [Tue, 5 May 2015 18:39:35 +0000 (14:39 -0400)] 
Merge pull request #1098 from WouterSioen/fix-typo

Fix typo

10 years agoFix a typo: segment vs segement 1098/head
Wouter Sioen [Tue, 5 May 2015 08:11:29 +0000 (10:11 +0200)] 
Fix a typo: segment vs segement

Fix typo in PolarArea

Update 04-Polar-Area-Chart.md

10 years agoMerge pull request #1068 from nnnick/animation-refactory
William Entriken [Mon, 4 May 2015 19:55:59 +0000 (15:55 -0400)] 
Merge pull request #1068 from nnnick/animation-refactory

Animation refactory

10 years agoMerge pull request #856 from tannerlinsley/editable-chart-config
William Entriken [Mon, 4 May 2015 19:28:03 +0000 (15:28 -0400)] 
Merge pull request #856 from tannerlinsley/editable-chart-config

Data now editable right from chart config

10 years agoOnly draw positive radius arcs Fixes #592 1092/head
Tanner Linsley [Thu, 30 Apr 2015 21:49:52 +0000 (15:49 -0600)] 
Only draw positive radius arcs Fixes #592

10 years agoMerge pull request #952 from msmiley/patch-1
William Entriken [Fri, 24 Apr 2015 20:32:24 +0000 (16:32 -0400)] 
Merge pull request #952 from msmiley/patch-1

add datasetLabel for multiTooltip on dynamically-added points

10 years agoMerge pull request #851 from jtblin/master 1086/head
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

10 years agoMerge pull request #1069 from mackuba/fix_endpoint
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

10 years agoprevent taking vertical space for x labels more than once 1069/head
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

10 years agoRevert changes to build 1068/head
Tanner Linsley [Thu, 16 Apr 2015 19:57:27 +0000 (13:57 -0600)] 
Revert changes to build

10 years agoMerge pull request #1025 from pijey/feature/offsetgridlines-linechart
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

10 years agoMerge branch 'chasd00-piechart-redraw-after-zero-segment-values'
William Entriken [Thu, 16 Apr 2015 19:17:36 +0000 (15:17 -0400)] 
Merge branch 'chasd00-piechart-redraw-after-zero-segment-values'

10 years agoMerge #756 Fixes #661
William Entriken [Thu, 16 Apr 2015 19:17:28 +0000 (15:17 -0400)] 
Merge #756 Fixes #661

10 years agoDecouple radar chart background colors from angle line drawing so they can be passed... 1067/head
Rahul Vaidya [Thu, 16 Apr 2015 18:35:43 +0000 (11:35 -0700)] 
Decouple radar chart background colors from angle line drawing so they can be passed separately.

10 years agoFor radar chart background colors, don't recalculate center offset multiple times...
Rahul Vaidya [Thu, 16 Apr 2015 18:26:21 +0000 (11:26 -0700)] 
For radar chart background colors, don't recalculate center offset multiple times.  Verify that background color count is same as axes count.

10 years agoAdded a scaleBackgroundColors configuration option for Radial charts, to add a backgr...
Rahul Vaidya [Thu, 16 Apr 2015 08:23:09 +0000 (01:23 -0700)] 
Added a scaleBackgroundColors configuration option for Radial charts, to add a background color for each axis in the chart.

10 years agoAdd StackedArea chart type to community extensions 1066/head
Tanner Linsley [Thu, 16 Apr 2015 06:50:08 +0000 (00:50 -0600)] 
Add StackedArea chart type to community extensions

10 years agoDerped HTML attributes.
Nick Downie [Mon, 13 Apr 2015 15:35:14 +0000 (16:35 +0100)] 
Derped HTML attributes.

10 years agoMerge pull request #1062 from dima117/patch-1
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

10 years agoUpdate 06-Advanced.md 1062/head
dima117 [Mon, 13 Apr 2015 12:39:44 +0000 (15:39 +0300)] 
Update 06-Advanced.md

https://github.com/nnnick/Chart.js/issues/1060

10 years agoMerge pull request #677 from rylanhalteman/fix-yLabel-padding
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

10 years agoOnly start digest on first request. Cleanup
Tanner Linsley [Sun, 12 Apr 2015 06:05:31 +0000 (00:05 -0600)] 
Only start digest on first request. Cleanup

10 years agoUse findNextWhere correctly.
Evert Timberg [Sun, 12 Apr 2015 03:05:05 +0000 (23:05 -0400)] 
Use findNextWhere correctly.

10 years agoRemove the minAnimationSteps option since we did not end up needing it.
Evert Timberg [Sun, 12 Apr 2015 01:11:49 +0000 (21:11 -0400)] 
Remove the minAnimationSteps option since we did not end up needing it.

10 years agoRemove the unused lastTimeRun from the animation service
Evert Timberg [Sun, 12 Apr 2015 00:47:35 +0000 (20:47 -0400)] 
Remove the unused lastTimeRun from the animation service

10 years agoAlways execute last frame
Tanner Linsley [Sun, 12 Apr 2015 00:42:11 +0000 (18:42 -0600)] 
Always execute last frame

10 years agoMerge remote-tracking branch 'origin/animation-refactory' into animation-refactory
Tanner Linsley [Sun, 12 Apr 2015 00:37:01 +0000 (18:37 -0600)] 
Merge remote-tracking branch 'origin/animation-refactory' into animation-refactory

Conflicts:
src/Chart.Core.js

10 years agoFrame Dropper
Tanner Linsley [Sun, 12 Apr 2015 00:34:06 +0000 (18:34 -0600)] 
Frame Dropper

10 years agoImplement cancel animation frame in the animation service
Evert Timberg [Sun, 12 Apr 2015 00:17:46 +0000 (20:17 -0400)] 
Implement cancel animation frame in the animation service

10 years agoFix some bugs in the animation stuff
Evert Timberg [Sun, 12 Apr 2015 00:08:17 +0000 (20:08 -0400)] 
Fix some bugs in the animation stuff

10 years agoFix a typo
Evert Timberg [Sat, 11 Apr 2015 23:42:54 +0000 (19:42 -0400)] 
Fix a typo

10 years agoIntegrate animation service with chart
Evert Timberg [Sat, 11 Apr 2015 23:33:20 +0000 (19:33 -0400)] 
Integrate animation service with chart

10 years agoSrc changes... derrrr
Tanner Linsley [Sat, 11 Apr 2015 23:30:06 +0000 (17:30 -0600)] 
Src changes... derrrr

10 years agoMerge pull request #1058 from tannerlinsley/animation-refactory
Tanner Linsley [Sat, 11 Apr 2015 23:23:59 +0000 (17:23 -0600)] 
Merge pull request #1058 from tannerlinsley/animation-refactory

Chart.AnimationService

10 years agoChart.AnimationService 1058/head
Tanner Linsley [Sat, 11 Apr 2015 23:19:29 +0000 (17:19 -0600)] 
Chart.AnimationService

10 years agoAdd an option to control the minimum number of animation steps.
Evert Timberg [Sat, 11 Apr 2015 23:17:30 +0000 (19:17 -0400)] 
Add an option to control the minimum number of animation steps.

10 years agoChart animations will now use the animation service provided in Chart.animationService.
Evert Timberg [Sat, 11 Apr 2015 23:02:50 +0000 (19:02 -0400)] 
Chart animations will now use the animation service provided in Chart.animationService.

10 years agoMerge pull request #711 from cmweiss/master
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

10 years agoMerge pull request #1036 from dima117/master
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

10 years agohelpers.generateLabels throws "labelTemplateString is not defined" exception #1035 1036/head
dima117 [Tue, 31 Mar 2015 19:06:41 +0000 (22:06 +0300)] 
helpers.generateLabels throws "labelTemplateString is not defined" exception #1035