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 |
|
Evert Timberg
|
eb7241cbc9
|
Merge pull request #1986 from nnnick/fix/1292
Update bar sample file to use elements config. Fixes #1292
|
2016-02-07 20:09:18 -05:00 |
|
etimberg
|
84ed07a84e
|
Update bar sample file to use elements config. Fixes #1292
|
2016-02-07 20:06:50 -05:00 |
|
Evert Timberg
|
7235d829ec
|
Merge pull request #1985 from nnnick/fix/1144
Update docs for #1144
|
2016-02-07 20:01:01 -05: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 |
|
etimberg
|
cf0b550a80
|
Check to ensure dom node exists when calculating size. Fixes #919
|
2016-02-07 19:23:54 -05:00 |
|
Evert Timberg
|
e931276003
|
Merge pull request #1984 from nnnick/fix/1890
Write an almost equals function and use it in the linear scale. …
|
2016-02-06 09:41:34 -05:00 |
|
Evert Timberg
|
61ca178e2b
|
Write an almost equals function and use it in the linear scale. Added a test for this new function.
|
2016-02-06 09:38:44 -05:00 |
|
Robert Becker
|
ada4c8eca3
|
Removed nbproject folder
|
2016-02-05 14:36:37 +01:00 |
|
Robert Becker
|
92bc1a04cf
|
Chart.js was missing?
|
2016-02-05 10:11:58 +01:00 |
|
Robert Becker
|
1692b977cd
|
Fixed tab sizing in core.helpers.js
|
2016-02-05 09:43:20 +01:00 |
|
Robert Becker
|
098b05f1b2
|
Further reformatted scale.linear.js to match original indenting.
Refactored and fixed scale calculation.
Added dist files to commit.
|
2016-02-05 09:41:45 +01:00 |
|
Robert Becker
|
85de9fbe9c
|
Further reformatted scale.linear.js to match original indenting.
|
2016-02-05 09:33:57 +01:00 |
|
Robert Becker
|
80ede9b9bb
|
Added documentation for fixedStepSize.
Reformatted scale.linear.js to match original indenting.
|
2016-02-05 09:28:50 +01:00 |
|
Robert Becker
|
09721407d2
|
Removed debug log.
|
2016-02-04 15:28:06 +01:00 |
|
Robert Becker
|
9a20381af4
|
Fixed typo in core.helpers.js.
Added ticks.fixedStepSize configuration parameter to force linear scale steps.
|
2016-02-04 15:20:17 +01:00 |
|
Robert Becker
|
df218ead82
|
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
# Conflicts:
# src/core/core.helpers.js
|
2016-02-04 10:38:35 +01:00 |
|
Robert Becker
|
ba6afa7257
|
Fixed label callbacks adding only a single line instead of multiple lines as stated in docs.
|
2016-02-04 10:35:53 +01:00 |
|
Robert Becker
|
e7df265c7a
|
Fixed label callbacks adding only a single line instead of multiple lines as stated in docs.
|
2016-02-04 10:34:29 +01:00 |
|
Evert Timberg
|
73300e91c4
|
Merge pull request #1972 from nnnick/fix/1971
Always show lines by default.
|
2016-02-02 20:18:03 -05:00 |
|
Evert Timberg
|
dfaf786e1a
|
Always show lines by default.
|
2016-02-02 20:14:59 -05:00 |
|
Evert Timberg
|
25e787cbf0
|
Merge pull request #1964 from nnnick/feature/1954
Add default font options
|
2016-02-01 21:12:11 -05:00 |
|
Evert Timberg
|
d16f4fc5ce
|
Add default font options
|
2016-02-01 21:06:54 -05:00 |
|
Evert Timberg
|
aafe21db7e
|
New built files
|
2016-02-01 18:49:11 -05:00 |
|
Evert Timberg
|
9ed88599d2
|
Merge pull request #1963 from nnnick/fix/1952
Fix stacked bar data limit calculation
|
2016-02-01 18:47:07 -05:00 |
|
Evert Timberg
|
0e8babf1d7
|
Fix stacked bar data limit calculation
|
2016-02-01 18:44:39 -05:00 |
|
Evert Timberg
|
16dc9e6167
|
Merge pull request #1950 from nnnick/fix/time-scale-min-max
Time scale updates to remove unnecessary extra ticks
|
2016-02-01 18:29:56 -05:00 |
|
Evert Timberg
|
172c088c6b
|
Minor fix
|
2016-01-30 17:19:32 -05:00 |
|
Evert Timberg
|
f75116a91e
|
Update millisecond default format. Removed unnecessary space at right edge of time scale.
|
2016-01-30 16:35:10 -05:00 |
|
Evert Timberg
|
1afe9f1a6e
|
Built files with latest changes
|
2016-01-30 09:04:23 -05:00 |
|
Evert Timberg
|
212b6d3992
|
Merge pull request #1938 from nnnick/testing_improvements
Testing improvements
|
2016-01-27 18:04:22 -05:00 |
|
Evert Timberg
|
bfd6f5f78e
|
Radar controller tests
|
2016-01-27 18:00:32 -05:00 |
|
Evert Timberg
|
0890c809aa
|
default config tests
|
2016-01-24 15:15:36 -05:00 |
|
Evert Timberg
|
d0a0d57fe2
|
Initial polar area tests
|
2016-01-24 13:29:13 -05:00 |
|
Evert Timberg
|
6aa2933ec5
|
Bubble controller tests
|
2016-01-24 10:59:19 -05:00 |
|
Evert Timberg
|
d0b67c603b
|
Line and bar test updates
|
2016-01-24 10:58:30 -05:00 |
|
Evert Timberg
|
68ab74a46d
|
Fix linear scale stacked mode
|
2016-01-24 09:22:28 -05:00 |
|
Evert Timberg
|
0ed39c9fd7
|
Fix error in math helpers.
|
2016-01-24 09:21:10 -05:00 |
|
Evert Timberg
|
c312835eb1
|
Add some tests for scales. Cleaned up some minor bugs in the time scale. Wrote better helpers for helpers.min and helpers.max
|
2016-01-23 12:44:55 -05:00 |
|
Evert Timberg
|
888379ec5c
|
Merge pull request #1929 from nnnick/fix/1917
Ensure that adding datasets to charts with time scales works
|
2016-01-21 22:04:31 -05:00 |
|
Evert Timberg
|
59e3ccb42a
|
buildOrUpdateControllers now returns an array of all the new controllers that were created. Build controllers before updating the scales but only reset them afterwards because the scales need to update label moments first.
|
2016-01-21 22:00:21 -05:00 |
|
Evert Timberg
|
76ef7de646
|
Fix sample file addData button
|
2016-01-21 21:32:59 -05:00 |
|
Evert Timberg
|
cfb06ed34d
|
Merge pull request #1927 from nnnick/fix/1918
All sample files use CDN version of jQuery to make getting started easier.
|
2016-01-21 20:55:05 -05:00 |
|
Evert Timberg
|
c8ea3af32c
|
All sample files use CDN version of jQuery to make getting started easier.
|
2016-01-21 20:50:48 -05:00 |
|
Evert Timberg
|
3c614a5dfe
|
Merge pull request #1915 from nnnick/fix/1914
Properly begin path before drawing line at edge of scale
|
2016-01-18 21:38:27 -05:00 |
|
Evert Timberg
|
2d4e2f9889
|
Properly begin path before drawing line at edge of scale
|
2016-01-18 21:35:35 -05:00 |
|
Evert Timberg
|
62988e9768
|
Merge pull request #1912 from mathiask88/pointStyleFix
Fixes the point size for rect and rectRot
|
2016-01-18 15:55:06 -05:00 |
|
Mathias Küsel
|
b282a01ab6
|
Fixes rect size
|
2016-01-18 20:04:31 +01:00 |
|