1016 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Evert Timberg	ffa2870b56	Fix a few more issues in the tooltips	2015-12-07 18:23:51 -05:00
Evert Timberg	1cb7dde0d5	Start fixing code climate issues	2015-12-07 18:19:56 -05:00
Evert Timberg	20b9395585	Merge pull request #1745 from nnnick/fix/1710 ... Remove unused tooltip options	2015-12-07 17:46:49 -05:00
Tanner Linsley	73e9ff44fe	Merge pull request #1744 from nnnick/fix/1466 ... Time Scale Updates for Tooltips	2015-12-07 12:10:12 -07:00
Evert Timberg	bffbaf6b37	Generate label strings using an option function. This allows new chart types to override	2015-12-06 12:53:45 -05:00
Evert Timberg	eba2fce923	Docs + move defaults to correct place.	2015-12-06 11:19:55 -05:00
Evert Timberg	792ee587ae	Split legend and title block functionality into 2 separate blocks. This allows the title to be on the top of the chart while the legend is on the bottom	2015-12-06 10:20:38 -05:00
Evert Timberg	eaf183352c	Polar are controller needs a similar update to the doughnut controller	2015-12-06 10:19:09 -05:00
Evert Timberg	7ab2a5ed9a	Remove unused xOffset property from the tooltip. Use the multiKeyBackground. Update documentation accordingly.	2015-12-06 09:38:19 -05:00
Evert Timberg	28fc6841f3	Add tooltipFormat option to time scale options. ... Fix bars when displayed on a time scale. Updated sample files.	2015-12-05 19:33:33 -05:00
Evert Timberg	5df23df291	Move time sample files to sub folder	2015-12-05 10:54:45 -05:00
Evert Timberg	52ae1f7d3c	Merge pull request #1743 from nnnick/fix/1576 ... Gracefully handle setting `options.animation` to `false`	2015-12-05 10:44:24 -05:00
Evert Timberg	0c247dde28	Gracefully handle setting options.animation to false which occurs when migrating configs from v1.	2015-12-05 10:40:05 -05:00
Evert Timberg	784fa78267	Merge pull request #1738 from nnnick/fix/1735 ... Call `beforeBody` and `afterBody` using the correct function.	2015-12-05 10:01:15 -05:00
Evert Timberg	d21b3c6d7e	Merge pull request #1741 from nnnick/fix/1706 ... Highlight correct items in dataset mode	2015-12-05 10:01:03 -05:00
Evert Timberg	a1e35ade49	Merge pull request #1742 from nnnick/fix/1715 ... Fixes rotational animation of new arcs	2015-12-05 10:00:45 -05:00
Evert Timberg	89da20354c	Fix tests	2015-12-05 09:55:17 -05:00
Evert Timberg	2f1006c6de	Make sure we always have a valid end angle when reseting the model. Previously this was undefined and interpreted as 0 in the animation code.	2015-12-05 09:39:25 -05:00
Evert Timberg	744e1429b9	Label polar area and doughnut datasets	2015-12-04 20:32:18 -05:00
Evert Timberg	59fb1696a8	Highlight correct items when hover mode is set to 'dataset'	2015-12-04 20:01:04 -05:00
Evert Timberg	38afefde25	Doughnut controller needs to obey chart area size	2015-12-04 19:22:48 -05:00
Evert Timberg	d905f19355	Fix draw issue when radar chart dataset has 0 points and hence no children	2015-12-03 22:04:00 -05:00
Evert Timberg	d8704ee37d	Add legends to sample files	2015-12-03 22:03:39 -05:00
Evert Timberg	0b260d57cc	Fix JSHint issue	2015-12-03 21:25:36 -05:00
Evert Timberg	dcc06eb3bb	Merge branch 'v2.0-dev' into v2.0-legend ... Conflicts: src/core/core.scaleService.js	2015-12-03 21:21:10 -05:00
Evert Timberg	0a92cf1b40	Call beforeBody and afterBody using the correct function.	2015-12-03 18:46:21 -05:00
Tanner Linsley	62bc4e42ec	Merge pull request #1736 from nnnick/umd-build ... Umd build	2015-12-02 20:37:04 -07:00
etimberg	95a172df06	Remove old and stuff. Use the correct color variable instead of window.color	2015-12-02 22:15:03 -05:00
etimberg	40c8289ce8	Time scale uses moment loaded through UMD	2015-12-02 21:10:51 -05:00
etimberg	b388a1e873	Pipe the build through UMD to get proper UMD headers	2015-12-02 21:08:52 -05:00
Evert Timberg	14c2cf56d1	Merge pull request #1728 from ashayas/bugfix/1722 ... Realized minRotation not needed, removed as an option and removed from tests	2015-12-02 07:30:55 -05:00
npsecoding	164671ffeb	Realized minRotaion not needed, removed as an option and removed from tests	2015-12-01 22:29:19 -08:00
Tanner Linsley	05043d4771	Merge pull request #1724 from nnnick/fix/1717 ... Allow time scale to use multiple of base units	2015-12-01 19:42:31 -07:00
etimberg	25f061f340	Fix test failures	2015-12-01 21:07:53 -05:00
etimberg	bf277473c6	Update scale fitting to prevent horizontal scales from jumping around.	2015-12-01 21:01:13 -05:00
etimberg	6b3fd19fa9	Time scale will now scale units. For example, it will try 1hr then 2hrs then 3 hrs then 6 hrs then 12 hrs ... until it finds a unit that fits.	2015-12-01 20:02:44 -05:00
etimberg	c074d3b7d4	Update built files	2015-11-30 21:35:09 -05:00
Evert Timberg	6cce958548	Merge pull request #1720 from nnnick/fix/1718 ... Allow the user to change the time label display formats	2015-11-30 20:50:00 -05:00
etimberg	ccb1c68b65	Update docs	2015-11-30 20:47:49 -05:00
etimberg	f609452727	Allow the user to change the time label display formats	2015-11-30 20:42:48 -05:00
Evert Timberg	b2150b93a2	New built files + some sample file updates	2015-11-29 13:33:24 -05:00
Evert Timberg	b9fa20714f	Merge pull request #1713 from nnnick/v2.0-beta1-docs ... Initial docs to get ready for beta1	2015-11-29 13:13:01 -05:00
Evert Timberg	e5ee242dc6	Merge branch 'v2.0-dev' into v2.0-beta1-docs ... Conflicts: docs/01-Scales.md	2015-11-29 11:32:57 -05:00
Evert Timberg	9dbc5650ed	Initial update to line and bar docs	2015-11-29 11:30:39 -05:00
Evert Timberg	0052ceb7a1	Initial update to scale documentation	2015-11-29 10:58:01 -05:00
Evert Timberg	e91e6be851	Merge pull request #1696 from nnnick/fix/1688 ... When tooltip opacity is less than 1e-3, round to 0.	2015-11-29 10:16:25 -05:00
Evert Timberg	349586e14c	Merge pull request #1695 from nnnick/fix/consistent-display-parameters ... Fix inconsistent display parameters	2015-11-29 10:16:20 -05:00
Evert Timberg	c4b30a7b0e	Update getting started docs	2015-11-29 10:04:46 -05:00
Evert Timberg	f0555af8cc	Another build	2015-11-27 17:37:42 -05:00
Evert Timberg	e5244b7dba	Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev	2015-11-27 17:37:14 -05:00