From 79b8d409e7707ae67c3664a3e33d28f2c8d68b4d Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Tue, 5 Jan 2016 07:27:31 -0500 Subject: [PATCH 1/5] copy CONTRIBUTING from develop it got out of sync --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d2c14001..865575da2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # How to contribute -## Issue Submission Guidlines +## Issue Submission Guidelines * Because of the volume of requests, we do not use the issue tracker for support questions. If you are trying to get a particular effect or you have a problem with your code, please ask your question on stackoverflow.com or the [user group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group) * It will be far, far easier for others to understand your problem or bug if you demonstrate it with a short example on http://jsfiddle.net/ or on http://bl.ocks.org/ (http://blockbuilder.org/ is a great way to edit bl.ocks!). Here are some examples you can fork to get started: @@ -14,7 +14,8 @@ ## Pull Request Guidelines -* Fork the repository +* Fork the repository. +* As with all pull requests, put your changes in a branch. For contributions that change the dc.js API, create your branch off of `develop`. If your contribution does not change the API, branch off of `master` instead. * Make changes to the files in `src/` not dc.js * Add tests to `spec/`. Feel free to create a new file if needed. * Run `grunt server` and go to http://localhost:8888/spec to develop your tests. @@ -22,10 +23,10 @@ * Run `grunt lint` to confirm that your code meets the dc.js style guidelines. * Run `grunt test` to confirm that all tests will pass on phantomjs. * Commit your changes to `src/*` and `spec/*` but not any build artifacts. (Build artifacts include `dc.*js*`, `web/docs/*`, `web/js/*`) -* Submit a pull request -* If you merge master or another branch into your patchset, please rebase against master. -* The DC maintainer team will review and build the artifacts when merging -* If you continue making changes to your fork of `dc.js`, create a branch for each pull request +* Submit a pull request. +* If you merge `develop` or `master` into your patchset, please rebase against develop. (It's okay to rewrite history for PRs, because these branches are temporary and it's unlikely that anyone is tracking your feature branch.) +* The DC maintainer team will review and build the artifacts when merging. +* If you continue making changes to your fork of `dc.js`, create a separate branch for each pull request and keep the changes separate. #### Coding Conventions @@ -49,4 +50,3 @@ Or you can just run the commands manually before committing. Running `grunt server` will host the jasmine specs at http://localhost:8888/spec. Please use `.transitionDuration(0)` for all chart tests. - From 9fe6b8362238943e074e90fe7c9a9759b8fd789e Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 7 Jan 2016 07:00:13 -0500 Subject: [PATCH 2/5] example of complex reduce average is the wrong example, though, since you don't need a complex reduce for averages. --- web/examples/bar-average.html | 106 ++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 web/examples/bar-average.html diff --git a/web/examples/bar-average.html b/web/examples/bar-average.html new file mode 100644 index 000000000..2759f5caf --- /dev/null +++ b/web/examples/bar-average.html @@ -0,0 +1,106 @@ + + + + dc.js - Bar Chart Example + + + + + +

Frequently asked question: how to display the average of each bin in a group?

+ +
+ +
+
+ +
+ + + + + + + + From 5414683463711b71654da872c41962bf45ca4fa4 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 7 Jan 2016 08:54:19 -0500 Subject: [PATCH 3/5] rename example average wasn't a good example, let's do min/max/median instead --- web/examples/{bar-average.html => complex-reduce.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/examples/{bar-average.html => complex-reduce.html} (100%) diff --git a/web/examples/bar-average.html b/web/examples/complex-reduce.html similarity index 100% rename from web/examples/bar-average.html rename to web/examples/complex-reduce.html From 235ff7e088c9a7dbfd9f8aaabed89e4104862369 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 7 Jan 2016 09:13:33 -0500 Subject: [PATCH 4/5] add min/max/median example --- web/examples/complex-reduce.html | 69 +++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/web/examples/complex-reduce.html b/web/examples/complex-reduce.html index 2759f5caf..36fcaea05 100644 --- a/web/examples/complex-reduce.html +++ b/web/examples/complex-reduce.html @@ -7,24 +7,42 @@ -

Frequently asked question: how to display the average of each bin in a group?

+

Frequently asked question: how to show the minimum/maximum of some value in the rows?

-
- -
-