Skip to content

Commit

Permalink
Merge pull request chartjs#6092 from chartjs/master
Browse files Browse the repository at this point in the history
Version 2.8.0
  • Loading branch information
simonbrunel committed Mar 14, 2019
2 parents d9fc76e + 1279c9c commit 24cb38c
Show file tree
Hide file tree
Showing 455 changed files with 16,616 additions and 7,838 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
@@ -1,4 +1,4 @@
# http://editorconfig.org
# https://editorconfig.org
root = true

[*]
Expand All @@ -7,7 +7,7 @@ indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
insert_final_newline = true

[gulpfile.js]
indent_style = space
Expand Down
48 changes: 10 additions & 38 deletions .github/ISSUE_TEMPLATE.md
@@ -1,42 +1,14 @@
<!--
Please consider the following before submitting an issue:
Need help or support? Don't open an issue!
Head to https://stackoverflow.com/questions/tagged/chart.js
- Ask questions and get support on StackOverflow: https://stackoverflow.com/questions/tagged/chart.js
- DO NOT create issues for questions or support requests.
- Issues are reserved for BUG reports and FEATURE requests.
- Most features should start as plugins outside of Chart.js (http://www.chartjs.org/docs/#advanced-usage-creating-plugins).
- Bug reports MUST be submitted with an interactive example (http://codepen.io/pen?template=JXVYzq).
- Chart.js 1.x is NOT supported anymore, new issues will be disregarded.
-->

<!--- Provide a general summary of the issue in the Title above prefixed by [BUG] or [FEATURE] -->

## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
Ahoy!
## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->
You're seeing this because you felt none of the other options fit the type of
issue you'd like to create. Please use this opportunity to tell us about the
type of issue you were looking for, so we can try to accommodate similar
issues in the future.
## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Context
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

## Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Chart.js version:
* Browser name and version:
* Link to your project:
If you're using this template to report an issue covered by an existing issue
type, we'll close it as invalid faster than you can spell 'Mississippi'.
-->
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG.md
@@ -0,0 +1,50 @@
---
name: Bug Report
about: Something went awry
labels: 'type: bug'
---

<!--
Need help or support? Please don't open an issue!
Head to https://stackoverflow.com/questions/tagged/chart.js
Bug reports MUST be submitted with an interactive example:
https://codepen.io/pen?template=JXVYzq
Chart.js 1.x is NOT supported anymore, new issues will be disregarded.
-->

## Expected Behavior
<!-- Tell us what should happen -->

## Current Behavior
<!-- Tell us what happens instead of the expected behavior -->

## Possible Solution
<!--
Not obligatory, but suggest a fix/reason for the bug,
or ideas how to implement the addition or change
-->

## Steps to Reproduce (for bugs)
<!--
Provide a link to a live example. Bug reports MUST be submitted with an
interactive example (https://codepen.io/pen?template=JXVYzq).
If filing a bug against `master`, you may reference the latest code via
https://www.chartjs.org/dist/master/Chart.min.js (changing the filename to
point at the file you need as appropriate). Do not rely on these files for
production purposes as they may be removed at any time.
-->

## Context
<!--
How has this issue affected you? What are you trying to accomplish? Providing
context helps us come up with a solution that is most useful in the real world
-->

## Environment
<!-- Include as many relevant details about the environment you experienced the bug in -->
* Chart.js version:
* Browser name and version:
* Link to your project:
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/DOCS.md
@@ -0,0 +1,25 @@
---
name: Documentation
about: Are the docs lacking or missing something?
labels: 'type: documentation'
---

Documentation Is:

<!-- Please place an x (no spaces!) in all [ ] that apply -->

- [ ] Missing or needed
- [ ] Confusing
- [ ] Not Sure?

### Please Explain in Detail...


### Your Proposal for Changes


### Example
<!--
Provide a link to a live example demonstrating the issue or feature to be documented:
https://codepen.io/pen?template=JXVYzq
-->
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE.md
@@ -0,0 +1,25 @@
---
name: Feature Request
about: Suggest an idea
labels: 'type: enhancement'
---

<!--
Most features should start as plugins outside of Chart.js
(https://www.chartjs.org/docs/#advanced-usage-creating-plugins).
Please consider whether your changes are useful for all users, or if this is
specific to your usecase and a Chart.js plugin would be more appropriate.
Need help or tech support? Please don't open an issue!
Head to https://stackoverflow.com/questions/tagged/chart.js
-->

### Feature Proposal
<!-- Tell us how it should work -->

### Feature Use Case
<!-- What are you trying to accomplish? -->
<!-- Providing context helps us come up with a solution that is most useful in the real world -->

## Possible Implementation
<!-- Not obligatory, but suggest ideas for how to implement the addition or change -->
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/SUPPORT.md
@@ -0,0 +1,27 @@
---
name: Support, Help, and Advice
about: Need help or support? Head to https://stackoverflow.com/questions/tagged/chart.js
labels: 'type: support'
---

<!--
Hey there!
If you need help or tech support then this is not the place to ask. Please post
a question to https://stackoverflow.com/questions/tagged/chart.js or head over
to our Slack workspace at https://chartjs-slack.herokuapp.com/.
You maximize your chances of having your question answered if you follow
StackOverflow's guidelines: https://stackoverflow.com/help/how-to-ask.
If your question was not answered on StackOverflow, that does not mean you
should post it here. If you do, it will be immediately closed.
Chart.js users vastly outnumber our small number of volunteer maintainers and
we try to help as many users as we can, but we may not get to every question.
Chart.js is a community project. You can contribute towards the goal of helping
every user by asking good questions, answering questions on StackOverflow
or Slack, creating an issue or pull request for the documentation, or otherwise
contributing to the project:
https://www.chartjs.org/docs/latest/developers/contributing.html
-->
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -4,8 +4,8 @@ Please consider the following before submitting a pull request:
Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
Example of changes on an interactive website such as the following:
- http://jsbin.com/
- http://jsfiddle.net/
- http://codepen.io/pen/
- Premade template: http://codepen.io/pen?template=JXVYzq
- https://jsbin.com/
- https://jsfiddle.net/
- https://codepen.io/pen/
- Premade template: https://codepen.io/pen?template=JXVYzq
-->
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -9,6 +9,8 @@
/package-lock.json
.DS_Store
.idea
.project
.settings
.vscode
bower.json
*.log
Expand Down
13 changes: 0 additions & 13 deletions .npmignore

This file was deleted.

13 changes: 6 additions & 7 deletions .travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "6"
- lts/*

before_install:
- "export CHROME_BIN=/usr/bin/google-chrome"
Expand Down Expand Up @@ -42,13 +42,12 @@ deploy:
branch: release
- provider: releases
api_key: $GITHUB_AUTH_TOKEN
file:
- "./dist/Chart.bundle.js"
- "./dist/Chart.bundle.min.js"
- "./dist/Chart.js"
- "./dist/Chart.min.js"
- "./dist/Chart.js.zip"
skip_cleanup: true
file_glob: true
file:
- ./dist/*.css
- ./dist/*.js
- ./dist/*.zip
on:
tags: true
- provider: npm
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINING.md
Expand Up @@ -5,7 +5,7 @@ Chart.js relies on [Travis CI](https://travis-ci.org/) to automate the library [
### Releasing a New Version

1. draft release notes on [GitHub](https://github.com/chartjs/Chart.js/releases/new) for the upcoming tag
1. update `master` `package.json` version using [semver](http://semver.org/) semantic
1. update `master` `package.json` version using [semver](https://semver.org/) semantic
1. merge `master` into the `release` branch
1. follow the build process on [Travis CI](https://travis-ci.org/chartjs/Chart.js)

Expand Down
71 changes: 23 additions & 48 deletions README.md
@@ -1,57 +1,32 @@
# Chart.js

[![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)

## Installation

You can download the latest version of Chart.js from the [GitHub releases](https://github.com/chartjs/Chart.js/releases/latest) or use a [Chart.js CDN](https://cdnjs.com/libraries/Chart.js).

To install via npm:

```bash
npm install chart.js --save
```

To install via bower:
```bash
bower install chart.js --save
```

### Selecting the Correct Build

Chart.js provides two different builds for you to choose: `Stand-Alone Build`, `Bundled Build`.

#### 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 compatibility issues. The Moment.js version in the bundled build is private to Chart.js so if you want to use Moment.js yourself, it's better to use Chart.js (non bundled) and import Moment.js manually.
<p align="center">
<img src="https://www.chartjs.org/media/logo-title.svg"><br/>
Simple yet flexible JavaScript charting for designers & developers
</p>

<p align="center">
<a href="https://www.chartjs.org/docs/latest/getting-started/installation.html"><img src="https://img.shields.io/github/release/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Downloads"></a>
<a href="https://travis-ci.org/chartjs/Chart.js"><img src="https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Builds"></a>
<a href="https://coveralls.io/github/chartjs/Chart.js?branch=master"><img src="https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Coverage"></a>
<a href="https://github.com/chartjs/awesome"><img src="https://awesome.re/badge-flat2.svg" alt="Awesome"></a>
<a href="https://chartjs-slack.herokuapp.com/"><img src="https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600" alt="Slack"></a>
</p>

## Documentation

You can find documentation at [www.chartjs.org/docs](http://www.chartjs.org/docs). The markdown files that build the site are available under `/docs`. Previous version documentation is available at [www.chartjs.org/docs/latest/developers/#previous-versions](http://www.chartjs.org/docs/latest/developers/#previous-versions).
- [Introduction](https://www.chartjs.org/docs/latest/)
- [Getting Started](https://www.chartjs.org/docs/latest/getting-started/)
- [General](https://www.chartjs.org/docs/latest/general/)
- [Configuration](https://www.chartjs.org/docs/latest/configuration/)
- [Charts](https://www.chartjs.org/docs/latest/charts/)
- [Axes](https://www.chartjs.org/docs/latest/axes/)
- [Developers](https://www.chartjs.org/docs/latest/developers/)
- [Popular Extensions](https://github.com/chartjs/awesome)
- [Samples](https://www.chartjs.org/samples/)

## Contributing

Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](http://stackoverflow.com/questions/tagged/chartjs).

## Building
Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing).

## Thanks
- [BrowserStack](https://browserstack.com) for allowing our team to test on thousands of browsers.
- [@n8agrin](https://twitter.com/n8agrin) for the Twitter handle donation.
Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing). Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support, please post questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/chartjs) with the `chartjs` tag.

## License

Chart.js is available under the [MIT license](http://opensource.org/licenses/MIT).
Chart.js is available under the [MIT license](https://opensource.org/licenses/MIT).
10 changes: 9 additions & 1 deletion book.json
Expand Up @@ -3,7 +3,15 @@
"title": "Chart.js documentation",
"author": "chartjs",
"gitbook": "3.2.2",
"plugins": ["-lunr", "-search", "search-plus", "anchorjs", "chartjs", "ga"],
"plugins": [
"-lunr",
"-search",
"search-plus",
"anchorjs",
"chartjs",
"ga",
"redirect"
],
"pluginsConfig": {
"anchorjs": {
"icon": "#",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -6,7 +6,7 @@
"chart",
"js"
],
"homepage": "http://www.chartjs.org/",
"homepage": "https://www.chartjs.org/",
"license": "MIT",
"authors": [
{
Expand Down

0 comments on commit 24cb38c

Please sign in to comment.