Commit Graph

256 Commits

Author SHA1 Message Date
unknown
924a5d0abc Merge remote-tracking branch 'chartjs-origin/master'
Conflicts:
	src/core/core.legend.js
2016-07-03 18:35:21 -06:00
Evert Timberg
b197fdae42 Merge pull request #2901 from moberwasserlechner/fix/2894
Documentation fixes
2016-07-03 17:09:30 -04:00
unknown
d381117236 Issue #2252, added usePointStyle option to allow label boxes to match the shape(pointStyle) of the corresponding data. 2016-07-03 13:55:43 -06:00
Michael Oberwasserlechner
1485778363 Finish incomplete sentence and remove trailing spaces. 2016-07-02 16:46:29 +02:00
Michael Oberwasserlechner
aed3d40263 add id property to common configuration 2016-07-02 16:42:36 +02:00
Michael Oberwasserlechner
2feebb1cd2 remove redundant option entry 2016-07-02 16:35:33 +02:00
Michael Oberwasserlechner
ae010a91b6 stepSize defined twice. renaming the first to fixedStepSize 2016-07-02 13:55:53 +02:00
Jim Kring
aa556540f4 Update 04-Bar-Chart.md
Changed second instance of "Options for xAxes" heading to "Options for yAxes" since it is the heading for the y-axis options.
2016-07-01 12:02:55 -07:00
Evert Timberg
900e1062ba Fix typo in docs 2016-07-01 08:55:35 -04:00
Adam Templeton
c39b8f6c78 made table more readable 2016-06-28 15:05:04 -05:00
Adam Templeton
a0a3561eef updated docs with new option 2016-06-28 14:59:22 -05:00
Evert Timberg
9082507c1c Merge pull request #2555 from simonbrunel/travis-dist
Travis GitHub Releases
2016-06-28 08:39:57 -04:00
Bartosz Łęcki
e1a1d9cd6d Change ID links for scales objects 2016-06-28 12:22:41 +02:00
Evert Timberg
5c36e0de65 Fix typo in tooltip docs 2016-06-23 19:40:45 -04:00
Evert Timberg
db8ed6a6c0 Span gaps option should be specified at the chart level 2016-06-20 14:42:09 -04:00
Simon Brunel
c6318749da Drop official support for Bower
Remove the bower.json file and update the documentation with the alternative bower-npm-resolver solution.
2016-06-18 12:18:30 +02:00
Simon Brunel
0579fbb741 Add download links to the latest version
Remove outdated *standard build* and *bundled with Moment.js* links from the documentation and add a link to the latest GitHub release, from where the user can download `*.js` files.
2016-06-18 12:14:30 +02:00
Evert Timberg
7be69ce7e3 Fix pointLabel docs typo 2016-06-11 09:24:55 -04:00
Simon Brunel
53eb7667dd New datasets update plugin extensions
Add `beforeDatasetsUpdate` and `afterDatasetsUpdate` plugin notifications during the chart update. Plugins are able to cancel the datasets update by explicitly returning false to `beforeDatasetsUpdate`. For consistency, rename `(before|after)DatasetDraw` to `(before|after)DatasetsDraw`.
2016-06-11 00:17:48 +02:00
Zach Panzarino
d901687c2d Remove link that doesn't exist anymore in scale docs 2016-06-10 15:00:17 +00:00
Evert Timberg
a687749ed4 Radial linear scale array properties for line width and color 2016-06-07 20:09:33 -04:00
Evert Timberg
5f7865c741 Merge pull request #2724 from rawliving-germany/master
fix typo in tooltip conf doc.
2016-06-07 08:53:34 -04:00
Ryan M. Poe
77357e57d6 Refactor spanGaps for line graphs with sparse data (#2721)
Fix #2435, this very slim patch (including its relevant documentation addition) adds a small option to line chart datasets (spanGaps) that allows users trying to graph sparse datasets to have lines between null entries drawn, rather than omitted.
2016-06-07 09:15:26 +02:00
Felix Wolfsteller
f71f525caf fix typo in tooltip conf doc. 2016-06-07 07:46:13 +02:00
Evert Timberg
76d284c4ae Merge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn-multiline_labels
Conflicts:
	src/core/core.scale.js
2016-06-04 20:48:26 -04:00
Tarqwyn
e856dda04f Suggested changes from PR review
Changes to be committed:
	modified:   docs/02-Scales.md
	modified:   src/core/core.helpers.js
	modified:   src/core/core.scale.js
	modified:   test/core.helpers.tests.js
2016-06-03 20:15:29 +01:00
Tarqwyn
2bc8e3c7f6 This PR allows for multi-line labels, as per Slack discussion..
Usage: If a label is an `array` as opposed to a `string` i.e. `[["June","2015"], "July"]` then each element is treated as a seperate line. The appropriate calculations are made to determine the correct height and width, and rotation is still supported.

view samples/line-multiline-labels.html to see it working.

On branch multiline_labels
Changes to be committed:
	modified:   docs/03-Line-Chart.md
	new file:   samples/line-multiline-labels.html
	modified:   src/core/core.helpers.js
	modified:   src/core/core.scale.js
2016-06-03 17:12:19 +01:00
Evert Timberg
7ea36aead3 Add a way to know when a resize occurs. 2016-06-02 20:43:38 -04:00
Evert Timberg
b96fdcaf85 Docs on new plugin callback 2016-05-31 22:28:22 -04:00
Zach Panzarino
0997cf71cc Fix doc syntax (#2673) 2016-05-31 17:50:02 +00:00
Evert Timberg
bd6c4870af Update colors for chart that is created 2016-05-29 16:30:31 -04:00
Evert Timberg
a5ab4521a1 Merge pull request #2661 from chartjs/tooltip-improvements-and-tests
Improve tooltip performance and added new options
2016-05-29 12:10:30 -04:00
Evert Timberg
876ddc8931 Update radial linear scale docs 2016-05-29 10:31:58 -04:00
Evert Timberg
b646f6d816 Add a way of sorting tooltip items with a custom sort function 2016-05-28 20:47:36 -04:00
Evert Timberg
9269411799 Merge pull request #2657 from chartjs/tooltip-color-callback
Provide a way to configure the colour of tooltip items
2016-05-28 12:14:27 -04:00
Evert Timberg
327b8d82f5 Allow turning off lines on a per dataset basis 2016-05-27 22:20:51 -04:00
Evert Timberg
66aa65be68 Tooltip now has a callback for configuring the colors of items displayed. Added docs and improved the options passed to the tooltip 2016-05-27 21:07:02 -04:00
Roland Warmerdam
127ed8ddb3 docs: fix the bar chart default axis id's 2016-05-26 14:38:53 -07:00
Evert Timberg
81aedf4df0 Fix scale typos 2016-05-25 18:39:43 -04:00
Vanderhoven Nick
07b7db14e9 This fixes documentation issue #2628 2016-05-25 18:39:42 -04:00
Evert Timberg
e81299ded4 Improve line chart docs 2016-05-25 18:39:41 -04:00
Evert Timberg
4a25106239 Scale docs 2016-05-25 18:39:41 -04:00
Evert Timberg
9962017271 Improve configuration options 2016-05-25 18:39:41 -04:00
Evert Timberg
62b9a4b616 Fix section capitalization 2016-05-18 22:44:33 -04:00
Evert Timberg
dfcf874735 Update initial sample with colours 2016-05-18 22:10:20 -04:00
Evert Timberg
73610c00b4 Merge pull request #2596 from chartjs/fix/2406
Give the doughnut sample the correct color label
2016-05-18 21:46:42 -04:00
Evert Timberg
ff8eb5a65b Give the doughnut sample the correct color label 2016-05-18 21:43:01 -04:00
Evert Timberg
4a2c521115 Add a note about selecting the correct build that describes what the bundled versions do. 2016-05-18 21:31:51 -04:00
Evert Timberg
8445057432 Bubble chart docs 2016-05-18 21:05:20 -04:00
Evert Timberg
bc2ffb2321 Add new file for bubble chart docs 2016-05-18 19:15:11 -04:00