Skip to content

Commit

Permalink
Merge pull request #2700 from palantir/r1.9.0
Browse files Browse the repository at this point in the history
Release version 1.9.0 (--> master)
  • Loading branch information
jtlan committed Aug 28, 2015
2 parents b55722c + 82e9f26 commit 720834c
Show file tree
Hide file tree
Showing 73 changed files with 8,912 additions and 3,898 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ Quick Start
- Downloading [plottable.zip](plottable.zip).
- Check out [examples](http://plottablejs.org/examples/), read the [tutorials](http://plottablejs.org/tutorials/), and visit the [website](http://plottablejs.org/).

Upgrading to v1.0.0
---

If you are upgrading from a pre-v1.0.0 version of Plottable to v1.0.0 or later, please use the [Upgrade Guide](https://github.com/palantir/plottable/wiki/Upgrading-to-1.0.0) on the wiki.

We Want To Help!
---
If you run into any problems using Plottable, please let us know. We want Plottable to be easy-to-use, so if you are getting confused, it is our fault, not yours. [Create an issue](https://github.com/palantir/plottable/issues) and we'll be happy to help you out, or drop by our [Gitter room](https://gitter.im/palantir/plottable).
Expand Down
9 changes: 6 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "plottable",
"description": "A modular charting library built on D3",
"version": "1.8.0",
"version": "1.9.0",
"main": ["plottable.js", "plottable.css"],
"typescript": {
"definition": "plottable.d.ts"
},
"license": "MIT",
"ignore": [
"**/*",
Expand Down Expand Up @@ -37,8 +40,8 @@
"url": "git://github.com/palantir/plottable.git"
},
"devDependencies": {
"chai": "1.9.0",
"mocha": "1.17.1",
"chai": "2.0.0",
"mocha": "2.2.5",
"jQuery": "2.1.0",
"jquery.simulate": "1.2.0",
"requirejs": "2.1.18"
Expand Down
10 changes: 5 additions & 5 deletions bower_components/chai/.bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chai",
"version": "1.9.0",
"version": "2.0.0",
"description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic.",
"license": "MIT",
"keywords": [
Expand All @@ -25,13 +25,13 @@
"dependencies": {},
"devDependencies": {},
"homepage": "https://github.com/chaijs/chai",
"_release": "1.9.0",
"_release": "2.0.0",
"_resolution": {
"type": "version",
"tag": "1.9.0",
"commit": "e26e576b5242b579f9f885c79388d0cdfc2bfa13"
"tag": "2.0.0",
"commit": "2147e1d49eb5caa27e0afb9e18208de2d8741f39"
},
"_source": "git://github.com/chaijs/chai.git",
"_target": "1.9.0",
"_target": "2.0.0",
"_originalSource": "chai"
}
31 changes: 28 additions & 3 deletions bower_components/chai/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Following these guidelines helps to communicate that you respect the time of the
- [Bug Reports](#bugs)
- [Feature Requests](#features)
- [Pull Requests](#pull-requests)
- [Releasing](#releasing)
- [Support](#support)
- [Resources](#resources)
- [Core Contributors](#contributors)
Expand All @@ -31,7 +32,7 @@ Following these guidelines helps to communicate that you respect the time of the
## Contributing

The issue tracker is the preferred channel for [bug reports](#bugs),
[features requests](#features) and [submitting pull
[feature requests](#features) and [submitting pull
requests](#pull-requests), but please respect the following restrictions:

* Please **do not** use the issue tracker for personal support requests (use
Expand Down Expand Up @@ -75,7 +76,7 @@ Example:
Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to *you* to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible.
Furthermore, since Chai.js has a [robust plugin API](http://chaijs.com/guide/plugins/), we encourage you to publish **new Assertions** as plugins. If your feature is an enhancement to an **existing Assertion**, please propose your changes as an issue prior to opening a pull request. If the core Chai.js contributors feel your plugin would be better suited as a core assertion, they will invite you to open a PR in [chaijs/chai](https//github.com/chaijs/chai).
Furthermore, since Chai.js has a [robust plugin API](http://chaijs.com/guide/plugins/), we encourage you to publish **new Assertions** as plugins. If your feature is an enhancement to an **existing Assertion**, please propose your changes as an issue prior to opening a pull request. If the core Chai.js contributors feel your plugin would be better suited as a core assertion, they will invite you to open a PR in [chaijs/chai](https://github.com/chaijs/chai).
<a name="pull-requests"></a>
### Pull Requests
Expand All @@ -90,7 +91,7 @@ Good pull requests - patches, improvements, new features - are a fantastic help.
**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
Please adhere to the coding conventions used throughout a project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). Please review the [Chai.js Codeing Style Guide](https://github.com/chaijs/chai/wiki/Chai-Coding-Style-Guide).
Please adhere to the coding conventions used throughout a project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). Please review the [Chai.js Coding Style Guide](https://github.com/chaijs/chai/wiki/Chai-Coding-Style-Guide).
Follow this process if you'd like your work considered for inclusion in the project:
Expand Down Expand Up @@ -136,6 +137,30 @@ git push origin <topic-branch-name>

**IMPORTANT**: By submitting a patch, you agree to allow the project owner to license your work under the same license as that used by the project.

<a name="releasing"></a>
## Releasing

Releases can be prepared by any core-contributor or user whom has push access to
the `chaijs/chai` repository.

This process requires [git-extras](https://github.com/tj/git-extras) for some steps.

1. Ensure all tests pass.
2. Bump the version tag in-code and for all package managers.
- `lib/chai.js`
- `package.json`
- `component.json`
- `bower.json`
3. Build the browser version with `make`.
4. Append commit log to `HISTORY.md` using `git changelog` command.
5. Write human-friendly `ReleaseNotes.md` based on changelog.
- If breaking changes, write migration tutorial(s) and reasoning.
- Callouts for community contributions (PRs) with links to PR and contributing user.
- Callouts for other fixes made by core contributors with links to issue.
6. Update `README.md` with an updated contributors list using `git summary` command.
7. Push a tagged release using `git release x.x.x`.
- All tagged releases are published to NPM.

<a name="support"></a>
## Support

Expand Down
Loading

0 comments on commit 720834c

Please sign in to comment.