Commit Graph

1900 Commits

Author SHA1 Message Date
Evert Timberg
f5a2e394c8 Fix radius 0 2016-02-20 08:44:25 -05:00
Derek Perkins
8d6209271b Add link to slack invite 2016-02-19 21:21:26 -07:00
Evert Timberg
1bebda87f6 Merge pull request #2031 from mathiask88/customPointStyle
Adds the ability to draw custom point styles
2016-02-18 16:42:03 -05:00
Mathias Küsel
86b9139617 Adds the ability to draw custom point styles 2016-02-18 22:03:20 +01:00
Tanner Linsley
f572125820 Merge pull request #2027 from nnnick/fix-stacking-order-and-reversable-legend
Fix stacking, tooltip, and legend order for stackables
2016-02-17 13:11:40 -07:00
Tanner Linsley
50d0c98030 Tooltips now respect stacked ordering
Tooltips detect the stacked scale property now, reversing when
appropriate
2016-02-17 12:42:29 -07:00
Tanner Linsley
ee81d4a804 Reversible Legends
Legends can now be reversed with the `reversed: true` property.
2016-02-17 12:42:09 -07:00
Tanner Linsley
ac5be9bde2 Proper line and bar stacking order
Stacked line and bar charts now behave predictably with the first
dataset on the bottom stacked upwards.
2016-02-17 12:41:32 -07:00
Evert Timberg
57753b8280 update to new gulp and new uglify version. 2016-02-15 19:22:55 -05:00
Evert Timberg
111ada730c Fix typo in docs. Fixes #1042 2016-02-15 16:42:23 -05:00
Evert Timberg
4aa274d5b2 Default multiTooltipTemplate now shows the dataset label + updated built files. Fixes #612 2016-02-15 14:43:34 -05:00
Evert Timberg
4f4f804a71 Use a named define to fix #768 2016-02-15 14:38:11 -05:00
Evert Timberg
d31db87115 Updated build 2016-02-15 10:52:51 -05:00
Evert Timberg
c3149a9400 Merge pull request #2017 from nnnick/fix/1884
When the last label would overlap with the previously shown label, skip the previously shown one
2016-02-15 10:49:59 -05:00
Evert Timberg
4c35bba639 When the last label would overlap with the previously shown label, skip the previously shown one 2016-02-15 10:43:19 -05:00
Evert Timberg
2672efad63 Merge pull request #2015 from nnnick/fix/1962
Disable autoskipper for time scales
2016-02-15 09:44:53 -05:00
Evert Timberg
309ab1f477 Disable autoskipper for time scales 2016-02-15 09:41:35 -05:00
Evert Timberg
37b3fb5d6c Legend tests + fix minor bug where padding was not taken into account when going down to the next line 2016-02-15 09:23:31 -05:00
Evert Timberg
e589734cbb Title block tests 2016-02-14 18:04:12 -05:00
etimberg
01b88f19df Clean up code climate style issues and formatting. 2016-02-14 17:06:00 -05:00
Evert Timberg
d4917afba9 Update git ignore to make it easier to switch between branches. Add code climate config here as well. 2016-02-14 15:15:17 -05:00
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