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
1,725 Commits 8 Branches 114 Tags 67 MiB
53b08415ad
Commit Graph

1725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blake Niemyjski
53b08415ad There were conflicting tick variables 2016-05-13 22:23:34 -05:00
Blake Niemyjski
b4a269da19 Updated magnification and possible bug fix in removeHoverStyle 2016-05-13 22:16:28 -05:00
Blake Niemyjski
bea68f1424 Performance and minification improvements 2016-05-13 22:07:39 -05:00
Evert Timberg
d49ecf98cd Merge pull request #2544 from niemyjski/patch-1 
removed extra momentjs script tag
 2016-05-13 22:05:24 -04:00
Blake Niemyjski
73fa358eb4 removed extra momentjs script tag 2016-05-13 21:04:40 -05:00
Evert Timberg
266fa66067 Merge pull request #2543 from chartjs/fix/2519 
Error when first data point on time scale had null data
 2016-05-13 19:54:57 -04:00
Evert Timberg
f34453cf8f Error when first data point on time scale had null data 2016-05-13 19:50:59 -04:00
Evert Timberg
08efcdce15 Merge pull request #2542 from chartjs/fix/2536 
Provide different default tooltip functions for horizontal bar
 2016-05-13 19:49:07 -04:00
Evert Timberg
d0dd7ceabe Provide different default tooltip functions for horizontal bar 2016-05-13 19:36:32 -04:00
Evert Timberg
5b2d73bf61 Merge pull request #2541 from chartjs/fix/2535 
fix docs for tension
 2016-05-13 19:25:05 -04:00
Evert Timberg
f44350ad14 Merge pull request #2540 from chartjs/fix/2537 
Horizontal bar defaults should skip left edge
 2016-05-13 19:22:19 -04:00
Evert Timberg
568c61c56d fix docs for tension 2016-05-13 19:17:19 -04:00
Evert Timberg
30967ac415 Horizontal bar defaults should skip left edge 2016-05-13 19:13:34 -04:00
Evert Timberg
c6354cf25b Merge pull request #2491 from chartjs/file-size-reduction 
File size reduction
 2016-05-13 11:37:01 -04:00
Zach Panzarino
2575ed0c1c Add issue & pull request template files (#2534) 2016-05-12 19:52:39 -05:00
Evert Timberg
14021069c3 Merge branch 'master' into file-size-reduction 
Conflicts:
	src/controllers/controller.doughnut.js
	src/controllers/controller.polarArea.js
 2016-05-12 18:57:22 -04:00
Evert Timberg
691a7c6a4b Update doc files for ticks.minRotation 2016-05-12 18:42:52 -04:00
Evert Timberg
eb05588c95 2.1.3 release 2016-05-12 18:41:22 -04:00
Evert Timberg
66a945935b Merge branch 'tomduncalf-iso_weekday' 2016-05-12 18:24:34 -04:00
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