]>
git.ipfire.org Git - thirdparty/Chart.js.git/log
Miroslav Simulcik [Thu, 9 Jun 2016 07:34:09 +0000 (09:34 +0200)]
Revert "Fixed radial linear scale font family settings bug"
This reverts commit
6e3c6c05ad41c08fecffcfa468482036119c5267 .
Miroslav Simulcik [Wed, 8 Jun 2016 13:21:54 +0000 (15:21 +0200)]
Fixed radial linear scale font family settings bug
Evert Timberg [Tue, 7 Jun 2016 12:53:34 +0000 (08:53 -0400)]
Merge pull request #2724 from rawliving-germany/master
fix typo in tooltip conf doc.
Ryan M. Poe [Tue, 7 Jun 2016 07:15:26 +0000 (03:15 -0400)]
Refactor spanGaps for line graphs with sparse data (#2721)
Fix #2435, this very slim patch (including its relevant documentation addition) adds a small option to line chart datasets (spanGaps) that allows users trying to graph sparse datasets to have lines between null entries drawn, rather than omitted.
Felix Wolfsteller [Tue, 7 Jun 2016 05:46:13 +0000 (07:46 +0200)]
fix typo in tooltip conf doc.
Evert Timberg [Mon, 6 Jun 2016 14:14:59 +0000 (10:14 -0400)]
Merge pull request #2716 from thebenedict/master
Make canvas element display: block by default, with config option to …
thebenedict [Mon, 6 Jun 2016 14:05:44 +0000 (17:05 +0300)]
style canvas element `display: block` by default
Evert Timberg [Sun, 5 Jun 2016 12:56:05 +0000 (08:56 -0400)]
Merge pull request #2711 from simonbrunel/bundle-collapser
Use bundle-collapser to reduce build size
Simon Brunel [Sun, 29 May 2016 14:56:10 +0000 (16:56 +0200)]
Use bundle-collapser to reduce build size
This browserify plugin converts required string paths to int (see https://github.com/substack/bundle-collapser), lowering our *.min.js by ~1.8KB.
Evert Timberg [Sun, 5 Jun 2016 00:49:49 +0000 (20:49 -0400)]
Merge pull request #2706 from sassomedia/master_updateBuildAMD
Amend build task with flag for AMD compatible builds (#2298)
Evert Timberg [Sun, 5 Jun 2016 00:49:19 +0000 (20:49 -0400)]
Merge branch 'Tarqwyn-multiline_labels'
Evert Timberg [Sun, 5 Jun 2016 00:48:26 +0000 (20:48 -0400)]
Merge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn-multiline_labels
Conflicts:
src/core/core.scale.js
Evert Timberg [Sat, 4 Jun 2016 22:25:14 +0000 (18:25 -0400)]
Merge pull request #2695 from zachpanz88/this-rename
Rename `this` keyword
zachpanz88 [Sat, 4 Jun 2016 18:16:35 +0000 (14:16 -0400)]
Update this -> me with master
zachpanz88 [Sat, 4 Jun 2016 18:14:16 +0000 (14:14 -0400)]
Change this -> me in source files
This change allows for smaller minified code in the final version, resulting in a smaller file size. Some files had previously used _this, but that has been changed to me to keep consistency throughout the project.
Evert Timberg [Sat, 4 Jun 2016 14:51:29 +0000 (10:51 -0400)]
Merge pull request #2696 from NoelOConnell/master
Fix for chart title not updating
Evert Timberg [Sat, 4 Jun 2016 14:47:15 +0000 (10:47 -0400)]
Merge pull request #2698 from dennybiasiolli/fix_label_fillstyle
legend: fix rendering in browsers other than Chrome
Eric D. Lewis [Fri, 3 Jun 2016 21:19:29 +0000 (17:19 -0400)]
Amend build task with flag for AMD compatible builds (#2298)
Evert Timberg [Fri, 3 Jun 2016 22:27:26 +0000 (18:27 -0400)]
Merge pull request #2694 from chartjs/fix/2689
Add a way to know when a resize occurs.
Tarqwyn [Fri, 3 Jun 2016 19:15:29 +0000 (20:15 +0100)]
Suggested changes from PR review
Changes to be committed:
modified: docs/02-Scales.md
modified: src/core/core.helpers.js
modified: src/core/core.scale.js
modified: test/core.helpers.tests.js
Tarqwyn [Fri, 3 Jun 2016 16:01:52 +0000 (17:01 +0100)]
This PR allows for multi-line labels, as per Slack discussion..
Usage: If a label is an `array` as opposed to a `string` i.e. `[["June","2015"], "July"]` then each element is treated as a seperate line. The appropriate calculations are made to determine the correct height and width, and rotation is still supported.
view samples/line-multiline-labels.html to see it working.
On branch multiline_labels
Changes to be committed:
modified: docs/03-Line-Chart.md
new file: samples/line-multiline-labels.html
modified: src/core/core.helpers.js
modified: src/core/core.scale.js
Denny Biasiolli [Fri, 3 Jun 2016 08:49:06 +0000 (10:49 +0200)]
legend: fix rendering in browsers other than Chrome when dataset.backgroundColor is Array
Noel [Fri, 3 Jun 2016 08:07:14 +0000 (09:07 +0100)]
Fix for chart title not updating
https://github.com/chartjs/Chart.js/issues/2686
Chart options were using a cache value from initialize function.
Now updating values in the beforeUpdate lifecycle.
Evert Timberg [Fri, 3 Jun 2016 00:43:38 +0000 (20:43 -0400)]
Add a way to know when a resize occurs.
Evert Timberg [Fri, 3 Jun 2016 00:35:39 +0000 (20:35 -0400)]
Merge pull request #2680 from chartjs/fix/clipping
Remove clipping and add plugin hooks.
Evert Timberg [Fri, 3 Jun 2016 00:25:53 +0000 (20:25 -0400)]
Merge pull request #2693 from ansballard/add-reference-to-chart
Added a reference to Chart within Chart for Issue #2483
Aaron Ballard [Thu, 2 Jun 2016 21:04:33 +0000 (16:04 -0500)]
Added a reference to Chart within Chart for Issue #2483
Zach Panzarino [Thu, 2 Jun 2016 14:52:19 +0000 (10:52 -0400)]
Update Contributing Guidelines
Evert Timberg [Wed, 1 Jun 2016 11:18:27 +0000 (07:18 -0400)]
add afterDatasetDraw in correct place
Evert Timberg [Wed, 1 Jun 2016 02:28:22 +0000 (22:28 -0400)]
Docs on new plugin callback
Evert Timberg [Wed, 1 Jun 2016 02:16:29 +0000 (22:16 -0400)]
Remove clipping and add plugin hooks. Zoom plugin can then do the clipping itself
Evert Timberg [Wed, 1 Jun 2016 02:01:09 +0000 (22:01 -0400)]
Merge pull request #2671 from chartjs/bubble-controller-improvements
Improve bubble, doughnut, and polar area controller minification and code duplication.
Zach Panzarino [Tue, 31 May 2016 17:51:22 +0000 (13:51 -0400)]
Merge pull request #2678 from zachpanz88/doc-fix
Fix doc syntax
Zach Panzarino [Tue, 31 May 2016 17:50:02 +0000 (17:50 +0000)]
Fix doc syntax (#2673)
Evert Timberg [Tue, 31 May 2016 15:52:51 +0000 (11:52 -0400)]
Merge pull request #2675 from FROGGS/patch-1
Fix links to 09-Advanced.md (was 07-Advanced.md)
Tobias Leich [Tue, 31 May 2016 13:26:34 +0000 (15:26 +0200)]
Fix links to 09-Advanced.md (was 07-Advanced.md)
Evert Timberg [Tue, 31 May 2016 01:55:58 +0000 (21:55 -0400)]
Improve core and polar area
Evert Timberg [Tue, 31 May 2016 01:42:15 +0000 (21:42 -0400)]
Polar area controller improvements
Evert Timberg [Tue, 31 May 2016 01:33:11 +0000 (21:33 -0400)]
Reduce duplicated code in doughnut controller
Evert Timberg [Mon, 30 May 2016 23:07:31 +0000 (19:07 -0400)]
Improve bubble controller minification and code duplication.
Evert Timberg [Mon, 30 May 2016 15:46:05 +0000 (11:46 -0400)]
Merge pull request #2668 from zachpanz88/restructure-issues
Change templates for issues/PRs
Zach Panzarino [Mon, 30 May 2016 15:37:19 +0000 (15:37 +0000)]
Change templates for issues/PRs
Evert Timberg [Sun, 29 May 2016 20:30:31 +0000 (16:30 -0400)]
Update colors for chart that is created
Evert Timberg [Sun, 29 May 2016 16:10:30 +0000 (12:10 -0400)]
Merge pull request #2661 from chartjs/tooltip-improvements-and-tests
Improve tooltip performance and added new options
Evert Timberg [Sun, 29 May 2016 14:49:00 +0000 (10:49 -0400)]
Merge pull request #2664 from chartjs/fix/1980-and-2662
Linear and RadialLinear scales now derive from a common base class
Evert Timberg [Sun, 29 May 2016 14:31:58 +0000 (10:31 -0400)]
Update radial linear scale docs
Evert Timberg [Sun, 29 May 2016 14:16:47 +0000 (10:16 -0400)]
Linear and RadialLinear scales now derive from a common base class
Evert Timberg [Sun, 29 May 2016 01:17:30 +0000 (21:17 -0400)]
Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart.js into tooltip-improvements-and-tests
Conflicts:
test/core.tooltip.tests.js
Evert Timberg [Sun, 29 May 2016 00:55:20 +0000 (20:55 -0400)]
Improve testing on the CI
Evert Timberg [Sun, 29 May 2016 01:01:10 +0000 (21:01 -0400)]
Fix CI & JShint issues
Evert Timberg [Sun, 29 May 2016 00:55:20 +0000 (20:55 -0400)]
Improve testing on CI
Evert Timberg [Sun, 29 May 2016 00:47:36 +0000 (20:47 -0400)]
Add a way of sorting tooltip items with a custom sort function
Evert Timberg [Sat, 28 May 2016 23:39:15 +0000 (19:39 -0400)]
Improve tooltip minification
Evert Timberg [Sat, 28 May 2016 19:26:46 +0000 (15:26 -0400)]
Initial tooltip tests + fix a bug when the tooltip beforeLabel and afterLabel callbacks returned strings
Evert Timberg [Sat, 28 May 2016 16:14:27 +0000 (12:14 -0400)]
Merge pull request #2657 from chartjs/tooltip-color-callback
Provide a way to configure the colour of tooltip items
Evert Timberg [Sat, 28 May 2016 15:26:09 +0000 (11:26 -0400)]
Merge pull request #2660 from chartjs/fix/2613
When destroying the chart, any animations should be stopped.
Evert Timberg [Sat, 28 May 2016 15:05:02 +0000 (11:05 -0400)]
When destroying the chart, any animations should be stopped.
Evert Timberg [Sat, 28 May 2016 14:56:25 +0000 (10:56 -0400)]
Merge pull request #2658 from chartjs/fix/2580
Allow turning off lines on a per dataset basis
Evert Timberg [Sat, 28 May 2016 14:52:42 +0000 (10:52 -0400)]
Merge pull request #2659 from chartjs/fix/2639
Fix pie custom tooltip sample
Evert Timberg [Sat, 28 May 2016 14:48:33 +0000 (10:48 -0400)]
Fix pie custom tooltip sample
Evert Timberg [Sat, 28 May 2016 02:20:51 +0000 (22:20 -0400)]
Allow turning off lines on a per dataset basis
Evert Timberg [Sat, 28 May 2016 01:19:28 +0000 (21:19 -0400)]
Merge pull request #2640 from chartjs/legend-and-title-as-plugins
Legend and title as plugins
Evert Timberg [Sat, 28 May 2016 01:07:02 +0000 (21:07 -0400)]
Tooltip now has a callback for configuring the colors of items displayed. Added docs and improved the options passed to the tooltip
Evert Timberg [Fri, 27 May 2016 00:23:10 +0000 (20:23 -0400)]
Merge pull request #2649 from chartjs/fix/2647
Line points always need to pivot
Evert Timberg [Fri, 27 May 2016 00:02:46 +0000 (20:02 -0400)]
Line points need always need to pivot after regardless of whether or not bezier points are updated. Bezier points should only be updated if the line tension is not 0.
Evert Timberg [Thu, 26 May 2016 23:42:37 +0000 (19:42 -0400)]
Merge pull request #2648 from chartjs/fix/2607
Don't use translates and rotates for drawing rotated rectangles
Evert Timberg [Thu, 26 May 2016 23:38:27 +0000 (19:38 -0400)]
Don't use translates and rotates for drawing rotated rectangles
Evert Timberg [Thu, 26 May 2016 23:22:11 +0000 (19:22 -0400)]
Fix tests
Evert Timberg [Thu, 26 May 2016 22:43:39 +0000 (18:43 -0400)]
2.1.4 release
Evert Timberg [Thu, 26 May 2016 21:51:27 +0000 (17:51 -0400)]
Merge pull request #2645 from Rowno/patch-1
docs: fix the bar chart default axis id's
Roland Warmerdam [Thu, 26 May 2016 21:38:53 +0000 (14:38 -0700)]
docs: fix the bar chart default axis id's
Evert Timberg [Thu, 26 May 2016 01:30:22 +0000 (21:30 -0400)]
Remove unused code from core controller.
Evert Timberg [Thu, 26 May 2016 01:28:02 +0000 (21:28 -0400)]
Convert title block to a plugin
Evert Timberg [Thu, 26 May 2016 01:23:46 +0000 (21:23 -0400)]
Legend is attached to the graph as a plugin.
Evert Timberg [Wed, 25 May 2016 22:50:32 +0000 (18:50 -0400)]
Merge pull request #2625 from chartjs/fix/2344
Start on Documentation Update
Evert Timberg [Wed, 25 May 2016 22:43:35 +0000 (18:43 -0400)]
Merge branch 'master' into fix/2344
Evert Timberg [Wed, 25 May 2016 22:37:07 +0000 (18:37 -0400)]
Fix scale typos
Simon Brunel [Tue, 24 May 2016 22:04:59 +0000 (00:04 +0200)]
Fix #2418 Firefox old version compatibility
Old versions of FF doesn't accept accessing the computed style via the 'max-width' and 'max-height' CSS notations using brackets, in which case the returned value is undefined. Changed the constraint methods to use maxWidth and mawHeight instead and make sure to test valid values.
Vanderhoven Nick [Wed, 25 May 2016 09:03:50 +0000 (11:03 +0200)]
This fixes documentation issue #2628
Simon Brunel [Sat, 21 May 2016 22:21:59 +0000 (00:21 +0200)]
Decomplexify Chart.core.controller.eventHandler
Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).
Simon Brunel [Sat, 21 May 2016 20:53:58 +0000 (22:53 +0200)]
Refactor controller scale methods
Rewrite these two methods to reduce code duplication. Note that options.scale is not anymore mapped to 'radialScale' ID but to 'scale' ID (see ensureScalesHaveIDs), since this ID is not referenced anywhere in the code base.
Simon Brunel [Fri, 20 May 2016 21:42:24 +0000 (23:42 +0200)]
Refactor addElements and addElementAndReset
Data controllers should now rarely implement addElements and addElementAndReset but instead should define dataElementType (and optionally datasetElementType). Also remove some dead code (e.g. numBars, colorForNewElement, etc.).
Simon Brunel [Fri, 20 May 2016 18:17:28 +0000 (20:17 +0200)]
Refactor scale base pixel and point calculation.
Zach Panzarino [Tue, 24 May 2016 15:04:20 +0000 (15:04 +0000)]
Clean up gulpfile even more
Zach Panzarino [Tue, 24 May 2016 13:02:02 +0000 (13:02 +0000)]
Clean up gulpfile
Evert Timberg [Sat, 14 May 2016 19:59:40 +0000 (15:59 -0400)]
Helpers improvements
Hagen Schulze [Wed, 18 May 2016 18:42:54 +0000 (20:42 +0200)]
This fixes #2589
Evert Timberg [Wed, 25 May 2016 22:27:57 +0000 (18:27 -0400)]
Improve line chart docs
Evert Timberg [Sat, 21 May 2016 01:03:59 +0000 (21:03 -0400)]
Scale docs
Evert Timberg [Thu, 19 May 2016 02:49:20 +0000 (22:49 -0400)]
Improve configuration options
Evert Timberg [Wed, 25 May 2016 21:44:38 +0000 (17:44 -0400)]
Merge pull request #2637 from simonbrunel/fix/2418
Fix #2418 Firefox old version compatibility
Simon Brunel [Tue, 24 May 2016 22:04:59 +0000 (00:04 +0200)]
Fix #2418 Firefox old version compatibility
Old versions of FF doesn't accept accessing the computed style via the 'max-width' and 'max-height' CSS notations using brackets, in which case the returned value is undefined. Changed the constraint methods to use maxWidth and mawHeight instead and make sure to test valid values.
Evert Timberg [Wed, 25 May 2016 13:03:14 +0000 (09:03 -0400)]
Merge pull request #2629 from nvdh/master
Fix for documentation issue #2628
Vanderhoven Nick [Wed, 25 May 2016 09:03:50 +0000 (11:03 +0200)]
This fixes documentation issue #2628
Evert Timberg [Wed, 25 May 2016 01:30:10 +0000 (21:30 -0400)]
Merge pull request #2612 from simonbrunel/refactor
Refactor and clean up
Zach Panzarino [Tue, 24 May 2016 15:04:20 +0000 (15:04 +0000)]
Clean up gulpfile even more
Evert Timberg [Tue, 24 May 2016 13:24:05 +0000 (09:24 -0400)]
Merge pull request #2620 from zachpanz88/code-climate
Clean up gulpfile
Zach Panzarino [Tue, 24 May 2016 13:02:02 +0000 (13:02 +0000)]
Clean up gulpfile
Simon Brunel [Sat, 21 May 2016 22:21:59 +0000 (00:21 +0200)]
Decomplexify Chart.core.controller.eventHandler
Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).
Simon Brunel [Sat, 21 May 2016 20:53:58 +0000 (22:53 +0200)]
Refactor controller scale methods
Rewrite these two methods to reduce code duplication. Note that options.scale is not anymore mapped to 'radialScale' ID but to 'scale' ID (see ensureScalesHaveIDs), since this ID is not referenced anywhere in the code base.