]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoMerge branch 'master' into file-size-reduction 2491/head
Evert Timberg [Thu, 12 May 2016 22:57:22 +0000 (18:57 -0400)] 
Merge branch 'master' into file-size-reduction

Conflicts:
src/controllers/controller.doughnut.js
src/controllers/controller.polarArea.js

9 years agoUpdate doc files for ticks.minRotation v2.1.3
Evert Timberg [Thu, 12 May 2016 22:42:52 +0000 (18:42 -0400)] 
Update doc files for ticks.minRotation

9 years ago2.1.3 release
Evert Timberg [Thu, 12 May 2016 22:41:22 +0000 (18:41 -0400)] 
2.1.3 release

9 years agoMerge branch 'tomduncalf-iso_weekday'
Evert Timberg [Thu, 12 May 2016 22:24:34 +0000 (18:24 -0400)] 
Merge branch 'tomduncalf-iso_weekday'

9 years agoMerge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf...
Evert Timberg [Thu, 12 May 2016 22:24:14 +0000 (18:24 -0400)] 
Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf-iso_weekday

Conflicts:
docs/01-Scales.md

9 years agoMerge branch 'master' of https://github.com/nnnick/Chart.js
Evert Timberg [Thu, 12 May 2016 22:22:55 +0000 (18:22 -0400)] 
Merge branch 'master' of https://github.com/nnnick/Chart.js

Conflicts:
docs/01-Scales.md

9 years agoMerge branch 'tomduncalf-label_offset'
Evert Timberg [Thu, 12 May 2016 22:21:40 +0000 (18:21 -0400)] 
Merge branch 'tomduncalf-label_offset'

9 years agoMerge pull request #2524 from ashiguruma/master
Evert Timberg [Thu, 12 May 2016 22:20:40 +0000 (18:20 -0400)] 
Merge pull request #2524 from ashiguruma/master

Allow canvas patterns instead of colors

9 years agoMerge branch 'master' of github.com:ashiguruma/Chart.js 2524/head
Tom Loudon [Thu, 12 May 2016 22:00:53 +0000 (23:00 +0100)] 
Merge branch 'master' of github.com:ashiguruma/Chart.js

* 'master' of github.com:ashiguruma/Chart.js:
  Added CanvasPattern global flag for jshint

9 years agoAdded CanvasPattern global flag for jshint
Tom Loudon [Thu, 12 May 2016 21:24:20 +0000 (22:24 +0100)] 
Added CanvasPattern global flag for jshint

The core.helpers file was failing linting checks as the global CanvasPattern was not defined. Added the `/* global CanvasGradient */` statement to make linting pass. Updates chartjs/Chart.js#1323

9 years agoAdded CanvasPattern global flag for jshint
Tom Loudon [Thu, 12 May 2016 21:24:20 +0000 (22:24 +0100)] 
Added CanvasPattern global flag for jshint

The core.helpers file was failing linting checks as the global CanvasPattern was not defined. Added the `/* global CanvasGradient */` statement to make linting pass. Updates chartjs/Chart.js#1323

9 years agoMerge pull request #2531 from matt-watson90/patch-1
Evert Timberg [Thu, 12 May 2016 16:09:39 +0000 (12:09 -0400)] 
Merge pull request #2531 from matt-watson90/patch-1

Fixed copy paste error in 01-Scales.md

9 years agoMerge pull request #2530 from cw0102/master
Evert Timberg [Thu, 12 May 2016 16:09:26 +0000 (12:09 -0400)] 
Merge pull request #2530 from cw0102/master

Update 03-Bar-Chart.md

9 years agoFixed copy paste error in 01-Scales.md 2531/head
Matt Watson [Thu, 12 May 2016 16:02:20 +0000 (17:02 +0100)] 
Fixed copy paste error in 01-Scales.md

9 years agoUpdate 03-Bar-Chart.md 2530/head
cw0102 [Thu, 12 May 2016 15:56:04 +0000 (11:56 -0400)] 
Update 03-Bar-Chart.md

Fix documentation of stacked option to be a subset of the axes rather than a global attribute on a bar chart. The attribute chart was inconsistent with the example below it.

9 years agoAdd labelOffset option to scales 2517/head
Tom Duncalf [Wed, 11 May 2016 09:43:22 +0000 (10:43 +0100)] 
Add labelOffset option to scales

9 years agoAdd isoWeekday option to allow time scale ticks in 'week' unit mode to start on a... 2515/head
Tom Duncalf [Wed, 11 May 2016 08:34:22 +0000 (09:34 +0100)] 
Add isoWeekday option to allow time scale ticks in 'week' unit mode to start on a specified day of the week

9 years agoMerge pull request #2511 from zachpanz88/build-update
Zach Panzarino [Tue, 10 May 2016 20:45:54 +0000 (16:45 -0400)] 
Merge pull request #2511 from zachpanz88/build-update

Update CDN on bump

9 years agoAllow pattern hover state in all chart types
Tom Loudon [Tue, 10 May 2016 16:25:24 +0000 (17:25 +0100)] 
Allow pattern hover state in all chart types

Updated all chart types to use the helper.getHoverColor. Pattern fills can now be specified for both fill and line portions of a chart. Updates chartjs/Chart.js#1323

9 years agoUpdate CDN on bump 2511/head
Zach Panzarino [Tue, 10 May 2016 15:12:22 +0000 (15:12 +0000)] 
Update CDN on bump

9 years agoMerge pull request #2510 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate
Evert Timberg [Tue, 10 May 2016 15:05:03 +0000 (11:05 -0400)] 
Merge pull request #2510 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate

Added new plugin Callback `afterScaleUpdate`

9 years agoFollowing a Slack conversation tadd new Callback to allow updates to datasets config... 2510/head
Tarqwyn [Tue, 10 May 2016 14:01:30 +0000 (15:01 +0100)] 
Following a Slack conversation tadd new Callback to allow updates to datasets config (ie borderColor) based on results of the calculated scale, A typical use case would be apply a Gradient fill.

On branch feature_New_plugin_interface_afterScaleUpdate
Changes to be committed:
modified:   dist/Chart.bundle.js
modified:   dist/Chart.bundle.min.js

 #On branch feature_New_plugin_interface_afterScaleUpdate
 #Changes to be committed:

9 years agoMerge pull request #2509 from chartjs/revert-2508-feature_New_plugin_interface_afterS...
Evert Timberg [Tue, 10 May 2016 14:28:32 +0000 (10:28 -0400)] 
Merge pull request #2509 from chartjs/revert-2508-feature_New_plugin_interface_afterScaleUpdate

Revert "Added new plugin Callback `afterScaleUpdate`"

9 years agoRevert "Added new plugin Callback `afterScaleUpdate`" 2509/head
Evert Timberg [Tue, 10 May 2016 14:28:24 +0000 (10:28 -0400)] 
Revert "Added new plugin Callback `afterScaleUpdate`"

9 years agoMerge pull request #2508 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate
Evert Timberg [Tue, 10 May 2016 14:28:01 +0000 (10:28 -0400)] 
Merge pull request #2508 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate

Added new plugin Callback `afterScaleUpdate`

9 years agoDoh!! removed the built files 2508/head
Tarqwyn [Tue, 10 May 2016 14:23:02 +0000 (15:23 +0100)] 
Doh!! removed the built files

9 years agoAdded new plugin Callback `afterScaleUpdate`
Tarqwyn [Tue, 10 May 2016 14:01:30 +0000 (15:01 +0100)] 
Added new plugin Callback `afterScaleUpdate`

Following a Slack conversation tadd new Callback to allow updates to datasets config (ie borderColor) based on results of the calculated scale, A typical use case would be apply a Gradient fill.

On branch feature_New_plugin_interface_afterScaleUpdate
Changes to be committed:
modified:   dist/Chart.bundle.js
modified:   dist/Chart.bundle.min.js

9 years agoMerge pull request #2505 from tomduncalf/add_min_rotation
Evert Timberg [Tue, 10 May 2016 13:03:47 +0000 (09:03 -0400)] 
Merge pull request #2505 from tomduncalf/add_min_rotation

Add minRotation support

9 years agoAdd minRotation support 2505/head
Tom Duncalf [Tue, 10 May 2016 11:10:01 +0000 (12:10 +0100)] 
Add minRotation support

9 years agoallow callback or userCallback in the time scale
Evert Timberg [Mon, 9 May 2016 22:14:25 +0000 (18:14 -0400)] 
allow callback or userCallback in the time scale

9 years agoMake the afterUpdate plugin method more useful
Evert Timberg [Mon, 9 May 2016 22:14:15 +0000 (18:14 -0400)] 
Make the afterUpdate plugin method more useful

9 years agoRemoved 'background' from hover color helper name.
Tom Loudon [Mon, 9 May 2016 06:24:32 +0000 (07:24 +0100)] 
Removed 'background' from hover color helper name.

Patterns could be used for style attributes other than background e.g. stroke. Updates  chartjs/Chart.js#1323

9 years agoUpdate CDN in Readme to 2.1.2
Zach Panzarino [Sun, 8 May 2016 20:19:36 +0000 (16:19 -0400)] 
Update CDN in Readme to 2.1.2

9 years agoCasually codify 1.x policy. Fixes #2305
William Entriken [Sun, 8 May 2016 19:02:32 +0000 (15:02 -0400)] 
Casually codify 1.x policy. Fixes #2305

9 years ago2.1.2 release v2.1.2
Evert Timberg [Sun, 8 May 2016 15:26:48 +0000 (11:26 -0400)] 
2.1.2 release

9 years agoMerge pull request #2493 from chartjs/fix/2492
Evert Timberg [Sun, 8 May 2016 15:11:48 +0000 (11:11 -0400)] 
Merge pull request #2493 from chartjs/fix/2492

Calculate tick width for bars using number of ticks

9 years agoLogarithmic scale improvements
Evert Timberg [Sun, 8 May 2016 13:24:45 +0000 (09:24 -0400)] 
Logarithmic scale improvements

9 years agoMore linear scale work
Evert Timberg [Sun, 8 May 2016 12:32:48 +0000 (08:32 -0400)] 
More linear scale work

9 years agoMerge branch 'master' into file-size-reduction
Evert Timberg [Sun, 8 May 2016 12:11:16 +0000 (08:11 -0400)] 
Merge branch 'master' into file-size-reduction

9 years agoLinear scale improvements
Evert Timberg [Sun, 8 May 2016 11:55:29 +0000 (07:55 -0400)] 
Linear scale improvements

9 years agoMinor improvement to polar area controller
Evert Timberg [Sun, 8 May 2016 01:37:24 +0000 (21:37 -0400)] 
Minor improvement to polar area controller

9 years agoEnsure that when calculating tick width in the bar controller, we use the number... 2493/head
Evert Timberg [Sun, 8 May 2016 01:28:13 +0000 (21:28 -0400)] 
Ensure that when calculating tick width in the bar controller, we use the number of ticks in the scale, not the number of data points.

9 years agoImprovements to polar area controller. Moved common draw code up to core dataset...
Evert Timberg [Sun, 8 May 2016 01:04:39 +0000 (21:04 -0400)] 
Improvements to polar area controller. Moved common draw code up to core dataset controller

9 years agoMore donut improvements
Evert Timberg [Sat, 7 May 2016 23:47:40 +0000 (19:47 -0400)] 
More donut improvements

9 years agoAdded helper to allow a CanvasPattern for hover. Updates chartjs/Chart.js#1323
Tom Loudon [Sat, 7 May 2016 21:24:00 +0000 (22:24 +0100)] 
Added helper to allow a CanvasPattern for hover. Updates chartjs/Chart.js#1323

When a hover background isn't specified in the config for a chart a modified version of the default color is used. If the background color is a CanvasPattern object an error is triggered.

With this change the default background color will no longer be modified if it is a CanvasPattern.

9 years agoget a little more from the point element
Evert Timberg [Sat, 7 May 2016 21:09:17 +0000 (17:09 -0400)] 
get a little more from the point element

9 years agoMerge pull request #2490 from chartjs/fix/2476
Evert Timberg [Sat, 7 May 2016 21:04:37 +0000 (17:04 -0400)] 
Merge pull request #2490 from chartjs/fix/2476

beginAtZero and linear scales with no data should play nice

9 years agoRevert unnecessary changes
Evert Timberg [Sat, 7 May 2016 21:04:34 +0000 (17:04 -0400)] 
Revert unnecessary changes

9 years agoRevert "Reduce element.point size"
Evert Timberg [Sat, 7 May 2016 21:00:00 +0000 (17:00 -0400)] 
Revert "Reduce element.point size"

This reverts commit 09bcac9b5c699c75909b77dc40dc40b5a3af1030.

9 years agobeginAtZero and linear scales with no data should play nice 2490/head
Evert Timberg [Sat, 7 May 2016 20:56:04 +0000 (16:56 -0400)] 
beginAtZero and linear scales with no data should play nice

9 years agoMerge pull request #2489 from chartjs/fix/2480
Evert Timberg [Sat, 7 May 2016 20:44:26 +0000 (16:44 -0400)] 
Merge pull request #2489 from chartjs/fix/2480

Use local variables + don't include text width for vertical scales with mirrored text

9 years agoUse local variables + don't include text width for vertical scales with mirrored... 2489/head
Evert Timberg [Sat, 7 May 2016 20:26:44 +0000 (16:26 -0400)] 
Use local variables + don't include text width for vertical scales with mirrored text

9 years agoMerge pull request #2488 from chartjs/fix/2472
Evert Timberg [Sat, 7 May 2016 18:24:19 +0000 (14:24 -0400)] 
Merge pull request #2488 from chartjs/fix/2472

Scales should have 0 cross size when not displayed

9 years agoScales should have 0 cross size when not displayed 2488/head
Evert Timberg [Sat, 7 May 2016 18:18:36 +0000 (14:18 -0400)] 
Scales should have 0 cross size when not displayed

9 years agoMerge pull request #2486 from chartjs/fix/2330
Evert Timberg [Sat, 7 May 2016 15:47:21 +0000 (11:47 -0400)] 
Merge pull request #2486 from chartjs/fix/2330

Allow updating scale defaults

9 years agoAllow updating scale defaults 2486/head
Evert Timberg [Sat, 7 May 2016 15:43:24 +0000 (11:43 -0400)] 
Allow updating scale defaults

9 years agoUpdate CDN in README to 2.1.1
Zach Panzarino [Sat, 7 May 2016 15:42:51 +0000 (11:42 -0400)] 
Update CDN in README to 2.1.1

9 years agoMerge pull request #2484 from chartjs/release/2.1.1 v2.1.1
Evert Timberg [Sat, 7 May 2016 12:16:14 +0000 (08:16 -0400)] 
Merge pull request #2484 from chartjs/release/2.1.1

2.1.1 release build

9 years ago2.1.1 release build 2484/head
Evert Timberg [Sat, 7 May 2016 12:07:09 +0000 (08:07 -0400)] 
2.1.1 release build

9 years agoMerge pull request #2475 from chartjs/fix/2471
Evert Timberg [Sat, 7 May 2016 11:55:27 +0000 (07:55 -0400)] 
Merge pull request #2475 from chartjs/fix/2471

Fix time scale grid lines

9 years agoFix time scale grid lines 2475/head
Evert Timberg [Fri, 6 May 2016 11:57:28 +0000 (07:57 -0400)] 
Fix time scale grid lines

9 years agoMerge pull request #2473 from chartjs/fix/tension
Evert Timberg [Fri, 6 May 2016 11:29:04 +0000 (07:29 -0400)] 
Merge pull request #2473 from chartjs/fix/tension

Fix line tension drawing, especially when set to 0

9 years agoFix line tension drawing, especially when set to 0 2473/head
Evert Timberg [Fri, 6 May 2016 11:19:38 +0000 (07:19 -0400)] 
Fix line tension drawing, especially when set to 0

9 years agoCore.Title reductions 2470/head
Evert Timberg [Fri, 6 May 2016 01:01:48 +0000 (21:01 -0400)] 
Core.Title reductions

9 years agoDoughnut controller size reductions
Evert Timberg [Fri, 6 May 2016 00:47:33 +0000 (20:47 -0400)] 
Doughnut controller size reductions

9 years agoReduce element.point size
Evert Timberg [Fri, 6 May 2016 00:00:11 +0000 (20:00 -0400)] 
Reduce element.point size

9 years agoMerge pull request #2468 from dmk2014/master
Evert Timberg [Thu, 5 May 2016 16:09:27 +0000 (12:09 -0400)] 
Merge pull request #2468 from dmk2014/master

Update Legend Documentation

9 years agoUpdate legend docs -> parameter 'data' has changed to 'chart'. 2468/head
Darren Keane [Thu, 5 May 2016 15:57:50 +0000 (16:57 +0100)] 
Update legend docs -> parameter 'data' has changed to 'chart'.

9 years agoMerge pull request #2463 from chartjs/file-size-reduction
Evert Timberg [Thu, 5 May 2016 02:21:36 +0000 (22:21 -0400)] 
Merge pull request #2463 from chartjs/file-size-reduction

File size reduction

9 years agoFix jshint issue 2463/head
Evert Timberg [Thu, 5 May 2016 02:16:07 +0000 (22:16 -0400)] 
Fix jshint issue

9 years agoSize reduction for elements
Evert Timberg [Thu, 5 May 2016 02:08:55 +0000 (22:08 -0400)] 
Size reduction for elements

9 years agocore dataset controller update
Evert Timberg [Thu, 5 May 2016 01:32:40 +0000 (21:32 -0400)] 
core dataset controller update

9 years agoReduce core.title.js size
Evert Timberg [Thu, 5 May 2016 01:08:59 +0000 (21:08 -0400)] 
Reduce core.title.js size

9 years agoMinor legend fix when going to next line
Evert Timberg [Thu, 5 May 2016 01:06:19 +0000 (21:06 -0400)] 
Minor legend fix when going to next line

9 years agoPlugin system is slightly smaller
Evert Timberg [Wed, 4 May 2016 23:35:01 +0000 (19:35 -0400)] 
Plugin system is slightly smaller

9 years agoReduce size of on-canvas legend
Evert Timberg [Wed, 4 May 2016 23:28:22 +0000 (19:28 -0400)] 
Reduce size of on-canvas legend

9 years agoMerge pull request #2462 from zachpanz88/build-fix
Evert Timberg [Wed, 4 May 2016 23:07:41 +0000 (19:07 -0400)] 
Merge pull request #2462 from zachpanz88/build-fix

Fix build to remove all comments other than header

9 years agoFix build to remove all comments other than header 2462/head
Zach Panzarino [Wed, 4 May 2016 22:54:10 +0000 (22:54 +0000)] 
Fix build to remove all comments other than header

9 years agoMerge pull request #2416 from brizido/fix-tooltip-body
Evert Timberg [Wed, 4 May 2016 20:34:29 +0000 (16:34 -0400)] 
Merge pull request #2416 from brizido/fix-tooltip-body

Fix tooltip body

9 years agoUpdate bower.json to include correct homepage URL
Zach Panzarino [Wed, 4 May 2016 15:06:39 +0000 (11:06 -0400)] 
Update bower.json to include correct homepage URL

9 years agoUpdate README to include CDN for newest version (2.1.0)
Zach Panzarino [Wed, 4 May 2016 14:57:25 +0000 (10:57 -0400)] 
Update README to include CDN for newest version (2.1.0)

9 years ago2.1.0 build 2.1.0
Tanner Linsley [Tue, 3 May 2016 21:53:09 +0000 (16:53 -0500)] 
2.1.0 build

9 years agoFeature #73 - Horizontal Bar Chart (#2448)
potatopeelings [Tue, 3 May 2016 21:45:43 +0000 (07:45 +1000)] 
Feature #73 - Horizontal Bar Chart (#2448)

* Horizontal bar chart type

* Mentioned horizontal bar chart in bar documentation

* Sample file for horizontal bar chart

* Missing semicolon

* Fix for borderSkipped index

9 years agoMerge pull request #2433 from vincchan/fix-doc-links-anchors
Evert Timberg [Mon, 2 May 2016 14:21:57 +0000 (10:21 -0400)] 
Merge pull request #2433 from vincchan/fix-doc-links-anchors

fixes anchors and links in docs

9 years agochanges repo link to chartjs org 2433/head
Vincent Chan [Mon, 2 May 2016 14:01:26 +0000 (16:01 +0200)] 
changes repo link to chartjs org

9 years agofixes several anchors
Vincent Chan [Mon, 2 May 2016 13:57:32 +0000 (15:57 +0200)] 
fixes several anchors

9 years agoImprove time scale for zoom and pan
Evert Timberg [Sun, 1 May 2016 16:40:14 +0000 (12:40 -0400)] 
Improve time scale for zoom and pan

* Improve time scale for zoom and pan
Improve category scale when zoomed

* Fix CI test

9 years agoUpdated build
Evert Timberg [Sat, 30 Apr 2016 15:16:34 +0000 (11:16 -0400)] 
Updated build

9 years agoImplement getValueForPixel for category scale
Evert Timberg [Sat, 30 Apr 2016 12:39:18 +0000 (08:39 -0400)] 
Implement getValueForPixel for category scale

9 years agoIncrease tolerance for CI
Evert Timberg [Sat, 30 Apr 2016 00:07:42 +0000 (20:07 -0400)] 
Increase tolerance for CI

9 years agoMerge from feature/pan-support
Evert Timberg [Sat, 30 Apr 2016 00:03:15 +0000 (20:03 -0400)] 
Merge from feature/pan-support
All tests are passing

9 years agoMerge pull request #2421 from mchateloin/pie-demo-randomize-colors
Evert Timberg [Fri, 29 Apr 2016 22:18:38 +0000 (18:18 -0400)] 
Merge pull request #2421 from mchateloin/pie-demo-randomize-colors

Randomize data button randomizes colors in pie chart demo

9 years agoRandomize data button randomizes colors in pie chart demo 2421/head
Miguel Chateloin [Fri, 29 Apr 2016 21:47:27 +0000 (17:47 -0400)] 
Randomize data button randomizes colors in pie chart demo

9 years agoInclude correct script in pie custom tooltips sample
Zach Panzarino [Fri, 29 Apr 2016 17:08:59 +0000 (17:08 +0000)] 
Include correct script in pie custom tooltips sample
Fixes issue #2369

9 years agoFix tooltip body 2416/head
Ricardo Brizido [Fri, 29 Apr 2016 11:11:15 +0000 (12:11 +0100)] 
Fix tooltip body

9 years agoAdd license field to package files
Zach Panzarino [Fri, 29 Apr 2016 03:23:13 +0000 (03:23 +0000)] 
Add license field to package files

9 years agoMerge pull request #2412 from zachpanz88/patch-3
Evert Timberg [Fri, 29 Apr 2016 00:21:39 +0000 (20:21 -0400)] 
Merge pull request #2412 from zachpanz88/patch-3

Enable line tests

9 years agoMerge pull request #2413 from dougmolineux/master
Evert Timberg [Fri, 29 Apr 2016 00:18:46 +0000 (20:18 -0400)] 
Merge pull request #2413 from dougmolineux/master

Added a <br>

9 years agoEnable line tests 2412/head
Zach Panzarino [Thu, 28 Apr 2016 23:05:18 +0000 (23:05 +0000)] 
Enable line tests

9 years agoAdded a <br> 2413/head
Doug Molineux [Thu, 28 Apr 2016 22:52:40 +0000 (16:52 -0600)] 
Added a <br>

The additional line will make the legend accessible.
https://github.com/chartjs/Chart.js/issues/2389