Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 2.7.2 #5145

Merged
merged 56 commits into from Mar 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ffbdb48
Upgrade dependencies (incl. ESLint 4) (#4738)
benmccann Nov 1, 2017
7f751c8
Suppress coveralls errors if run from fork (#4699)
andig Nov 1, 2017
3470982
Fix incorrect samples titles (#4914)
aspaldiko Nov 2, 2017
95d7d8c
Add link to chartjs-plugin-waterfall (#4921)
MartinDawson Nov 6, 2017
67479c2
Relax dependencies semver range (#4891)
jsg2021 Nov 7, 2017
52790f6
Update extensions.md (#4930)
MartinDawson Nov 7, 2017
d415e61
Reset only when animating (#4923)
benmccann Nov 7, 2017
939756c
Fix log scale when value is 0 (#4913)
jcopperfield Nov 10, 2017
683e86e
Avoid tooltip truncation in x axis if there is enough space (#3998)
kaidohallik Nov 11, 2017
447ca40
Correctly handle stacked groups when not adjacent (#4937)
jcopperfield Nov 14, 2017
e080e78
Fix bumpy line on smooth data set (#4944)
jcopperfield Nov 14, 2017
6b824d9
add check on overwriting canvas height/width (#4874)
andersponders Nov 22, 2017
8ce7a91
Fix line to time axis documentation in bar chart docs (#4979)
etimberg Nov 22, 2017
e2dd448
Add an Ember.js Integration in the Documentation (#4984)
jpsirois Nov 25, 2017
42d3d91
Fix issue #4441 - y-axis labels partially hidden due to restrictive i…
jcopperfield Nov 25, 2017
333f2eb
Fix scale options update (#4198)
xg-wang Nov 29, 2017
9a7182b
Fix typos and broken links in the docs (#5010)
Nov 30, 2017
b835df0
Add Angular2+ libraries for Chart.js in docs (#5006)
christo-ph Dec 1, 2017
15d1056
Implement equally sized bars (#4994)
simonbrunel Dec 2, 2017
6f34b22
Fix issue #4928: linear tick generator doesn't round values to needed…
jcopperfield Dec 2, 2017
4e47c17
Fix tooltip animation when target changes while animating (#5005)
jcopperfield Dec 12, 2017
f0bf395
Fix issues #4572 and #4703 (#4959)
jcopperfield Dec 12, 2017
f9beedb
Fix issue #5029 (#5041)
jcopperfield Dec 14, 2017
b04ce94
Use time.unit option to create default min/max for empty chart (#5045)
jcopperfield Dec 15, 2017
ce1fc28
Improve point.xRange and point.yRange performance (#5062)
fanthos Dec 18, 2017
92d033b
Optimization: prevent double ticks array reverse for vertical logarit…
jcopperfield Dec 23, 2017
9874a75
Adding helpful note about legendCallback (#5094)
cameroncf Dec 29, 2017
fcd4633
Update license year and copyright holders (#5053)
simonbrunel Dec 31, 2017
33c7d94
Add back Chart.Ticks.formatters (#5088)
benmccann Jan 6, 2018
9ddb449
Use the Chart.js shared ESLint config (#5112)
simonbrunel Jan 6, 2018
ce27fe5
Make `Chart.layout(Service)` importable (#5113)
simonbrunel Jan 7, 2018
fb3ea03
Make `Chart.plugins` importable (#5114)
simonbrunel Jan 8, 2018
6bea15e
Rename Chart.layout to Chart.layouts (#5118)
simonbrunel Jan 9, 2018
1d5619d
Fix GitBook error with the shared ESLint config (#5133)
simonbrunel Jan 11, 2018
2f5a3e1
Ignore package-lock.json (#5138)
simonbrunel Jan 11, 2018
2d7f0a4
Fix updating plugin options (#5144)
simonbrunel Jan 13, 2018
37ec838
Format the label in the time scale tooltip (#5095)
benmccann Jan 13, 2018
e585c75
Log gulp error to Chart.js (#5143)
loicbourgois Jan 13, 2018
6d58a6a
Add tests related to showLines for controller.scatter (#5150)
loicbourgois Jan 16, 2018
26c44cf
Treat negative values in doughnut charts as positive (#5165)
etimberg Jan 21, 2018
9a0117a
Responsive printing docs (#5167)
etimberg Jan 21, 2018
d668882
Tooltip label callback example (#5168)
etimberg Jan 21, 2018
f82c8ad
Remove copy-pasta error in polar area and doughnut chart docs (#5169)
etimberg Jan 21, 2018
274fca6
Update custom tooltip documentation and samples (#5166)
etimberg Jan 21, 2018
98ef394
Fix variable name error on developer api documentation for (#5173)
jonquach Jan 27, 2018
e61392a
Don't draw tick across axis/border (#5178)
jhaenchen Jan 28, 2018
c268185
Fix Slack invitation link (#5217)
simonbrunel Feb 1, 2018
97ff458
Add Charba GWT integration to extensions.md (#5225)
stockiNail Feb 2, 2018
182270e
Setup HTML and JS linters for samples (#5195)
loicbourgois Feb 3, 2018
bba29e5
Remove trailing spaces from docs (#5227)
benmccann Feb 4, 2018
584d1c6
Fix label vertical alignment on vertical scales (#5248)
MPierre9 Feb 9, 2018
d6ce5c0
Support multiple font colors for radial chart labels (#5240)
flaurida Feb 15, 2018
be6660c
Improve title of generated documentation (#5256)
wmzhong Feb 16, 2018
c90cf2e
Make both README.md and installation.md clearer (#5274)
Feb 20, 2018
c2a5b12
Bugfix: Improve polyfill function of log10 to return whole powers of …
jcopperfield Feb 20, 2018
ac088a0
Bump version to 2.7.2 (#5307)
simonbrunel Mar 1, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 13 additions & 19 deletions .codeclimate.yml
@@ -1,25 +1,19 @@
engines:
version: "2"
plugins:
duplication:
enabled: true
config:
languages:
- javascript
eslint:
enabled: true
channel: "eslint-3"
- javascript
fixme:
enabled: true
ratings:
paths:
- "src/**/*.js"
exclude_paths:
- '.github/'
- 'dist/'
- 'test/'
- 'docs/'
- 'samples/'
- 'scripts/'
- '**.md'
- '**.json'
- 'gulpfile.js'
- 'karma.conf.js'
exclude_patterns:
- "dist/"
- "docs/"
- "samples/"
- "scripts/"
- "test/"
- "*.js"
- "*.json"
- "*.md"
- ".*"
224 changes: 0 additions & 224 deletions .eslintrc

This file was deleted.

7 changes: 7 additions & 0 deletions .eslintrc.yml
@@ -0,0 +1,7 @@
extends: chartjs

env:
browser: true
node: true

plugins: ['html']
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -6,9 +6,11 @@
/gh-pages
/jsdoc
/node_modules
/package-lock.json
.DS_Store
.idea
.vscode
bower.json
*.log
*.swp
*.stackdump
18 changes: 18 additions & 0 deletions .htmllintrc
@@ -0,0 +1,18 @@
{
"indent-style": "tabs",
"attr-quote-style": "double",
"spec-char-escape": false,
"attr-bans": [
"align",
"background",
"bgcolor",
"border",
"frameborder",
"longdesc",
"marginwidth",
"marginheight",
"scrolling"
],
"tag-bans": [ "b", "i" ],
"id-class-style": false
}
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -13,7 +13,7 @@ script:
- gulp docs
- gulp package
- gulp bower
- cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
- cat ./coverage/lcov.info | ./node_modules/.bin/coveralls || true

notifications:
slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2017 Nick Downie
Copyright (c) 2018 Chart.js Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
20 changes: 16 additions & 4 deletions README.md
@@ -1,6 +1,6 @@
# Chart.js

[![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![codeclimate](https://img.shields.io/codeclimate/github/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/chartjs/Chart.js) [![coveralls](https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://coveralls.io/github/chartjs/Chart.js?branch=master) [![slack](https://img.shields.io/badge/slack-Chart.js-blue.svg?style=flat-square&maxAge=3600)](https://chart-js-automation.herokuapp.com/)
[![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![coveralls](https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://coveralls.io/github/chartjs/Chart.js?branch=master) [![codeclimate](https://img.shields.io/codeclimate/maintainability/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/chartjs/Chart.js) [![slack](https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600)](https://chartjs-slack.herokuapp.com/)

*Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)

Expand All @@ -19,11 +19,23 @@ To install via bower:
bower install chart.js --save
```

#### Selecting the Correct Build
### Selecting the Correct Build

Chart.js provides two different builds that are available for your use. The `Chart.js` and `Chart.min.js` files include Chart.js and the accompanying color parsing library. If this version is used and you require the use of the time axis, [Moment.js](http://momentjs.com/) will need to be included before Chart.js.
Chart.js provides two different builds for you to choose: `Stand-Alone Build`, `Bundled Build`.

The `Chart.bundle.js` and `Chart.bundle.min.js` builds include Moment.js in a single file. This version should be used if you require time axes and want a single file to include, select this version. Do not use this build if your application already includes Moment.js. If you do, Moment.js will be included twice, increasing the page load time and potentially introducing version issues.
#### Stand-Alone Build
Files:
* `dist/Chart.js`
* `dist/Chart.min.js`

The stand-alone build includes Chart.js as well as the color parsing library. If this version is used, you are required to include [Moment.js](http://momentjs.com/) before Chart.js for the functionality of the time axis.

#### Bundled Build
Files:
* `dist/Chart.bundle.js`
* `dist/Chart.bundle.min.js`

The bundled build includes Moment.js in a single file. You should use this version if you require time axes and want to include a single file. You should not use this build if your application already included Moment.js. Otherwise, Moment.js will be included twice which results in increasing page load time and possible version compatability issues.

## Documentation

Expand Down
1 change: 1 addition & 0 deletions book.json
@@ -1,5 +1,6 @@
{
"root": "./docs",
"title": "Chart.js documentation",
"author": "chartjs",
"gitbook": "3.2.2",
"plugins": ["-lunr", "-search", "search-plus", "anchorjs", "chartjs", "ga"],
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
@@ -1,6 +1,6 @@
# Chart.js

[![slack](https://img.shields.io/badge/slack-Chart.js-blue.svg?style=flat-square&maxAge=600)](https://chart-js-automation.herokuapp.com/)
[![slack](https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600)](https://chartjs-slack.herokuapp.com/)

## Installation

Expand Down
1 change: 1 addition & 0 deletions docs/SUMMARY.md
Expand Up @@ -7,6 +7,7 @@
* [Usage](getting-started/usage.md)
* [General](general/README.md)
* [Responsive](general/responsive.md)
* [Pixel Ratio](general/device-pixel-ratio.md)
* [Interactions](general/interactions/README.md)
* [Events](general/interactions/events.md)
* [Modes](general/interactions/modes.md)
Expand Down