Commit Graph

2881 Commits

Author SHA1 Message Date
Tanner Linsley
5b5463b6f9 Merge pull request #1164 from etimberg/fix/angle-calculation
Fix the angle calculation for slice detection
2015-06-04 16:39:59 -06:00
Tanner Linsley
205163641f Doughnut/Pie Fixes 2015-06-04 16:39:05 -06:00
Evert Timberg
09eae7ff28 Fix angle calculation in determining which arcs are underneath the event point 2015-06-04 18:31:44 -04:00
Tanner Linsley
d46a174080 Gulp Build 2015-06-03 19:45:14 -06:00
Tanner Linsley
0c91bb96e0 Merge pull request #1159 from etimberg/feature/v2.0dev-nestedConfig
Nested configs + major code refactors
2015-06-03 19:42:37 -06:00
Evert Timberg
9e9f436454 Bar config cleanup + some initial docs 2015-06-03 20:55:17 -04:00
Evert Timberg
cbd2fef80f Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig 2015-06-03 20:49:37 -04:00
Evert Timberg
996e471171 Missed some commas 2015-06-03 20:49:22 -04:00
Tanner Linsley
70f7dd4c7d Default global responsive 2015-06-03 18:47:14 -06:00
Evert Timberg
9c106aa8ff Some more line options 2015-06-03 20:46:35 -04:00
Evert Timberg
7dcee4b40e Additional fixes to line chart docs 2015-06-03 20:33:50 -04:00
Evert Timberg
f12d1bcb56 Cleaned up line docs a bit and remove unnecessary options 2015-06-03 20:25:43 -04:00
Evert Timberg
b9ab70f21b Cleaned up global config + documentation of global config options 2015-06-03 19:54:34 -04:00
Evert Timberg
c2d6e4c31f Reset elements for polar area chart 2015-06-03 19:24:29 -04:00
Evert Timberg
a6c712323f Reset elements for donut charts 2015-06-03 19:16:42 -04:00
Evert Timberg
b93306788b Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig 2015-06-03 18:36:08 -04:00
Evert Timberg
2a62e0e04d Reset elements for bar charts. Bar multi axis demo also shows different colours for each bar. 2015-06-03 18:35:42 -04:00
Tanner Linsley
8e5d8b8861 Doughnut and polar hovering/clicking 2015-06-03 16:31:25 -06:00
Tanner Linsley
8b0b6194b2 No playground 2015-06-03 15:25:28 -06:00
Tanner Linsley
675a9f827e Version bump 2.0.0-alpha 2015-06-03 15:25:18 -06:00
Tanner Linsley
235247eb12 example fixes 2015-06-03 15:18:42 -06:00
Tanner Linsley
b3b5896329 Polar Area 2015-06-03 14:45:40 -06:00
Tanner Linsley
ecb1cde3fc Fix 2015-06-03 14:17:10 -06:00
Tanner Linsley
9be48a73ea Pie Chart 2015-06-03 14:14:23 -06:00
Tanner Linsley
7e791e02f2 Radar Chart skipNull & bezier fixes 2015-06-03 12:05:04 -06:00
Evert Timberg
06d55e3501 Get closer to having radar charts work. Some issues with the line & point drawing code. 2015-06-03 08:02:21 -04:00
Evert Timberg
37cfbdb802 Fix an issue with bar charts that are not stacked 2015-06-03 07:57:50 -04:00
Evert Timberg
8d1a857e75 Scatter tooltips 2015-06-02 20:50:36 -04:00
Evert Timberg
42e2c237d4 Bind events in scatter chart 2015-06-02 20:48:26 -04:00
Evert Timberg
b22e1e3e9c Update scatter chart. Still need to get tooltips working 2015-06-02 20:44:24 -04:00
Evert Timberg
635ec58616 Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig 2015-06-02 20:07:07 -04:00
Evert Timberg
f44dd06826 Better animations when chart is first initialized. 2015-06-02 20:06:50 -04:00
Tanner Linsley
02d7442e4f !bar borderWidth 2015-06-02 17:29:17 -06:00
Tanner Linsley
4ded634d75 no logging 2015-06-02 17:13:47 -06:00
Evert Timberg
80a25af502 Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig 2015-06-02 18:55:41 -04:00
Evert Timberg
9b2d2efc7a Animation on refresh 2015-06-02 18:54:18 -04:00
Tanner Linsley
6b0e609935 Bar Chart Stacked nestedConfig 2015-06-02 16:48:39 -06:00
Tanner Linsley
74d3890ba9 no legend yet... :( 2015-06-02 15:14:51 -06:00
Tanner Linsley
df4d2d2594 Stroked tooltip colors 2015-06-02 15:14:06 -06:00
Tanner Linsley
b7dc2339f4 line: skipNull functionality 2015-06-02 13:42:09 -06:00
Evert Timberg
edbb235668 Tooltip titles now work in the line chart. Getting ever closer to being done 2015-05-31 20:16:04 -04:00
Evert Timberg
92776ce0ac Animations & tool tips show. The title is not correct yet. 2015-05-31 16:55:17 -04:00
Evert Timberg
e48c7f168b Add back line fill option. This is set on a per dataset basis, but there is an override in the config. Demo this in the line sample. 2015-05-31 10:24:53 -04:00
Evert Timberg
8a550852da Check in work from floobits with minor changes to fix some errors 2015-05-31 09:47:10 -04:00
kirkstrobeck
8db79ae365 nnnick/Chart.js#1140: Watch sample folder 2015-05-27 18:28:45 -07:00
kirkstrobeck
8ef3aaa87d Add livereload to Gulp task 2015-05-27 18:07:01 -07:00
Tanner Linsley
6af94298ec Radar Chart 2015-05-27 10:28:00 -06:00
Tanner Linsley
1163efbcca Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
Conflicts:
	src/Chart.PolarArea.js
2015-05-26 22:06:20 -06:00
Tanner Linsley
3a32144d89 Polar Area deep data 2015-05-26 22:02:41 -06:00
Evert Timberg
e3519f5bd4 More nested config stuff. Not sure what all of the options in the line config do, but left them in. Ensured that tooltips work. 2015-05-26 21:16:18 -04:00