Evert Timberg
|
12e2ace039
|
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy
Conflicts:
src/Chart.Core.js
Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
|
2015-05-20 09:03:22 -04:00 |
|
Tanner Linsley
|
951e714e77
|
Playground and big changes
|
2015-05-20 00:03:45 -07:00 |
|
Evert Timberg
|
008bb1aab3
|
Set new tooltip templates for the scatter chart
|
2015-05-19 20:33:39 -04:00 |
|
etimberg
|
4b8c9bc30d
|
Fix a drawing bug when drawTicks is false.
|
2015-05-18 20:59:21 -04:00 |
|
etimberg
|
978ed1bc1e
|
Created a multi axis sample file. Added an option to draw ticks for the axes. This is useful when in a multi axis scenario so that the axis that does not draw grid lines does not have weird lines.
|
2015-05-18 20:39:59 -04:00 |
|
etimberg
|
676765e808
|
Initial config merge. Handles special cases for objects and arrays and merges smarter than simply replacing the default object. Tested by overriding the vertical axis 0 point colour. Also implemented dataset axis binding. If nothing is specified, the dataset is bound to the first x and y axis.
|
2015-05-18 14:19:34 -04:00 |
|
Evert Timberg
|
e30a9d2a94
|
The scatter example page now has negative numbers in both directions
|
2015-05-18 08:44:06 -04:00 |
|
Evert Timberg
|
d7ad5b6340
|
Add a scatter chart sample
|
2015-05-17 13:19:37 -04:00 |
|
Tanner Linsley
|
ad972a0c5c
|
Pie cleanup.
|
2015-05-15 22:45:17 -06:00 |
|
Tanner Linsley
|
872c92cd4b
|
Doughnut/Pie Chart refactor
|
2015-05-15 22:34:08 -06:00 |
|
Tanner Linsley
|
1d8d19d404
|
Prettified, and half way through doughut
|
2015-05-15 20:54:01 -06:00 |
|
Tanner Linsley
|
e58421a08a
|
Line Chart label hoverMode & tooltips
|
2015-05-15 17:03:51 -06:00 |
|
Tanner Linsley
|
fb580a6e48
|
lineChart single hoverMode tooltips, fallbackColor global
|
2015-05-15 16:40:01 -06:00 |
|
Tanner Linsley
|
b432a3d6db
|
labelMode tooltips and hover events
|
2015-05-14 23:18:47 -06:00 |
|
Tanner Linsley
|
4ef57315da
|
Getting into 'label' hoverMode tooltips
|
2015-05-12 17:22:47 -06:00 |
|
Tanner Linsley
|
9f98334d6f
|
Mid-code commit
|
2015-05-12 15:42:20 -06:00 |
|
Tanner Linsley
|
15f724f146
|
Rough Tooltips for 'single' hoverMode
|
2015-05-12 12:55:48 -06:00 |
|
etimberg
|
460399f651
|
Merge branch 'fix/bar_chart_negative_values' of https://github.com/etimberg/Chart.js into etimberg-fix/bar_chart_negative_values
# Conflicts:
# samples/bar.html
# src/Chart.Bar.js
# src/Chart.Core.js
|
2015-05-12 08:00:14 -04:00 |
|
Tanner Linsley
|
9e4d90e110
|
Color Animation, Color Autopilot
|
2015-05-12 01:13:16 -06:00 |
|
Tanner Linsley
|
b8691c9581
|
Revert "Merge pull request #856 from tannerlinsley/editable-chart-config"
This reverts commit a8063de6b8, reversing
changes made to 7f513b87ee.
|
2015-05-11 18:57:14 -06:00 |
|
Tanner Linsley
|
cf07df07d6
|
Bar Attempt # 4
|
2015-05-08 16:20:21 -06:00 |
|
William Entriken
|
a8063de6b8
|
Merge pull request #856 from tannerlinsley/editable-chart-config
Data now editable right from chart config
|
2015-05-04 15:28:03 -04:00 |
|
Evert Timberg
|
972bc5636d
|
Merge pull request #711 from cmweiss/master
Default color for Doughnut/Pie
|
2015-04-09 11:25:45 -04:00 |
|
Evert Timberg
|
ae7552a916
|
Draw bar chart negative values down from the 0 point of the scale. If all values are negative, draw down from the top. Updated the sample file to allow for negative bars.
|
2015-03-15 16:04:55 -04:00 |
|
Tanner Linsley
|
026611110a
|
Updated Samples
Samples now include a “Randomize Data” button which utilizes the latest
changes.
|
2015-01-08 10:13:14 -07: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 |
|
Christopher Weiss
|
7e21cb4e04
|
Pointed to core and doughnut.
|
2014-10-21 10:19:58 -04:00 |
|
Christopher Weiss
|
8984e8c2c4
|
Create doughnut.color.html
To test the new version of doughnut.
|
2014-10-21 10:16:30 -04:00 |
|
Nick Downie
|
94f22b656e
|
Add in new chart samples
|
2014-06-29 18:36:04 +01:00 |
|
Nick Downie
|
a04082dba1
|
Remove site from repo
|
2014-06-29 17:38:59 +01:00 |
|
Nick Downie
|
d30edc1b8d
|
Cleared up folder structure
|
2013-03-25 19:25:57 +00:00 |
|