Jakub Juszczak
|
1be5149bde
|
Merge branch 'next' into develop
* next:
📝 Update CHANGELOG
💎 Release new version 2.1.0
✨ Add travis config
🐛 Fix tests
✨ Add chartId as prop and fix width and height props
✨ Add bubble-chart example
✅ Add tests
✨ Add chart type Bubble
Move examples into src for better testing
📝 Update README
💎 Release new version 2.0.0-alpha
Add vue 2.0 build files
📝 Update README
⬆️ Update dependency chartjs to 2.2.1
Update examples
⬆️ Update dependency vue 2.0
Change deprecated v-el to ref
Change render() method name to renderChart
# Conflicts:
# CHANGELOG.md
# dist/vue-chartjs.js
# dist/vue-chartjs.js.map
# package.json
# src/BaseCharts/Bar.js
# src/BaseCharts/Bubble.js
# src/BaseCharts/Doughnut.js
# src/BaseCharts/Line.js
# src/BaseCharts/Pie.js
# src/BaseCharts/PolarArea.js
# src/BaseCharts/Radar.js
# src/examples/App.vue
# src/examples/BubbleExample.js
# test/unit/specs/Bar.spec.js
# test/unit/specs/Bubble.spec.js
# test/unit/specs/Doughnut.spec.js
# test/unit/specs/Line.spec.js
# test/unit/specs/Pie.spec.js
# test/unit/specs/PolarArea.spec.js
# test/unit/specs/Radar.spec.js
|
2016-10-02 09:16:45 +02:00 |
|
Jakub Juszczak
|
d7003306d1
|
Move examples into src for better testing
|
2016-09-23 12:49:09 +02:00 |
|
Jakub Juszczak
|
377ae5e27a
|
Change example location to src folder for easier testing
|
2016-09-08 13:06:36 +02:00 |
|
Jakub Juszczak
|
3095684a37
|
Refactor basic structure
|
2016-07-03 12:36:38 +02:00 |
|
Jakub Juszczak
|
bab78b6991
|
Change example data
|
2016-06-26 15:51:42 +02:00 |
|
Jakub Juszczak
|
63d731695e
|
🔥 Remove props in barchart example
|
2016-06-26 15:46:33 +02:00 |
|
Jakub Juszczak
|
fde877e49f
|
Refactor modules
|
2016-06-26 15:34:26 +02:00 |
|