]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoFixed up formatting suggestions/issues as per comments from zachpanz88 2911/head
amlethojalen [Wed, 6 Jul 2016 22:35:21 +0000 (08:35 +1000)] 
Fixed up formatting suggestions/issues as per comments from zachpanz88

9 years agoAdded ability to render a line chart as a stepped line chart.
amlethojalen [Wed, 6 Jul 2016 01:13:12 +0000 (11:13 +1000)] 
Added ability to render a line chart as a stepped line chart.
Added option.elements.line.stepped
Added dataset.steppedLine
Added Sample, and updated documentation.

9 years agoAdded ability for drawing a Line Chart as a stepped Line Chart. (reverted from commit...
amlethojalen [Wed, 6 Jul 2016 00:25:01 +0000 (10:25 +1000)] 
Added ability for drawing a Line Chart as a stepped Line Chart. (reverted from commit efd06c886de405f00a93c506ef48a4e306c59af0)

9 years agoAdded ability for drawing a Line Chart as a stepped Line Chart.
amlethojalen [Tue, 5 Jul 2016 09:50:53 +0000 (19:50 +1000)] 
Added ability for drawing a Line Chart as a stepped Line Chart.

9 years agoMerge pull request #2867 from mtanda/fix_stacked_scatter_line_chart
Evert Timberg [Tue, 5 Jul 2016 02:57:40 +0000 (22:57 -0400)] 
Merge pull request #2867 from mtanda/fix_stacked_scatter_line_chart

Fix to work stacked scatter line chart (fixes #2878)

9 years agoMerge pull request #2901 from moberwasserlechner/fix/2894
Evert Timberg [Sun, 3 Jul 2016 21:09:30 +0000 (17:09 -0400)] 
Merge pull request #2901 from moberwasserlechner/fix/2894

Documentation fixes

9 years agoAdd more information to README on Building and Testing
zachpanz88 [Sun, 3 Jul 2016 04:24:35 +0000 (00:24 -0400)] 
Add more information to README on Building and Testing

9 years agoFinish incomplete sentence and remove trailing spaces. 2901/head
Michael Oberwasserlechner [Sat, 2 Jul 2016 14:46:29 +0000 (16:46 +0200)] 
Finish incomplete sentence and remove trailing spaces.

9 years agoadd id property to common configuration
Michael Oberwasserlechner [Sat, 2 Jul 2016 14:42:36 +0000 (16:42 +0200)] 
add id property to common configuration

9 years agoremove redundant option entry
Michael Oberwasserlechner [Sat, 2 Jul 2016 14:35:33 +0000 (16:35 +0200)] 
remove redundant option entry

9 years agostepSize defined twice. renaming the first to fixedStepSize
Michael Oberwasserlechner [Sat, 2 Jul 2016 11:55:53 +0000 (13:55 +0200)] 
stepSize defined twice. renaming the first to fixedStepSize

9 years agoMerge pull request #2897 from jimkring/patch-1
Evert Timberg [Sat, 2 Jul 2016 02:49:11 +0000 (22:49 -0400)] 
Merge pull request #2897 from jimkring/patch-1

Update 04-Bar-Chart.md

9 years agoUpdate 04-Bar-Chart.md 2897/head
Jim Kring [Fri, 1 Jul 2016 19:02:55 +0000 (12:02 -0700)] 
Update 04-Bar-Chart.md

Changed second instance of "Options for xAxes" heading to "Options for yAxes" since it is the heading for the y-axis options.

9 years agoMerge pull request #2893 from chartjs/fix/2888
Zach Panzarino [Fri, 1 Jul 2016 13:52:14 +0000 (09:52 -0400)] 
Merge pull request #2893 from chartjs/fix/2888

Fix typo in docs

9 years agoFix typo in docs 2893/head
Evert Timberg [Fri, 1 Jul 2016 12:55:35 +0000 (08:55 -0400)] 
Fix typo in docs

9 years agofix stacked scatter line chart 2867/head
Mitsuhiro Tanda [Wed, 29 Jun 2016 03:35:52 +0000 (12:35 +0900)] 
fix stacked scatter line chart

9 years agoMerge pull request #2865 from nmac143/master
Evert Timberg [Thu, 30 Jun 2016 00:30:02 +0000 (20:30 -0400)] 
Merge pull request #2865 from nmac143/master

Pie chart borders truncated #2844

9 years agoFixed truncation of pie chart borders 2865/head
nmac143 [Tue, 28 Jun 2016 20:33:43 +0000 (16:33 -0400)] 
Fixed truncation of pie chart borders

9 years agoMerge pull request #2857 from chartjs/fix/2809
Evert Timberg [Wed, 29 Jun 2016 01:59:39 +0000 (21:59 -0400)] 
Merge pull request #2857 from chartjs/fix/2809

Polar area graph scale should start at 0 by default

9 years agoMerge pull request #2863 from Mesonyx/mesonyx/feature/x-axis-highlighting
Evert Timberg [Tue, 28 Jun 2016 20:15:04 +0000 (16:15 -0400)] 
Merge pull request #2863 from Mesonyx/mesonyx/feature/x-axis-highlighting

adds x-axis hover option for charts and tooltips, highlights all dots…

9 years agomade table more readable 2863/head
Adam Templeton [Tue, 28 Jun 2016 20:05:04 +0000 (15:05 -0500)] 
made table more readable

9 years agoupdated docs with new option
Adam Templeton [Tue, 28 Jun 2016 19:59:22 +0000 (14:59 -0500)] 
updated docs with new option

9 years agoadds x-axis hover option for charts and tooltips, highlights all dots on x-axis upon...
Adam Templeton [Tue, 28 Jun 2016 19:15:12 +0000 (14:15 -0500)] 
adds x-axis hover option for charts and tooltips, highlights all dots on x-axis upon x-axis hover

9 years agoMerge pull request #2555 from simonbrunel/travis-dist
Evert Timberg [Tue, 28 Jun 2016 12:39:57 +0000 (08:39 -0400)] 
Merge pull request #2555 from simonbrunel/travis-dist

Travis GitHub Releases

9 years agoMerge pull request #2860 from azranel/fix-scale-links-in-docs
Evert Timberg [Tue, 28 Jun 2016 11:26:42 +0000 (07:26 -0400)] 
Merge pull request #2860 from azranel/fix-scale-links-in-docs

Change ID links for scales objects

9 years agoMerge pull request #2789 from awallat/awallat-patch-tooltip-multiple-datasets
Evert Timberg [Tue, 28 Jun 2016 11:26:05 +0000 (07:26 -0400)] 
Merge pull request #2789 from awallat/awallat-patch-tooltip-multiple-datasets

Fix tooltip not shown for missing dataset-value

9 years agoChange ID links for scales objects 2860/head
Bartosz Łęcki [Tue, 28 Jun 2016 10:22:41 +0000 (12:22 +0200)] 
Change ID links for scales objects

9 years agoFix tooltip not shown for missing dataset 2789/head
André Wallat [Thu, 16 Jun 2016 11:20:54 +0000 (13:20 +0200)] 
Fix tooltip not shown for missing dataset

When two datasets are shown and they don't have the same x-coordinates, then the position of the tooltip is not calculated correctly, when using mode 'label' or 'dataset'. This fix checks if the position of every dataset exists, before it is used.

9 years agoPolar area graph scale should start at 0 by default 2857/head
Evert Timberg [Tue, 28 Jun 2016 02:25:38 +0000 (22:25 -0400)] 
Polar area graph scale should start at 0 by default

9 years agoMerge pull request #2741 from duerahan/master
William Entriken [Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)] 
Merge pull request #2741 from duerahan/master

time type xAxis height crah in line chart #2622

9 years agoMerge pull request #2848 from ronaldgrn/patch-1
Evert Timberg [Sun, 26 Jun 2016 18:01:01 +0000 (14:01 -0400)] 
Merge pull request #2848 from ronaldgrn/patch-1

Fix line example not showing Scale Titles

9 years agoFix line example not showing Scale Titles 2848/head
ronaldgrn [Sun, 26 Jun 2016 17:07:51 +0000 (14:07 -0300)] 
Fix line example not showing Scale Titles

scaleLabel should have display: true instead of show: true

9 years agoMerge pull request #2841 from chartjs/fix/2839
Zach Panzarino [Fri, 24 Jun 2016 02:32:09 +0000 (22:32 -0400)] 
Merge pull request #2841 from chartjs/fix/2839

Fix typo in tooltip docs

9 years agoFix typo in tooltip docs 2841/head
Evert Timberg [Thu, 23 Jun 2016 23:40:45 +0000 (19:40 -0400)] 
Fix typo in tooltip docs

9 years agoMerge pull request #2823 from chartjs/fix/2708
Evert Timberg [Thu, 23 Jun 2016 02:07:53 +0000 (22:07 -0400)] 
Merge pull request #2823 from chartjs/fix/2708

Use the scale center point for the polar area chart center

9 years agoFix JSHint warning 2823/head
Evert Timberg [Thu, 23 Jun 2016 01:48:49 +0000 (21:48 -0400)] 
Fix JSHint warning

9 years agoMerge pull request #2811 from chartjs/fix/span-gaps-global
Evert Timberg [Thu, 23 Jun 2016 01:46:12 +0000 (21:46 -0400)] 
Merge pull request #2811 from chartjs/fix/span-gaps-global

Span gaps option should be specified at the chart level

9 years agoMerge pull request #2821 from chartjs/fix/2526
Evert Timberg [Thu, 23 Jun 2016 01:46:06 +0000 (21:46 -0400)] 
Merge pull request #2821 from chartjs/fix/2526

Gracefully handle creating the chart with no config

9 years agoMerge pull request #2822 from chartjs/fix/2604
Evert Timberg [Thu, 23 Jun 2016 01:45:59 +0000 (21:45 -0400)] 
Merge pull request #2822 from chartjs/fix/2604

Allow passing a value to the time scale getPixelForValue method

9 years agoMerge pull request #2828 from Kopleman/master
Evert Timberg [Thu, 23 Jun 2016 01:45:32 +0000 (21:45 -0400)] 
Merge pull request #2828 from Kopleman/master

Fix statements in for() in tooltips's getAveragePosition.

9 years agoFix statements in for() in tooltips's getAveragePosition. 2828/head
Alexey Kopleman Dvurechensky [Wed, 22 Jun 2016 11:46:00 +0000 (14:46 +0300)] 
Fix statements in for() in tooltips's getAveragePosition.

9 years agoUse the scale center point for the polar area chart center
Evert Timberg [Tue, 21 Jun 2016 23:57:13 +0000 (19:57 -0400)] 
Use the scale center point for the polar area chart center

9 years agoAllow passing a value to the time scale getPixelForValue method 2822/head
Evert Timberg [Tue, 21 Jun 2016 23:03:30 +0000 (19:03 -0400)] 
Allow passing a value to the time scale getPixelForValue method

9 years agoGracefully handle creating the chart with no config 2821/head
Evert Timberg [Tue, 21 Jun 2016 22:45:22 +0000 (18:45 -0400)] 
Gracefully handle creating the chart with no config

9 years agoMerge pull request #2800 from simonbrunel/#2734
Evert Timberg [Mon, 20 Jun 2016 18:42:59 +0000 (14:42 -0400)] 
Merge pull request #2800 from simonbrunel/#2734

#2734 Fix JSHint warnings

9 years agoSpan gaps option should be specified at the chart level 2811/head
Evert Timberg [Mon, 20 Jun 2016 18:42:09 +0000 (14:42 -0400)] 
Span gaps option should be specified at the chart level

9 years agoDrop official support for Bower 2555/head
Simon Brunel [Wed, 25 May 2016 18:53:02 +0000 (20:53 +0200)] 
Drop official support for Bower

Remove the bower.json file and update the documentation with the alternative bower-npm-resolver solution.

9 years agoMake Travis to release the npm package
Simon Brunel [Sun, 15 May 2016 21:32:05 +0000 (23:32 +0200)] 
Make Travis to release the npm package

Add .npmignore to include dist/*.js files to the npm release (but exclude zip files). See https://docs.travis-ci.com/user/deployment/npm/. Also cleanup the .gitignore file.

9 years agoNew Chart.js.zip package
Simon Brunel [Sat, 14 May 2016 23:19:57 +0000 (01:19 +0200)] 
New Chart.js.zip package

Samples need to be packaged with built libraries (which one have been removed from the repository), so create a new `gulp package` task to generate a ZIP archive with dist files, samples and the license file. This archive is generated in the ./dist/ folder and will be deployed by Travis along the GH release. Note that the ./dist/ folder is not preserved but merged in the archive root. Also change samples requiring moment.js to load this lib from the CDN instead of the ./node_module folder.

9 years agoAdd download links to the latest version
Simon Brunel [Sat, 14 May 2016 21:12:46 +0000 (23:12 +0200)] 
Add download links to the latest version

Remove outdated *standard build* and *bundled with Moment.js* links from the documentation and add a link to the latest GitHub release, from where the user can download `*.js` files.

9 years agoRemove and ignore dist/* files
Simon Brunel [Sat, 14 May 2016 18:44:55 +0000 (20:44 +0200)] 
Remove and ignore dist/* files

Travis now builds and deploys these files for all tags, so we don't need to have them on the repository anymore.

9 years agoMake Travis to deploy built files for tags
Simon Brunel [Sat, 14 May 2016 18:41:57 +0000 (20:41 +0200)] 
Make Travis to deploy built files for tags

See https://docs.travis-ci.com/user/deployment/releases

9 years agoRemove duplicated function names 2800/head
Simon Brunel [Sat, 18 Jun 2016 09:15:25 +0000 (11:15 +0200)] 
Remove duplicated function names

9 years agoFix #2734 Cleanup unused variables
Simon Brunel [Sat, 18 Jun 2016 09:00:11 +0000 (11:00 +0200)] 
Fix #2734 Cleanup unused variables

9 years agoV2.1.6 with tooltip array fix v2.1.6
Evert Timberg [Tue, 14 Jun 2016 23:32:24 +0000 (19:32 -0400)] 
V2.1.6 with tooltip array fix

9 years agoMerge pull request #2776 from chartjs/fix/2775
Evert Timberg [Tue, 14 Jun 2016 23:31:10 +0000 (19:31 -0400)] 
Merge pull request #2776 from chartjs/fix/2775

fix tooltip with array returns

9 years agofix tooltip with array returns 2776/head
Evert Timberg [Tue, 14 Jun 2016 23:19:15 +0000 (19:19 -0400)] 
fix tooltip with array returns

9 years agoMerge pull request #2760 from chartjs/2.1.5_release v2.1.5
Evert Timberg [Sun, 12 Jun 2016 17:21:06 +0000 (13:21 -0400)] 
Merge pull request #2760 from chartjs/2.1.5_release

Bump version to 2.1.5 and build

9 years agoBump version to 2.1.5 and build 2760/head
Evert Timberg [Sun, 12 Jun 2016 17:14:56 +0000 (13:14 -0400)] 
Bump version to 2.1.5 and build

9 years agoMerge pull request #2758 from chartjs/fix/zoom-curved-lines
Evert Timberg [Sun, 12 Jun 2016 16:18:27 +0000 (12:18 -0400)] 
Merge pull request #2758 from chartjs/fix/zoom-curved-lines

Do not cap bezier control point locations

9 years agoCapping these to the chart bounds causes lines to bend during pan and zoom 2758/head
Evert Timberg [Sun, 12 Jun 2016 13:19:33 +0000 (09:19 -0400)] 
Capping these to the chart bounds causes lines to bend during pan and zoom

9 years agoMerge pull request #2755 from chartjs/fix/2751
Evert Timberg [Sat, 11 Jun 2016 14:45:31 +0000 (10:45 -0400)] 
Merge pull request #2755 from chartjs/fix/2751

Fix pointLabel docs typo

9 years agoFix pointLabel docs typo 2755/head
Evert Timberg [Sat, 11 Jun 2016 13:24:55 +0000 (09:24 -0400)] 
Fix pointLabel docs typo

9 years agoMerge pull request #2752 from simonbrunel/plugins-arch
Evert Timberg [Sat, 11 Jun 2016 12:42:23 +0000 (08:42 -0400)] 
Merge pull request #2752 from simonbrunel/plugins-arch

Plugins Enhancement

9 years agoNew datasets update plugin extensions 2752/head
Simon Brunel [Fri, 10 Jun 2016 22:14:27 +0000 (00:14 +0200)] 
New datasets update plugin extensions

Add `beforeDatasetsUpdate` and `afterDatasetsUpdate` plugin notifications during the chart update. Plugins are able to cancel the datasets update by explicitly returning false to `beforeDatasetsUpdate`. For consistency, rename `(before|after)DatasetDraw` to `(before|after)DatasetsDraw`.

9 years agoAllow to register/unregister an array of plugins
Simon Brunel [Fri, 10 Jun 2016 20:27:06 +0000 (22:27 +0200)] 
Allow to register/unregister an array of plugins

The plugins service now accepts an array of plugin instances to register or unregister (for consistency, renamed `Chart.plugins.remove` to `unregister`). Also added a few methods to manipulate registered plugins, such as `count`, `getAll` and `clear` (mainly used by our unit tests).

9 years agoEnhance plugin notification system
Simon Brunel [Fri, 10 Jun 2016 20:26:55 +0000 (22:26 +0200)] 
Enhance plugin notification system

Change the plugin notification behavior: this method now returns false as soon as a plugin *explicitly* returns false, else returns true. Also, plugins are now called in their own scope (so remove the never used `scope` parameter).

9 years agoRename plugin service and notification method
Simon Brunel [Fri, 10 Jun 2016 20:26:35 +0000 (22:26 +0200)] 
Rename plugin service and notification method

Rename `Chart.pluginService` to `Chart.plugins` (so move the old Chart.plugins array as a private member of the service), and rename `notifyPlugins` to `notify` for consistency with other service methods.

9 years agoRemove link that doesn't exist anymore in scale docs
Zach Panzarino [Fri, 10 Jun 2016 15:00:17 +0000 (15:00 +0000)] 
Remove link that doesn't exist anymore in scale docs

9 years agoMerge pull request #2739 from msimulcik/master
Evert Timberg [Thu, 9 Jun 2016 22:36:26 +0000 (18:36 -0400)] 
Merge pull request #2739 from msimulcik/master

Fix of radial linear scale font family settings bug

9 years agoMerge pull request #2732 from chartjs/scale-colors-per-line
Evert Timberg [Thu, 9 Jun 2016 22:35:48 +0000 (18:35 -0400)] 
Merge pull request #2732 from chartjs/scale-colors-per-line

Scale colors per line

9 years agoMerge pull request #2723 from chartjs/vertical-legend
Evert Timberg [Thu, 9 Jun 2016 22:35:29 +0000 (18:35 -0400)] 
Merge pull request #2723 from chartjs/vertical-legend

Vertical legend

9 years agoRevert "Fixed radial linear scale font family settings bug" 2739/head
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.

9 years agotime type xAxis height crah in line chart 2741/head
Jack Valuntine [Thu, 9 Jun 2016 04:34:15 +0000 (13:34 +0900)] 
time type xAxis height crah in line chart

if input only one data in dataset and xAxis type is date make offset crash.
check offset value and don't devide 0 value.
Add xAxis check test case.

9 years agoMerge pull request #2712 from simonbrunel/helpers-cleanup
Evert Timberg [Thu, 9 Jun 2016 00:08:44 +0000 (20:08 -0400)] 
Merge pull request #2712 from simonbrunel/helpers-cleanup

Rewrite a few helpers to be more efficient

9 years agoMerge pull request #2730 from duerahan/master
Evert Timberg [Wed, 8 Jun 2016 15:15:12 +0000 (11:15 -0400)] 
Merge pull request #2730 from duerahan/master

Tooltip options fontColor fixed

9 years agoChartJS tooltip fontColor fix 2730/head
Jack Valentine [Wed, 8 Jun 2016 15:04:20 +0000 (00:04 +0900)] 
ChartJS tooltip fontColor fix

fixed global variable name fix
callback variable name fix
- 'titleColor' to 'titleFontColor'
- 'bodyColor' to 'bodyFontColor'
- 'footerColor' to 'footerFontColor'

9 years agotitleColor options is not available
Jack Valentine [Wed, 8 Jun 2016 14:15:21 +0000 (23:15 +0900)] 
titleColor options is not available

titleColor change to titleFontColor

9 years agocore tooltip test case fixe
Jack Valentine [Wed, 8 Jun 2016 14:01:41 +0000 (23:01 +0900)] 
core tooltip test case fixe

titleColor options is not available
titleColor change to titleFontColor

9 years agoFixed radial linear scale font family settings bug
Miroslav Simulcik [Wed, 8 Jun 2016 13:21:54 +0000 (15:21 +0200)] 
Fixed radial linear scale font family settings bug

9 years agoReduce duplicated code in core scale draw method 2732/head
Evert Timberg [Wed, 8 Jun 2016 01:32:26 +0000 (21:32 -0400)] 
Reduce duplicated code in core scale draw method

9 years agoFix tooltip core test case
문승찬 [Wed, 8 Jun 2016 01:22:47 +0000 (10:22 +0900)] 
Fix tooltip core test case

Change tooltip font color options
this options changed in tooltip core
bodyColor  -> bodyFontColor
titleColor -> titleFontColor
footerColor -> footerFontColor

9 years agochange tooltip font color option
문승찬 [Wed, 8 Jun 2016 01:16:38 +0000 (10:16 +0900)] 
change tooltip font color option

bodyColor  -> bodyFontColor
titleColor -> titleFontColor
footerColor -> footerFontColor

9 years agoSupport arrays of colors and line widths in cartesian axes
Evert Timberg [Wed, 8 Jun 2016 00:22:06 +0000 (20:22 -0400)] 
Support arrays of colors and line widths in cartesian axes

9 years agoRadial linear scale array properties for line width and color
Evert Timberg [Wed, 8 Jun 2016 00:09:33 +0000 (20:09 -0400)] 
Radial linear scale array properties for line width and color

9 years agoMerge pull request #2724 from rawliving-germany/master
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.

9 years agoRefactor spanGaps for line graphs with sparse data (#2721)
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.

9 years agofix typo in tooltip conf doc. 2724/head
Felix Wolfsteller [Tue, 7 Jun 2016 05:46:13 +0000 (07:46 +0200)] 
fix typo in tooltip conf doc.

9 years agoOptimize legend drawing 2723/head
Evert Timberg [Tue, 7 Jun 2016 02:14:42 +0000 (22:14 -0400)] 
Optimize legend drawing

9 years agoInitial vertical legend mode
Evert Timberg [Tue, 7 Jun 2016 01:41:40 +0000 (21:41 -0400)] 
Initial vertical legend mode

9 years agoMerge pull request #2716 from thebenedict/master
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 …

9 years agostyle canvas element `display: block` by default 2716/head
thebenedict [Mon, 6 Jun 2016 14:05:44 +0000 (17:05 +0300)] 
style canvas element `display: block` by default

9 years agoRewrite a few helpers to be more efficient 2712/head
Simon Brunel [Sun, 5 Jun 2016 20:40:29 +0000 (22:40 +0200)] 
Rewrite a few helpers to be more efficient

Resolve at definition time if a browser built-in method or our polyfill should be used, so avoid checking it for each call. Also, `helpers.extend` doesn't need to iterate two times on the function arguments. Finally, remove helpers never referenced.

9 years agoMerge pull request #2711 from simonbrunel/bundle-collapser
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

9 years agoUse bundle-collapser to reduce build size 2711/head
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.

9 years agoMerge pull request #2706 from sassomedia/master_updateBuildAMD
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)

9 years agoMerge branch 'Tarqwyn-multiline_labels'
Evert Timberg [Sun, 5 Jun 2016 00:49:19 +0000 (20:49 -0400)] 
Merge branch 'Tarqwyn-multiline_labels'

9 years agoMerge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn...
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

9 years agoMerge pull request #2695 from zachpanz88/this-rename
Evert Timberg [Sat, 4 Jun 2016 22:25:14 +0000 (18:25 -0400)] 
Merge pull request #2695 from zachpanz88/this-rename

Rename `this` keyword

9 years agoUpdate this -> me with master 2695/head
zachpanz88 [Sat, 4 Jun 2016 18:16:35 +0000 (14:16 -0400)] 
Update this -> me with master