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

1499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evert Timberg
f39fa53a7e Fix doc titles 2016-03-26 10:57:43 -04:00
Evert Timberg
cefaef4707 Fix tests 2016-03-26 10:49:02 -04:00
Tanner Linsley
d4b6be5afe Merge pull request #2173 from niemyjski/patch-1 
Removed the default padding
 2016-03-24 14:08:24 -05:00
Blake Niemyjski
798f643fab Removed the default padding 
You should put a style on the container element
 2016-03-24 14:07:35 -05:00
etimberg
60a429f5cb Update doc version 2016-03-23 19:22:43 -04:00
etimberg
f6cb3cf0ef Updated build 2016-03-20 11:17:49 -04:00
Evert Timberg
f3926198d9 Merge pull request #2157 from nnnick/fix/2156 
Fix scale merge when the xAxes object is specified but the type is not
 2016-03-20 11:15:41 -04:00
etimberg
79f38b49d8 Fix scale merge when the xAxes object is specified but the type is not 2016-03-20 11:12:26 -04:00
Evert Timberg
9a0553a1b5 Update built files 2016-03-19 09:16:44 -04:00
Evert Timberg
74fd697351 Merge pull request #2155 from nnnick/fix/2154 
Better use of default scale types.
 2016-03-19 09:03:49 -04:00
Evert Timberg
e090691ef7 Better use of default scale types. 2016-03-19 08:50:50 -04:00
Evert Timberg
67bd2dae6d Merge pull request #2145 from nnnick/fix/2110 
Instead of showing a warning on load, throw an error on create if moment is not defined.
 2016-03-16 20:08:15 -04:00
etimberg
998c6939bf Instead of showing a warning on load, throw an error on create if moment is not defined. 2016-03-16 19:59:20 -04:00
Evert Timberg
2ab86f5557 Merge pull request #2144 from nnnick/fix/1942 
Better conversion to ticks to make it easier to use callbacks
 2016-03-16 19:44:10 -04:00
etimberg
21a33f0e41 Better conversion to ticks to make it easier to use callbacks 2016-03-16 19:39:09 -04:00
Evert Timberg
1157b19626 Merge pull request #2139 from nnnick/fix/2104 
Fix zoom reset
 2016-03-15 20:09:51 -04:00
Evert Timberg
04f1e57459 Fix zoom reset 2016-03-15 20:03:28 -04:00
Evert Timberg
1292558f7c Merge pull request #2132 from nnnick/fix/2131 
Fix axis IDs in documentation
 2016-03-14 19:51:09 -04:00
Evert Timberg
f09f32f59e Merge pull request #2133 from borancar/v2.0-dev 
Add composer.json
 2016-03-14 19:49:36 -04:00
Evert Timberg
bf724abe8b Fix axis IDs in documentation 2016-03-14 19:43:21 -04:00
Boran Car
fffbc27db3 Add composer.json 2016-03-14 23:41:04 +00:00
Evert Timberg
e511fc2a1c Merge pull request #2128 from The-Smallest/v2-rectangle-generic 
Generic Rectangle: any border (botton, left, top, right) can be skipped now.
 2016-03-13 14:06:31 -04:00
Evert Timberg
f64324e2a8 Merge pull request #2129 from nnnick/fix/2037 
Fix animation bug.
 2016-03-13 12:29:48 -04:00
Evert Timberg
4fec7dfdbb Fix animation bug. Helpers.findNextWhere no longer returned the index of the item. This causes the wrong animation object to be removed. 2016-03-13 12:24:33 -04:00
Ivan Samoylenko
f5bb8e25d5 Fixed bar.controller tests 2016-03-13 19:10:49 +03:00
Ivan Samoylenko
81e1448836 Added 'borderSkipped' parameter to Rectangle. 2016-03-13 18:58:36 +03:00
Evert Timberg
d7117bc792 Add title of license to license file. Fixes #2097 2016-03-13 10:20:24 -04:00
Evert Timberg
cf767f71a2 Merge pull request #2093 from aaron-em/angleLineInterval 
Add angleLineInterval option
 2016-03-13 10:09:43 -04:00
Aaron Miller
668b532fbe Add angleLineInterval option to radar chart 2016-03-13 09:59:19 -04:00
Evert Timberg
56611f550d Merge pull request #2125 from The-Smallest/docs-fixes 
Missing whitespaces and code markup fixes
 2016-03-13 09:30:14 -04:00
Ivan Samoylenko
72b0ef2df0 Missing whitespaces and code markup fixes 2016-03-13 14:47:37 +03:00
Evert Timberg
6507f5c087 Merge pull request #2118 from davidcochrum/master 
Fix multi-dataset bar highlighting and bar highlight color logic
 2016-03-11 13:29:30 -05:00
David Cochrum
131b18059a Update Chart.js 2016-03-11 12:21:45 -05:00
David Cochrum
48c082b04a Fix multi-dataset bar highlighting and bar highlight color logic 2016-03-11 12:19:12 -05:00
David Cochrum
cf47543243 Fix multi-dataset bar highlighting and bar highlight color logic 2016-03-11 12:16:43 -05:00
Evert Timberg
1fbbdd2d38 Merge pull request #2116 from 100000001/v2.0-dev 
Expose yAlign and xAlign as a tooltip option
 2016-03-10 07:06:19 -05:00
100000001
136efeaf4d Moved _model xAlign and yAlign setting to Positioning section and 
swapped y and x
 2016-03-10 09:05:59 +01:00
100000001
5d2444a5ee Expose yAlign and xAlign as a tooltip option 2016-03-10 09:00:26 +01:00
Evert Timberg
3f2119526d Fix #2102 2016-03-06 19:03:03 -05: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
a16093e51c Merge pull request #2101 from nnnick/fix/2034 
Fix some time rounding problems
 2016-03-05 23:18:54 -05:00
Evert Timberg
a87ebe0841 Fix test for time zone difference 2016-03-05 23:16:25 -05:00
Evert Timberg
c3f765857e Fix some time rounding problems 2016-03-05 22:58:34 -05:00
Evert Timberg
d17c76ea1a Merge pull request #2090 from aaron-em/patch-1 
Mention that 1.x is feature-complete
 2016-03-02 16:24:35 -05:00
Aaron Miller
af3bcd5cfe Mention that 1.x is feature-complete 
It'll help would-be contributors (such as myself, see #2058) avoid creating PRs that won't be accepted.
 2016-03-02 16:20:23 -05:00
Evert Timberg
c99cf97ff6 Merge pull request #2087 from MatthiasWinkelmann/time-parser-#2086 
A fix for nnnick/Chart.js#2086
 2016-03-02 11:40:37 -05:00
Matthias Winkelmann
9410eaabbf fixed timezone bug in test 2016-03-02 16:51:48 +01:00
Matthias Winkelmann
fc46e25f23 fixed test and added a test for a custom date parser 2016-03-02 16:40:58 +01:00
Matthias Winkelmann
b69b388b31 fixed travis built 2016-03-02 14:16:52 +01: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