resolved conflicts with upstream
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
c3.old.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
extensions/js/c3ext.js
0 → 100644
htdocs/css/index.css
0 → 100644
htdocs/data/c3_test.json
0 → 100644
htdocs/data/c3_test2_ts.csv
0 → 100644
htdocs/data/c3_test_2.json
0 → 100644
htdocs/data/c3_test_3.json
0 → 100644
htdocs/data/c3_test_ts.csv
0 → 100644
htdocs/js/extensions
0 → 120000
htdocs/js/samples/plugin.js
0 → 100644
htdocs/samples/api_flow.html
0 → 100644
htdocs/samples/bindto.html
0 → 100644
htdocs/samples/domain_y.html
0 → 100644
htdocs/samples/element.html
0 → 100644
htdocs/samples/grids.html
0 → 100644
htdocs/samples/legend.html
0 → 100644
htdocs/samples/padding.html
0 → 100644
htdocs/samples/plugin.html
0 → 100644
File moved
htdocs/samples/zoom.html
0 → 100644
{ | ||
"name": "c3", | ||
"version": "0.1.31", | ||
"version": "0.3.0", | ||
"description": "D3-based reusable chart library", | ||
"main": "c3.js", | ||
"scripts": { | ||
... | ... | @@ -21,9 +21,11 @@ |
"readmeFilename": "README.md", | ||
"devDependencies": { | ||
"grunt": "~0.4.1", | ||
"grunt-contrib-jshint": "~0.7.1", | ||
"grunt-contrib-concat": "~0.5.0", | ||
"grunt-contrib-jasmine": "~0.5.2", | ||
"load-grunt-tasks": "~0.2.0", | ||
"grunt-contrib-uglify": "~0.4.0" | ||
"grunt-contrib-jshint": "~0.7.1", | ||
"grunt-contrib-uglify": "~0.4.0", | ||
"grunt-contrib-watch": "^0.6.1", | ||
"load-grunt-tasks": "~0.2.0" | ||
} | ||
} |
src/api.axis.js
0 → 100644
src/api.category.js
0 → 100644
src/api.chart.js
0 → 100644
src/api.color.js
0 → 100644
src/api.data.js
0 → 100644
src/api.flow.js
0 → 100644
src/api.focus.js
0 → 100644
src/api.grid.js
0 → 100644
src/api.group.js
0 → 100644
src/api.legend.js
0 → 100644
src/api.load.js
0 → 100644
src/api.region.js
0 → 100644
src/api.selection.js
0 → 100644
src/api.show.js
0 → 100644
src/api.tooltip.js
0 → 100644
src/api.transform.js
0 → 100644
src/api.x.js
0 → 100644
src/api.zoom.js
0 → 100644
src/arc.js
0 → 100644
src/axis.js
0 → 100644
src/c3.axis.js
0 → 100644
src/cache.js
0 → 100644
src/category.js
0 → 100644
src/class.js
0 → 100644
src/clip.js
0 → 100644
src/color.js
0 → 100644
src/config.js
0 → 100644
src/core.js
0 → 100644
src/data.convert.js
0 → 100644
src/data.js
0 → 100644
src/data.load.js
0 → 100644
src/domain.js
0 → 100644
src/drag.js
0 → 100644
src/format.js
0 → 100644
src/grid.js
0 → 100644
src/head.js
0 → 100644
src/interaction.js
0 → 100644
src/legend.js
0 → 100644
src/region.js
0 → 100644
src/scale.js
0 → 100644
src/selection.js
0 → 100644
src/shape.bar.js
0 → 100644
src/shape.js
0 → 100644
src/shape.line.js
0 → 100644
src/size.js
0 → 100644
src/subchart.js
0 → 100644
src/tail.js
0 → 100644
src/text.js
0 → 100644
src/tooltip.js
0 → 100644
src/type.js
0 → 100644
src/util.js
0 → 100644
src/zoom.js
0 → 100644
Please
register
or
sign in
to comment