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
1,180 Commits 8 Branches 114 Tags 67 MiB
756208413b
Commit Graph

1180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evert Timberg
756208413b Merge pull request #2014 from nnnick/update-code-climate-config 
Update code climate config
 2016-02-14 15:12:55 -05:00
etimberg
a79d365b49 add some more reporters 2016-02-14 14:43:02 -05:00
etimberg
1dc943ddb4 updates from running code climate locally 2016-02-14 13:25:37 -05:00
Evert Timberg
db2073139b improve syntax 2016-02-14 11:05:33 -05:00
Evert Timberg
172839af2c try and make this work 2016-02-14 10:31:31 -05:00
Evert Timberg
0732793b7e explicitly run certain engines 2016-02-14 10:24:17 -05:00
Evert Timberg
41f2b5707a Add codeclimate config 2016-02-14 10:08:00 -05:00
Evert Timberg
58fcb37760 fix typo in readme 2016-02-14 10:03:37 -05:00
Evert Timberg
d366f2b4d3 Merge pull request #2013 from nnnick/fix-coverage-report 
Fix coverage report
 2016-02-14 09:59:37 -05:00
Evert Timberg
766b748a58 Run coverage properly on the CI 2016-02-14 09:48:24 -05:00
Evert Timberg
38b2925e6c Use coveralls to report lines of coverage and add a badge to the readme 2016-02-14 09:38:26 -05:00
Evert Timberg
489f7ce6f7 use a new node version 2016-02-14 09:38:02 -05:00
etimberg
3226dfa495 coverage report works 2016-02-13 22:44:55 -05:00
etimberg
a84f9d9177 Update other test tasks to use karma-browserify 2016-02-13 21:58:49 -05:00
etimberg
96551c20db begin fixing coverage tests 2016-02-13 21:50:12 -05:00
etimberg
f6951816a0 Improve joshing reporting. Added a JSHint config file. 
Fixed JSHint warnings.
 2016-02-13 20:12:26 -05:00
Tanner Linsley
d9af94a715 Merge pull request #2007 from nnnick/browserify-build-system 
Browserify build system
 2016-02-13 09:25:23 -07:00
Tanner Linsley
eb2b04a9ff Documentation Updates for UMD support 2016-02-12 23:03:44 -07:00
Tanner Linsley
2f5e0924ef Built Files 2016-02-11 23:45:30 -07:00
Tanner Linsley
c5020c3e5a Updated Samples 2016-02-11 23:45:25 -07:00
Tanner Linsley
eb01a0d6f8 Core helpers reference 2016-02-11 23:45:14 -07:00
Tanner Linsley
999125c521 Testing for the new build system 2016-02-11 23:25:06 -07:00
Tanner Linsley
813d18bd78 Passing All Tests, Updated Dependencies 2016-02-11 23:16:43 -07:00
Tanner Linsley
007d029837 Bundled builds 
Possible usages are:

src/Chart.js (umd)
dist/Chart.js (ChartJS)
dist/Chart.min.js (ChartJS minified)
dist/Chart.bundle.js (ChartJS with Moment.js)
dist/Chart.bundle.min.js (ChartJS with Moment.js minified)
 2016-02-11 21:29:26 -07:00
Tanner Linsley
f2780bb825 Browserify for easier UMD consumptions and vanilla builds 2016-02-11 20:30:53 -07:00
Tanner Linsley
09783be8a9 Merge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering 2016-02-10 12:15:40 -07:00
Evert Timberg
a3dea119e8 Merge pull request #1978 from roben/v2.0-dev 
Fix tooltip error and add fixed steps to linear scale
 2016-02-09 07:29:40 -05:00
Robert Becker
55f9b68b0c Updated build and documentation 2016-02-09 13:04:07 +01:00
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
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
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