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

2006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evert Timberg
8c209405e9 Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf-iso_weekday 
Conflicts:
	docs/01-Scales.md
 2016-05-12 18:24:14 -04:00
Evert Timberg
41c043dd23 Merge branch 'master' of https://github.com/nnnick/Chart.js 
Conflicts:
	docs/01-Scales.md
 2016-05-12 18:22:55 -04:00
Evert Timberg
6de81a3580 Merge branch 'tomduncalf-label_offset' 2016-05-12 18:21:40 -04:00
Evert Timberg
47f770c3ef Merge pull request #2524 from ashiguruma/master 
Allow canvas patterns instead of colors
 2016-05-12 18:20:40 -04:00
Tom Loudon
a8df9d9891 Merge branch 'master' of github.com:ashiguruma/Chart.js 
* 'master' of github.com:ashiguruma/Chart.js:
  Added CanvasPattern global flag for jshint
 2016-05-12 23:00:53 +01:00
Tom Loudon
05bfb7e964 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
 2016-05-12 22:58:54 +01:00
Tom Loudon
44cc68d0ae 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
 2016-05-12 22:24:20 +01:00
Evert Timberg
38df95ee81 Merge pull request #2531 from matt-watson90/patch-1 
Fixed copy paste error in 01-Scales.md
 2016-05-12 12:09:39 -04:00
Evert Timberg
1c1bf1c5d8 Merge pull request #2530 from cw0102/master 
Update 03-Bar-Chart.md
 2016-05-12 12:09:26 -04:00
Matt Watson
41bf2418cb Fixed copy paste error in 01-Scales.md 2016-05-12 17:02:20 +01:00
cw0102
a6017a4196 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.
 2016-05-12 11:56:04 -04:00
Tom Duncalf
7ee5af81af Add labelOffset option to scales 2016-05-11 10:43:22 +01:00
Tom Duncalf
8b3d079a50 Add isoWeekday option to allow time scale ticks in 'week' unit mode to start on a specified day of the week 2016-05-11 09:44:02 +01:00
Zach Panzarino
64b9510ded Merge pull request #2511 from zachpanz88/build-update 
Update CDN on bump
 2016-05-10 16:45:54 -04:00
Tom Loudon
04d4adda05 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
 2016-05-10 17:28:29 +01:00
Zach Panzarino
5a79b42a46 Update CDN on bump 2016-05-10 15:12:22 +00:00
Evert Timberg
daa9ad074f Merge pull request #2510 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate 
Added new plugin Callback `afterScaleUpdate`
 2016-05-10 11:05:03 -04:00
Tarqwyn
84b7d07526 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:
 2016-05-10 15:59:12 +01:00
Evert Timberg
0a579fd515 Merge pull request #2509 from chartjs/revert-2508-feature_New_plugin_interface_afterScaleUpdate 
Revert "Added new plugin Callback `afterScaleUpdate`"
 2016-05-10 10:28:32 -04:00
Evert Timberg
53b9d389d3 Revert "Added new plugin Callback afterScaleUpdate" 2016-05-10 10:28:24 -04:00
Evert Timberg
e3605fbd09 Merge pull request #2508 from Tarqwyn/feature_New_plugin_interface_afterScaleUpdate 
Added new plugin Callback `afterScaleUpdate`
 2016-05-10 10:28:01 -04:00
Tarqwyn
c80c434e1b Doh!! removed the built files 2016-05-10 15:23:02 +01:00
Tarqwyn
194cfa7db6 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
 2016-05-10 15:01:30 +01:00
Evert Timberg
4aa61e00e5 Merge pull request #2505 from tomduncalf/add_min_rotation 
Add minRotation support
 2016-05-10 09:03:47 -04:00
Tom Duncalf
3bef974c25 Add minRotation support 2016-05-10 12:33:36 +01:00
Evert Timberg
ebffa52dc2 allow callback or userCallback in the time scale 2016-05-09 17:14:25 -05:00
Evert Timberg
23722a8b25 Make the afterUpdate plugin method more useful 2016-05-09 17:14:15 -05:00
Tom Loudon
170fdab6a6 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
 2016-05-09 07:29:52 +01:00
Zach Panzarino
c276926c14 Update CDN in Readme to 2.1.2 2016-05-08 16:19:36 -04:00
William Entriken
8a46d1915d Casually codify 1.x policy. Fixes #2305 2016-05-08 15:02:32 -04:00
Evert Timberg
8ffbe23493 2.1.2 release 2016-05-08 11:26:48 -04:00
Evert Timberg
9a38e25e28 Merge pull request #2493 from chartjs/fix/2492 
Calculate tick width for bars using number of ticks
 2016-05-08 11:11:48 -04:00
Evert Timberg
ee383ef4a6 Logarithmic scale improvements 2016-05-08 09:24:45 -04:00
Evert Timberg
e86a13dcef More linear scale work 2016-05-08 08:32:48 -04:00
Evert Timberg
b35b246414 Merge branch 'master' into file-size-reduction 2016-05-08 08:11:16 -04:00
Evert Timberg
4ef5d942e6 Linear scale improvements 2016-05-08 07:55:29 -04:00
Evert Timberg
33d10374bb Minor improvement to polar area controller 2016-05-07 21:37:24 -04:00
Evert Timberg
52a8654989 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. 2016-05-07 21:28:13 -04:00
Evert Timberg
166801055e Improvements to polar area controller. Moved common draw code up to core dataset controller 2016-05-07 21:04:39 -04:00
Evert Timberg
9d832cc39d More donut improvements 2016-05-07 19:47:40 -04:00
Tom Loudon
5866f73562 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.
 2016-05-07 22:24:00 +01:00
Evert Timberg
cf5c75ea9e get a little more from the point element 2016-05-07 17:09:17 -04:00
Evert Timberg
51d8a5b55e Merge pull request #2490 from chartjs/fix/2476 
beginAtZero and linear scales with no data should play nice
 2016-05-07 17:04:37 -04:00
Evert Timberg
5141c90c7b Revert unnecessary changes 2016-05-07 17:04:34 -04:00
Evert Timberg
72c791f352 Revert "Reduce element.point size" 
This reverts commit 09bcac9b5c.
 2016-05-07 17:00:00 -04:00
Evert Timberg
bc505b1a9d beginAtZero and linear scales with no data should play nice 2016-05-07 16:56:04 -04:00
Evert Timberg
b2fd94b131 Merge pull request #2489 from chartjs/fix/2480 
Use local variables + don't include text width for vertical scales with mirrored text
 2016-05-07 16:44:26 -04:00
Evert Timberg
33c7dbafd6 Use local variables + don't include text width for vertical scales with mirrored text 2016-05-07 16:26:44 -04:00
Evert Timberg
15cbbae848 Merge pull request #2488 from chartjs/fix/2472 
Scales should have 0 cross size when not displayed
 2016-05-07 14:24:19 -04:00
Evert Timberg
d13e7905dc Scales should have 0 cross size when not displayed 2016-05-07 14:18:36 -04:00