Commit Graph

360 Commits

Author SHA1 Message Date
Evert Timberg
d17c76ea1a Merge pull request #2090 from aaron-em/patch-1
Mention that 1.x is feature-complete
2016-03-02 16:24:35 -05:00
Aaron Miller
af3bcd5cfe Mention that 1.x is feature-complete
It'll help would-be contributors (such as myself, see #2058) avoid creating PRs that won't be accepted.
2016-03-02 16:20:23 -05:00
Evert Timberg
ea0d93c970 Merge pull request #1070 from mackuba/stop_animations
Stop animations when destroying a chart
2016-02-27 15:46:05 -05:00
Evert Timberg
43606d1faa Merge pull request #1334 from thePanz/patch-2
Fix error in generateLegend() function
2016-02-20 13:29:32 -05:00
William Entriken
6009b00f74 Merge pull request #1886 from coolbombom/patch-4
having differnt colors in one dataset
2016-02-20 13:11:16 -05:00
Derek Perkins
8d6209271b Add link to slack invite 2016-02-19 21:21:26 -07:00
Evert Timberg
57753b8280 update to new gulp and new uglify version. 2016-02-15 19:22:55 -05:00
Evert Timberg
111ada730c Fix typo in docs. Fixes #1042 2016-02-15 16:42:23 -05:00
Evert Timberg
4aa274d5b2 Default multiTooltipTemplate now shows the dataset label + updated built files. Fixes #612 2016-02-15 14:43:34 -05:00
Evert Timberg
4f4f804a71 Use a named define to fix #768 2016-02-15 14:38:11 -05:00
Evert Timberg
d4917afba9 Update git ignore to make it easier to switch between branches. Add code climate config here as well. 2016-02-14 15:15:17 -05:00
etimberg
37883689ad Fixes #1144 with an update to the docs to indicate that labels are required for each point 2016-02-07 19:58:15 -05:00
etimberg
cf0b550a80 Check to ensure dom node exists when calculating size. Fixes #919 2016-02-07 19:23:54 -05:00
coolbombom
3f658555ba I will try again!
had a bad effect on color that was not array .... fully tested now, is working in my solution!
2016-01-11 12:48:09 +01:00
coolbombom
1f1e6b4e44 minor update, missed a small detail sorry!!!
missed a small detail, resolved in an error, sorry!
2016-01-11 12:17:08 +01:00
coolbombom
3ac54b8790 having differnt colors in one dataset
Hi updated the bar chart so the bars can have different colors in one dataset!

cheers
c_bb
2016-01-11 12:02:32 +01:00
Evert Timberg
126e318fef Update built files 2016-01-09 10:59:52 -05:00
Evert Timberg
1d3cb8ec41 Merge pull request #1875 from michaelarnauts/master
Ignore null values when calculating scale
2016-01-09 09:40:07 -05:00
Michaël Arnauts
57bd8c7715 Ignore null values when calculating scale 2016-01-09 12:04:29 +01:00
Evert Timberg
104143672b Merge pull request #1874 from Parent5446/patch-1
Added documentation about tooltip templates
2016-01-08 23:49:32 -05:00
Tyler Romeo
c5f141306f Added documentation about tooltip templates
It can be a little unclear what the actual format for tooltip templates are. Added information concerning how the tooltip templates are evaluated, and what context, i.e., variables, is available inside of them.
2016-01-08 20:02:45 -08:00
Evert Timberg
299c4b3ae1 Update readme for latest v2 beta release 2016-01-01 12:56:08 -05:00
Evert Timberg
cea557849a Merge pull request #1844 from zachpanz88/patch-2
Bump copyright year in license
2015-12-31 16:41:26 -05:00
Zach Panzarino
12a35b5d7b Bump copyright year in license 2015-12-31 15:41:36 -05:00
etimberg
cfa6eb1289 Update built files 2015-12-27 12:10:07 -05:00
Evert Timberg
92d4d989f5 Merge pull request #1834 from damiansilbergleithcunniff/issue-1764-default-pie-chart-colors
Issue 1764: Add default colors for Pie Charts
2015-12-27 12:08:33 -05:00
Damian Silbergleith Cunniff
cebbca67d1 Choose a "better" set of 12 default colors/highlight colors for pie charts 2015-12-27 09:14:15 -07:00
Damian Silbergleith Cunniff
c47e4c1da1 Change reference to index to prevent running off the end of the array 2015-12-26 15:36:15 -07:00
Damian Silbergleith Cunniff
b06344563d spaces -> tabs 2015-12-26 10:04:29 -07:00
Damian Silbergleith Cunniff
77185993df fix spaces -> tabs 2015-12-26 10:01:06 -07:00
Damian Silbergleith Cunniff
fd2344dd5f Update the docs to reflect the new feature 2015-12-26 09:47:59 -07:00
Damian Silbergleith Cunniff
e949edacf5 Update the pie chart to use the default color/highlight if none is specified 2015-12-26 09:41:31 -07:00
Damian Silbergleith Cunniff
a868a2f61e Add default global values for Color and Highlight color 2015-12-26 09:34:43 -07:00
Evert Timberg
ee6aabaffc Merge pull request #1302 from jantimon/master
More robust in-between arc calculation see #1301
2015-12-25 17:44:26 -05:00
Evert Timberg
69695235ac Merge pull request #1771 from ryoon/recent-firefox
Remove Firefox workaround
2015-12-25 13:39:21 -05:00
Evert Timberg
5cdd7a0893 Merge pull request #1141 from kirkstrobeck/gulp-watch
Add livereload to Gulp  task
2015-12-24 23:17:29 -05:00
Evert Timberg
f63debe2c7 Merge pull request #1040 from dima117/master
fix multiTooltip appearance with empty title
2015-12-24 21:50:18 -05:00
William Entriken
3c6a736413 Merge pull request #1192 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-12-21 16:05:38 -05:00
Ryo ONODERA
e94bd460a7 Remove Firefox workaround
The workaround for older Firefox should be removed, because latest
supported Firefox 38.4.0/42.0 do not require it.
And it has side effect like #1198 or my problem on Kintone on cybozu.com.
2015-12-12 09:00:12 +09:00
Evert Timberg
4297672424 Merge pull request #1092 from tannerlinsley/negative-arcs-fix
Only draw positive radius arcs Fixes #592
2015-11-16 21:17:46 -05:00
William Entriken
07aa9473f1 Typo: consistent capitalization 2015-11-16 18:11:22 -05:00
Jake
2e9c3d3109 Merge pull request #1621 from jakesyl/add-composer
Add Composer file
2015-11-08 14:37:41 -05:00
Jake
a5e382ab8a add composer file
add composer file
2015-11-05 13:36:04 -05:00
Jake
4476c698c5 Merge pull request #1589 from zachpanz88/patch-1
Change license link
2015-11-04 13:07:25 -05:00
Evert Timberg
257da76b4c Merge pull request #1190 from Nek-/patch-1
Added ignore section
2015-11-01 17:16:22 -05:00
Evert Timberg
a169e5ad41 Merge pull request #1262 from mattclegg/master
Call onAnimationComplete when reached last frame
2015-11-01 17:11:24 -05:00
Zach Panzarino
682545e1e3 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
2015-10-28 21:22:41 -04:00
Tanner Linsley
69e886ad5b Update README.md 2015-10-26 12:44:48 -06:00
Tanner Linsley
249ca0cef7 Update README.md 2015-10-26 12:43:50 -06:00
Tanner Linsley
f1a3fb2361 Merge pull request #1577 from yanarchy/patch-1
Add npm info to getting started doc.
2015-10-26 12:42:54 -06:00