Commit Graph

906 Commits

Author SHA1 Message Date
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
Evert Timberg
bf2ca8bd0b Push up new built files 2015-11-27 17:35:34 -05:00
Evert Timberg
f4bcef13f5 Merge pull request #1704 from Marius2805/v2.0-dev
V2.0 Docs: Fixed wrong example data structure for Pie/Doughnut Chart
2015-11-27 07:25:22 -05:00
Evert Timberg
efdc23c567 Merge pull request #1703 from wuchangming/v2.0-dev
V2.0 dev 	Bug in handler event.type='touchend'
2015-11-27 07:24:53 -05:00
Marius Meißner
e84d27dde7 Fixed wrong structure of example data 2015-11-27 08:34:32 +01:00
wuchangming
7aa2fd1af3 Bug in handler event.type='touchend'
In Chorme.
while event.type = "touchend” ,  event.touches is a empty TouchList,
event.touches.length === 0
2015-11-27 11:16:54 +08:00
wuchangming
5a1c968105 Merge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev 2015-11-27 08:50:55 +08:00
Evert Timberg
e87fd9e0cc Merge pull request #1702 from wuchangming/v2.0-dev
no such file
2015-11-26 07:41:23 -05:00
wuchangming
dae1e429b8 no such file 2015-11-26 19:35:25 +08:00
Evert Timberg
55670b0cf7 When opacity is less than 1e-3, round to 0. IE11/Edge had problems with very small opacities on the order of 1e-10. 2015-11-25 19:31:26 -05:00
Evert Timberg
5f7507c324 Update docs 2015-11-24 19:21:09 -05:00
Evert Timberg
a90aac7b26 Change scale show properties to display and update tests 2015-11-24 19:18:15 -05:00
Evert Timberg
cf1f772157 Merge pull request #1693 from wcatron/basic-documentation
Add descriptions for options in documentation.
2015-11-24 18:22:33 -05:00
wcatron
8e9fef27c2 Add more explanation of bar and category percentage. 2015-11-24 14:25:15 -05:00
wcatron
75fb79f814 Fill out descriptions and add link to scales. 2015-11-24 14:06:38 -05:00
wcatron
f4ef56993d Add full description text for scales. 2015-11-24 13:36:48 -05:00
Evert Timberg
3bfbf10cff Merge pull request #1689 from wcatron/basic-documentation
Update getting started example code.
2015-11-24 08:03:26 -05:00
Evert Timberg
e6ea34e453 Merge pull request #1690 from byCedric/fix/canvas-dimensions-ie10-ie9
Updated retina scale to allow rendering in IE10 and IE9.
2015-11-24 08:00:41 -05:00
Cedric van Putten
ae51789c32 Stored pixel ratio in a variable with a fallback value for browsers that doesn't support window.devicePixelRatio fixing rendering issues for IE10 and IE9. (issue #1622) 2015-11-24 11:26:24 +01:00
wcatron
4d48ab5109 Add suggested min and max to documentation. 2015-11-24 02:28:15 -05:00
wcatron
c75c21105a Create very simple getting started example code. 2015-11-23 23:59:24 -05:00
Evert Timberg
830cf33c1f Merge pull request #1687 from wcatron/basic-documentation
Converting documentation to tables - radar, polar, and pie
2015-11-23 22:37:04 -05:00
wcatron
a0377362d7 Update remainder of tables for radar, polar, and pie. 2015-11-23 19:32:38 -05:00
Evert Timberg
420290969e Merge pull request #1684 from wcatron/basic-documentation
Converting documentation to tables - scales, line, and bar
2015-11-23 18:16:27 -05:00
wcatron
dc152f875f Clean up periods and comments. 2015-11-23 12:09:40 -05:00
wcatron
a4a07df612 Update options to tables, update example for bar. 2015-11-23 12:03:38 -05:00
Evert Timberg
a08f8b3015 Fix typo 2015-11-22 13:26:01 -05:00
Evert Timberg
df13f819b5 Merge pull request #1669 from wcatron/basic-documentation
Update getting started documentation default options w/ table.
2015-11-22 13:12:31 -05:00
Evert Timberg
a888aba61e Merge pull request #1670 from nnnick/fix/1643
Fixes scatter and bubble chart tooltips
2015-11-21 09:20:58 -05:00
Evert Timberg
800246660a Remove commented code 2015-11-19 21:20:04 -05:00
Evert Timberg
ca2e017f80 Update default tooltip configs for scatter charts. Made scatter charts a first class chart type. 2015-11-19 21:15:59 -05:00
Evert Timberg
1471a61609 Update default tooltip callbacks for bubble charts 2015-11-19 21:12:23 -05:00
wcatron
1580d1ed4d Update line chart documentation options to table. 2015-11-19 19:55:12 -05:00
wcatron
34aaeac421 Update getting started documentation default options w/ table. 2015-11-19 16:14:13 -05:00
Evert Timberg
0c69c9a79c Merge pull request #1668 from wcatron/basic-documentation
Updates basic documentation for bar, radar, and doughnut.
2015-11-19 13:39:48 -05:00
wcatron
5400a61ff1 Update doughnut documentation for intiializer and data. 2015-11-19 11:47:47 -05:00
wcatron
942cf5e718 Update Rader initializer and data structure keys. 2015-11-19 11:43:00 -05:00
wcatron
f32d62722a Update initializer documentation for Bar. 2015-11-19 11:35:38 -05:00
Evert Timberg
82a74701a7 Merge pull request #1667 from nnnick/fix/pie-legend
Pie and Polar area legend functions
2015-11-18 21:38:52 -05:00
Evert Timberg
09d2f1d900 Merge pull request #1662 from nnnick/fix/string-linear-data
Handle data as strings in numeric scales
2015-11-18 21:35:56 -05:00
etimberg
7edcc0659b Fix polar area legends 2015-11-18 21:30:16 -05:00
etimberg
673e5d59a5 fix pie & doughnut legend 2015-11-18 21:24:49 -05:00