Merge branch 'hotfix/2.0.0-beta.26'

AUTHORS

@@ -71,3 +71,5 @@ Indri Muska
 Reese
 Sam Dunster <sdunster@fb.com>
 Mike Vashevko
+koefoed
+Yuval Greenfield <ubershmekel@gmail.com>

Changelog.md

@@ -1,4 +1,14 @@
 # 2.0 Series
+## 2.0.0 beta 26
+* Apply pie chart labels before transition, so they are easier to manipulate with the pretransition hook. Added example of showing percentages in pie chart labels. (Workaround for [#703](https://github.com/dc-js/dc.js/issues/703))
+* Documentation of chart registry, by Jasmine Hegman ([#676](https://github.com/dc-js/dc.js/issues/676) / [#1082](https://github.com/dc-js/dc.js/pull/1082))
+* HTML documentation generation, by Matt Traynham. There are still some kinks to be worked out here, but in principle it should be more robust than the gigantic markdown file we are generating. ([#1086](https://github.com/dc-js/dc.js/pull/1086)
+* Document that you need to use a `RangedFilter` when filtering a range, by koefoed ([#1090](https://github.com/dc-js/dc.js/pull/1090))
+* Fix links to box plot examples, by Yuval Greenfield ([#1094](https://github.com/dc-js/dc.js/pull/1094))
+* [Sparkline example](http://dc-js.github.io/dc.js/examples/sparkline.html) ([#1013](https://github.com/dc-js/dc.js/issues/1013))
+* Example of [complex reductions](http://dc-js.github.io/dc.js/examples/complex-reduce.html) that need all the rows in each group, like min, max, median.
+* [Time interval](http://dc-js.github.io/dc.js/examples/time-intervals.html) example.
+
 ## 2.0.0 beta 25
 * Improved dataTable docs (including a fix for [#1030](https://github.com/dc-js/dc.js/issues/1030))
 * Generate proper data table header ([#1015](https://github.com/dc-js/dc.js/issues/1015))

Gruntfile.js

@@ -85,7 +85,7 @@ module.exports = function (grunt) {
         watch: {
             jsdoc2md: {
                 files: ['<%= conf.src %>/**/*.js'],
-                tasks: ['build', 'jsdoc2md']
+                tasks: ['build', 'jsdoc', 'jsdoc2md']
             },
             scripts: {
                 files: ['<%= conf.src %>/**/*.js', '<%= conf.web %>/stock.js'],
@@ -168,7 +168,10 @@ module.exports = function (grunt) {
                     display: 'short',
                     summary: true,
                     specs:  '<%= conf.spec %>/*-spec.js',
-                    helpers: '<%= conf.spec %>/helpers/*.js',
+                    helpers: [
+                        '<%= conf.web %>/js/jasmine-jsreporter.js',
+                        '<%= conf.spec %>/helpers/*.js'
+                    ],
                     version: '2.0.0',
                     outfile: '<%= conf.spec %>/index-browserify.html',
                     keepRunner: true
@@ -211,6 +214,16 @@ module.exports = function (grunt) {
                 }
             }
         },
+        jsdoc: {
+            dist: {
+                src: 'dc.js',
+                options: {
+                    destination: 'web/docs/html',
+                    template: 'node_modules/ink-docstrap/template',
+                    configure: 'node_modules/ink-docstrap/template/jsdoc.conf.json'
+                }
+            }
+        },
         jsdoc2md: {
             dist: {
                 src: 'dc.js',
@@ -374,17 +387,17 @@ module.exports = function (grunt) {
 
     // task aliases
     grunt.registerTask('build', ['concat', 'uglify', 'cssmin']);
-    grunt.registerTask('docs', ['build', 'copy', 'jsdoc2md', 'docco', 'fileindex']);
+    grunt.registerTask('docs', ['build', 'copy', 'jsdoc', 'jsdoc2md', 'docco', 'fileindex']);
     grunt.registerTask('web', ['docs', 'gh-pages']);
     grunt.registerTask('server', ['docs', 'fileindex', 'jasmine:specs:build', 'connect:server', 'watch:jasmine-docs']);
-    grunt.registerTask('test', ['build', 'jasmine:specs']);
-    grunt.registerTask('test-browserify', ['build', 'browserify', 'jasmine:browserify']);
-    grunt.registerTask('coverage', ['build', 'jasmine:coverage']);
+    grunt.registerTask('test', ['build', 'copy', 'jasmine:specs']);
+    grunt.registerTask('test-browserify', ['build', 'copy', 'browserify', 'jasmine:browserify']);
+    grunt.registerTask('coverage', ['build', 'copy', 'jasmine:coverage']);
     grunt.registerTask('ci', ['test', 'jasmine:specs:build', 'connect:server', 'saucelabs-jasmine']);
     grunt.registerTask('ci-pull', ['test', 'jasmine:specs:build', 'connect:server']);
     grunt.registerTask('lint', ['jshint', 'jscs']);
     grunt.registerTask('default', ['build', 'shell:hooks']);
-    grunt.registerTask('jsdoc', ['build', 'jsdoc2md', 'watch:jsdoc2md']);
+    grunt.registerTask('doc-debug', ['build', 'jsdoc', 'jsdoc2md', 'watch:jsdoc2md']);
 };
 
 module.exports.jsFiles = [

LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2012-2015 Nick Zhu & the dc.js Developers
+   Copyright 2012-2016 Nick Zhu & the dc.js Developers
    https://github.com/dc-js/dc.js/blob/master/AUTHORS
 
    Licensed under the Apache License, Version 2.0 (the "License");

LICENSE_BANNER

@@ -1,7 +1,7 @@
 /*!
  *  dc <%= conf.pkg.version %>
  *  http://dc-js.github.io/dc.js/
- *  Copyright 2012-2015 Nick Zhu & the dc.js Developers
+ *  Copyright 2012-2016 Nick Zhu & the dc.js Developers
  *  https://github.com/dc-js/dc.js/blob/master/AUTHORS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

component.json

@@ -2,7 +2,7 @@
   "name": "dc.js",
   "repository": "dc-js/dc.js",
   "description": "Multi-Dimensional charting built to work natively with crossfilter rendered with d3.js",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.26",
   "keywords": [
     "visualization",
     "svg",