💎 Release new version 1.1.2

Signed-off-by: Jakub Juszczak <netghost03@gmail.com>

.github/CONTRIBUTING.md

@@ -3,7 +3,7 @@ Thank you for contributing vue-chartjs!
 
 Please follow this steps:
 
-1. Fork it ( https://github.com/aapertureless/vue-chartjs/fork )
+1. Fork it ( https://github.com/apertureless/vue-chartjs/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

CHANGELOG.md

@@ -1,8 +1,14 @@
 # Change Log
 
-## [Unreleased](https://github.com/apertureless/vue-chartjs/tree/HEAD)
+## [1.1.1](https://github.com/apertureless/vue-chartjs/tree/1.1.1) (2016-08-23)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.0...1.1.1)
 
-[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...HEAD)
+## [1.1.0](https://github.com/apertureless/vue-chartjs/tree/1.1.0) (2016-08-21)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...1.1.0)
+
+**Implemented enhancements:**
+
+- Use Vue.util.mergeOptions to merge default options with user's options [\#5](https://github.com/apertureless/vue-chartjs/issues/5)
 
 **Merged pull requests:**
 

README.md

@@ -145,7 +145,7 @@ For detailed explanation on how things work, checkout the [guide](http://vuejs-t
 
 ## Contributing
 
-1. Fork it ( https://github.com/aapertureless/vue-chartjs/fork )
+1. Fork it ( https://github.com/apertureless/vue-chartjs/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-chartjs",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Vue wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@nextindex.de>",
   "repository": {

src/BaseCharts/Bar.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="bar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="bar-chart" width="{{width}}" height="{{height}}" v-el:canvas></canvas>
     </div>
   `,
 

src/BaseCharts/Doughnut.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="doughnut-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="doughnut-chart" width={{width}} height={{height}} v-el:canvas></canvas>
     </div>
   `,
 

src/BaseCharts/Line.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="line-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="line-chart" width={{width}} height={{height}} v-el:canvas></canvas>
     </div>
   `,
 

src/BaseCharts/Pie.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="pie-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="pie-chart" width={{width}} height={{height}} v-el:canvas></canvas>
     </div>
   `,
 

src/BaseCharts/PolarArea.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="polar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="polar-chart" width={{width}} height={{height}} v-el:canvas></canvas>
     </div>
   `,
 

src/BaseCharts/Radar.js

@@ -5,7 +5,7 @@ import { mergeOptions } from '../helpers/options'
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="radar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas id="radar-chart" width={{width}} height={{height}} v-el:canvas></canvas>
     </div>
   `,