Commit Graph

566 Commits

Author SHA1 Message Date
Daan De Meyer
d1c3612a50 Changed occurrences of "charts.defaults.Bar" to "charts.defaults.bar" 2016-04-23 23:54:40 +02:00
Daan De Meyer
938ecdfc97 Changed occurrence of "charts.defaults.Line" to "charts.defaults.line" 2016-04-23 23:52:26 +02:00
Evert Timberg
b2e162f2d7 Merge pull request #2339 from nnnick/docs/2.0-updates
Docs/2.0 updates
2016-04-23 17:45:16 -04:00
Daan De Meyer
88148b41f5 Changed two occurrences of percentageInnerCutout to cutoutPercentage which is the actual field name in the doughnut/pie options 2016-04-23 22:55:16 +02:00
Daan De Meyer
f840216326 Added dots to labels options in global.defaults.legend . 2016-04-23 22:54:13 +02:00
Evert Timberg
d583a7bf19 Fix #2324 2016-04-23 10:45:23 -04:00
Nick Downie
907f0c9bba Update browser support spec for 2.0 2016-04-23 14:34:57 +01:00
Nick Downie
527e7d9b7a Update colours + example values in docs 2016-04-23 14:25:58 +01:00
Evert Timberg
32db92c7e1 Merge pull request #2314 from jachstet-sea/consistent_option_names_pt1
Consistent option names pt1
2016-04-22 22:52:34 -04:00
Evert Timberg
f6f8fe5959 Add in a beforeRender plugin event. Makes it easier to handle things that need to happen once at the start of animation but not on every frame 2016-04-22 21:04:55 -04:00
Jannis Achstetter
b21d147608 Update the docs 2016-04-21 16:29:05 +02:00
Jannis Achstetter
4d4271e6c4 Update the docs 2016-04-21 09:41:28 +02:00
Huw
719581e2e0 Fix tooltip example caretHeight to caretSize 2016-04-19 15:59:13 +01:00
Nick Downie
fa27842736 Split doughnut/pie example into two code block
Odd change - but makes tempting the documentation a lot simpler
2016-04-18 22:30:10 +01:00
Kammy
f006541652 fix typo 2016-04-19 00:31:19 +09:00
Evert Timberg
9abc63b11e Plugin event in destroy 2016-04-17 18:55:20 -04:00
Evert Timberg
43438d6303 Update doc version # 2016-04-17 12:39:09 -04:00
Evert Timberg
3f8681a1e4 Documentation for creating plugins 2016-04-17 12:25:58 -04:00
Evert Timberg
ca461479a8 Update docs 2016-04-16 21:50:45 -04:00
Evert Timberg
d5af01b2c7 Remove old doc files 2016-04-16 21:13:44 -04:00
Evert Timberg
c74196efc7 Update docs file for start angle and sweep properties 2016-04-16 21:10:31 -04:00
Tanner Linsley
af1adf6b84 Merge branch 'master' into v2.0-dev 2016-04-16 18:13:23 -05:00
Jamie Penney
8fca9540ab Document the point radius setting 2016-04-10 11:15:55 +12:00
Jamie Penney
8c2bc34b9c Fix whitespace in Line Chart documentation 2016-04-10 11:04:23 +12:00
Evert Timberg
488826ace3 Update doc file to indicate that category scale supports min/max attributes 2016-04-02 23:07:41 -04:00
Evert Timberg
0b56ea452f Minor doc fixes 2016-04-01 22:12:37 -04:00
Evert Timberg
f39fa53a7e Fix doc titles 2016-03-26 10:57:43 -04:00
etimberg
60a429f5cb Update doc version 2016-03-23 19:22:43 -04:00
Evert Timberg
bf724abe8b Fix axis IDs in documentation 2016-03-14 19:43:21 -04:00
Ivan Samoylenko
81e1448836 Added 'borderSkipped' parameter to Rectangle. 2016-03-13 18:58:36 +03:00
Aaron Miller
668b532fbe Add angleLineInterval option to radar chart 2016-03-13 09:59:19 -04:00
Ivan Samoylenko
72b0ef2df0 Missing whitespaces and code markup fixes 2016-03-13 14:47:37 +03:00
Evert Timberg
9bcc3ca34c Allow ticks.fixedStepSize or ticks.stepSize options to mean the same thing 2016-03-06 08:56:31 -05:00
Evert Timberg
c3f765857e Fix some time rounding problems 2016-03-05 22:58:34 -05:00
Matthias Winkelmann
d5f837843e Fixes nnnick/Chart.js#2086 by introducing a new time.parser option with high priority to replace the (deprecated) time.format 2016-03-02 13:53:35 +01:00
Evert Timberg
111ada730c Fix typo in docs. Fixes #1042 2016-02-15 16:42:23 -05:00
Tanner Linsley
eb2b04a9ff Documentation Updates for UMD support 2016-02-12 23:03:44 -07:00
Robert Becker
55f9b68b0c Updated build and documentation 2016-02-09 13:04:07 +01:00
Robert Becker
e9c18f603d Merged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fix conflicts.
Refactored linear scale fixed step size implementation.
Added nbproject to .gitignore
2016-02-09 12:56:16 +01: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
ee16c1edbc Update docs for #1144 2016-02-07 19:55:32 -05:00
etimberg
9cf31da4c9 Add docs for global font options 2016-02-07 19:48:39 -05:00
Robert Becker
80ede9b9bb Added documentation for fixedStepSize.
Reformatted scale.linear.js to match original indenting.
2016-02-05 09:28:50 +01:00
Mathias Küsel
655c1152eb Adds different point styles 2016-01-16 18:07:57 +01:00
Mathias Küsel
24e4a924c4 Add option to disable line drawing 2016-01-14 13:39:06 +01:00
Evert Timberg
5070059ac1 Add template option for point labels + test + doc update 2016-01-09 14:39:43 -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
Morley Zhi
84a6eb4a3b Updates
(1) Only limit gridlines when maxTicksLimit is defined, so we don't blow up the tests.
(2) Add a note about running tests in CONTRIBUTING.md
(3) Rebuild files
2016-01-07 11:40:26 -05:00
Morley Zhi
6478f93ded Use ticks.maxTicksLimit to limit gridlines (fixes #1859); use getValueOrDefault for resolving the maxTicksLimit option 2016-01-07 10:44:56 -05:00
Evert Timberg
5a5d698b11 Fix some errors with docs that were noticed when building 2015-12-28 08:29:54 -05:00
Damian Silbergleith Cunniff
fd2344dd5f Update the docs to reflect the new feature 2015-12-26 09:47:59 -07:00
Prashanth Chandra
8e7162ca91 Add missing comma 2015-12-22 17:50:11 +08:00
Evert Timberg
63b14dc2a9 Merge pull request #1810 from olyckne/fix/ticks_callback
Fix ticks callback and auto skip
2015-12-21 08:23:55 -05:00
Mattias Lyckne
888a8dd797 Update docs 2015-12-21 14:21:51 +01:00
Evert Timberg
5f4e8a4c13 Merge pull request #1794 from nnnick/update-scale-lifecycle
Update Scale Lifcycle
2015-12-19 14:29:49 -05:00
akagroundhog
421e294e2c xPadding/yPadding fix in 00-Getting-Started.md
xPadding is horizontal padding (left & right), yPadding is vertical padding (top & bottom).
2015-12-19 00:19:32 +03:00
Evert Timberg
c8d3831152 Split out data limits step of scales into it's own step. Wire up callbacks from the options to those in the scale life-cycle. Updated the docs accordingly 2015-12-17 09:21:04 -05:00
etimberg
9aee15fe6c Updated docs 2015-12-15 20:19:32 -05:00
Evert Timberg
6d490fbbbb Merge pull request #1779 from olyckne/adds_min_and_max_to_y_axes
Adds min and max setting to axes
2015-12-14 21:55:17 -05:00
Mattias Lyckne
968db4e783 Adds min and max setting to axes 2015-12-14 09:22:34 +01:00
Evert Timberg
c2ee14dec9 Update docs. Improved pie / polar area docs. Updated advanced docs regarding extending scales / chart types 2015-12-13 15:29:57 -05:00
Evert Timberg
716e303230 Call animation callbacks. Created a sample file that shows their use by updating a progress bar during the animation. Updated the documentation to show how they are called. 2015-12-12 10:01:08 -05:00
Derek Perkins
4add69432f Merge pull request #1750 from nnnick/v2.0-legend
Legend and Title Support
2015-12-11 18:52:26 -07:00
Daniel Chesterton
4eed79ee52 Lowercase NPM package name 2015-12-11 23:58:56 +00:00
Evert Timberg
819f865723 Merge branch 'v2.0-dev' into v2.0-legend
Conflicts:
	src/controllers/controller.doughnut.js
2015-12-07 22:10:38 -05:00
Evert Timberg
a2e1a97382 Update docs + remove unused config option since we don't need 2 different callbacks. 2015-12-07 21:52:15 -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
Evert Timberg
eba2fce923 Docs + move defaults to correct place. 2015-12-06 11:19:55 -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
etimberg
ccb1c68b65 Update docs 2015-11-30 20:47:49 -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
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
Marius Meißner
e84d27dde7 Fixed wrong structure of example data 2015-11-27 08:34:32 +01:00
Evert Timberg
5f7507c324 Update docs 2015-11-24 19:21:09 -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
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
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
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
Pascal Richier
3d15e1ff54 Update doc for options.ticks.maxTicksLimit 2015-11-07 01:46:14 +01:00
Pascal Richier
178880bace Update doc for options.ticks.maxTicksLimit 2015-11-07 01:42:19 +01:00
Jáchym Toušek
68255893cf typo 2015-11-03 13:49:34 +01:00
Levi Thomason
92841cd38a fix getting started global chart config typo 2015-11-01 23:03:14 -08:00
Tanner Linsley
dac859ec1c Rename 01-Scales to 01-Scales.md
Closes #1574
2015-10-26 12:47:37 -06:00
Yan Fan
b87106c181 Add npm info to getting started doc. 2015-10-26 11:41:01 -07:00
etimberg
082391e385 Update docs a bit for new items. Small updates for tooltip labels. 2015-10-18 18:14:56 -04:00
Tanner Linsley
82541248a1 Getting Started.... again. 2015-09-29 16:32:43 -06:00
Tanner Linsley
39340fa412 Update Getting Started and created Scales documentation 2015-09-29 13:29:53 -06:00
NLZ13
8481811110 Fix span closed before appending the label 2015-09-13 00:33:51 +02:00
Barry Gitarts
b601e2c2a1 adding template language reference to docs 2015-09-12 09:02:26 -04:00
Ben Gesoff
8983929f18 fixed very small typo
wrong it's
2015-09-04 17:08:58 +01:00
Evert Timberg
04d1f0f710 Category scale filter function will hide the grid line if null or undefined returned. 2015-08-23 13:20:43 -04:00
Nils Asmussen
a14309d95f Added tooltipTitleTemplate option. 2015-08-22 13:47:01 +02:00
Ben Gesoff
c276c3a974 fixed two typos
wrong it's
2015-08-17 16:37:01 +01:00
Evert Timberg
32f4f1e54a Merge pull request #1367 from achichenin/patch-1
Update 00-Getting-Started.md
2015-08-08 08:46:01 -04:00
achichenin
1cdc046566 Update 00-Getting-Started.md
tiny typo fix
2015-08-08 15:15:57 +03:00
Pratyush Mittal
ca0ece37e6 Added documentation for maxRotation of labels 2015-08-08 14:07:24 +05:30
Michaël Gallego
0c6f37fff7 Add support for mirror option 2015-08-05 17:40:44 +02:00
Tanner Linsley
43f19359a9 Merge pull request #1308 from eunicekokor/patch-1
Update 00-Getting-Started.md
2015-07-22 11:32:08 -06:00
Evert Timberg
f56a7db8fc Merge pull request #1181 from paulmasson/master
Update CDN link
2015-07-18 08:01:29 -04:00
eunice
804fcea46a Update 00-Getting-Started.md
Closes a small issue I found while going through the documentation https://github.com/nnnick/Chart.js/issues/1307
2015-07-13 17:45:27 -07:00
Guy
dc58699ee7 Hover missing in parameter name
In the 1st dataset, the second time "pointBorderWidth" appeared it was under a comment referring to hover so I corrected it to be "pointHoverBorderWidth".  Also in the 2nd dataset. Needs to be tested.
2015-07-05 12:32:03 +03:00
Evert Timberg
06a2c52b26 Update scale docs. 2015-06-22 19:47:51 -04:00
Evert Timberg
255bdc700e Line chart doc updates 2015-06-22 19:05:50 -04:00
Evert Timberg
880ae3a474 Update getting started docs 2015-06-22 18:46:12 -04:00
Amir E. Aharoni
02616b9f17 Fix the spelling of "separate" 2015-06-23 01:01:59 +03:00
paulmasson
d1cccd3546 Update CDN link 2015-06-08 16:45:47 -07:00
Evert Timberg
9e9f436454 Bar config cleanup + some initial docs 2015-06-03 20:55:17 -04:00
Evert Timberg
996e471171 Missed some commas 2015-06-03 20:49:22 -04: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
4e3dd8ae3f Merge pull request #1066 from tannerlinsley/add-stacked-area
Add StackedArea chart type to community extensions
2015-05-06 20:31:27 -04:00
Wouter Sioen
aad966820e Fix a typo: segment vs segement
Fix typo in PolarArea

Update 04-Polar-Area-Chart.md
2015-05-05 16:31:00 +02:00
William Entriken
b0a780822a Merge pull request #1025 from pijey/feature/offsetgridlines-linechart
Add offsetGridLines option to Line charts
2015-04-16 15:27:43 -04:00
Tanner Linsley
e69aa04918 Add StackedArea chart type to community extensions 2015-04-16 00:50:08 -06:00
Nick Downie
c7f52f516c Derped HTML attributes. 2015-04-13 16:35:14 +01:00
dima117
9605409838 Update 06-Advanced.md
https://github.com/nnnick/Chart.js/issues/1060
2015-04-13 15:39:44 +03:00
Evert Timberg
972bc5636d Merge pull request #711 from cmweiss/master
Default color for Doughnut/Pie
2015-04-09 11:25:45 -04:00
pijey
2677360f4b Add offsetGridLines option to Line charts 2015-03-25 11:51:56 +01:00
GitGal
f7ed97a33e Update 00-Getting-Started.md
Move Possible effects list above animationEasing
2015-03-24 18:17:41 +01:00
gitgal
fc0434b3da add all possible easing animations to 00-Getting-Started.md 2015-03-24 18:07:35 +01:00
William Entriken
cb113c6452 fixes #927 2015-03-17 10:12:01 -04:00
William Entriken
4b09072c2a Fixes #915 2015-02-03 14:09:17 -05:00
William Entriken
8244dd1271 Merge pull request #551 from mparramont/patch-1
Fix global config multiTooltipTemplate comment
2015-01-27 14:04:10 -05:00
William Entriken
654e02763f Merge pull request #553 from johnheroy/master
Documentation: change lineColor to strokeColor for the first 3 example charts
2015-01-27 14:03:13 -05:00
Christopher Weiss
0f49be56a4 Update 05-Pie-Doughnut-Chart.md 2015-01-26 16:33:24 -05:00
Nick Downie
bdb49e6396 Merge pull request #611 from fntneves/feature/toggle-grid-lines
Add option to toggle grid vertical/horizontal lines
2015-01-07 22:44:59 +00:00
Nick Downie
05dbcd3a72 Merge pull request #840 from tannerlinsley/master
External Tooltips, Documentation and Samples
2015-01-07 22:44:02 +00:00
Tanner Linsley
64de3eb711 externalTooltips now labeled customTooltips 2015-01-06 22:53:30 -07:00
Tanner Linsley
8c1e9588a1 External Tooltips, Documentation, and Samples 2014-12-30 13:05:11 -07:00
Jake
d320ce6eaf Merge pull request #750 from CAYdenberg/nnnick
Added link to CAYdenberg/Chart.js
2014-12-29 17:21:59 -05:00
Mieszko
f18b7ebd57 Minor typos 2014-12-09 11:11:49 +01:00
Casey Ydenberg
71bf3c8ee5 Added link to CAYdenberg/Chart.js 2014-11-11 15:11:30 -07:00
John Heroy
27a121c6b2 Change 'strokeColor' to 'fillColor' on 02-Bar-Chart.md 2014-09-25 09:49:20 -07:00
Francisco Neves
a406fdae58 Update docs for toggle Horizontal/Vertical Lines feature 2014-09-08 17:49:19 +01:00
John Heroy
e6cbd9dc7f Change lineColor to strokeColor in legendTemplate for Line, Bar, and Radar charts 2014-08-19 22:42:39 +08:00
Miguel Parramon
f825a31ce4 Fix global config multiTooltipTemplate comment 2014-08-19 13:19:37 +02:00
Nick Downie
d47e600f1a Docs note on maintain aspect ratio option 2014-07-27 23:12:03 +01:00
Tim Klingeleers
cdfdc3c3e2 Missing draw method in Writing new chart types
Added the draw method to "Writing new chart types". If you use the template without the draw method, you get an undefined error because Chart.Type.prototype.render calls this.draw() on line 808 in Chart.Core.js.
2014-07-08 13:15:23 +02:00
Nick Downie
ef5081184f Community chart types / extensions list 2014-07-06 22:59:57 +01:00
James Brooks
e139ab8596 Make javascript JavaScript and Github GitHub 2014-06-30 11:50:35 +01:00
Nick Downie
28dd492460 Extending chart types docs typo error 2014-06-30 10:04:01 +01:00
Nick Downie
dc6d5bc934 Add new docs as markdown files 2014-06-29 18:35:49 +01:00
Nick Downie
a04082dba1 Remove site from repo 2014-06-29 17:38:59 +01:00
Ider
0638674145 Correct default scaleShowLabels value to match js file setting
default scaleShowLabels value for Line and Bar is true in js file, but
it is false in document page.
Correct document page to match the value to reduce the confuse
2013-05-30 19:58:31 -07:00
Nick Downie
75f4d21968 There are too many versions of Chart.js 2013-03-25 19:50:18 +00:00
Nick Downie
552de1f21c Added docs site to the project
Font's probably won't be server from typekit.
2013-03-25 19:01:46 +00:00