Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
950 Commits 8 Branches 114 Tags 67 MiB
bffbaf6b37
Commit Graph

950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
744e1429b9 Label polar area and doughnut datasets 2015-12-04 20:32:18 -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
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
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