| 
							
							
								 Jakub Juszczak | 42f552a1f2 | 📝 Update README | 2016-10-02 09:29:28 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 64e0a60dbf | ⬆️ Update Readme | 2016-10-02 09:19:05 +02:00 |  | 
			
				
					| 
							
							
								 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 | 0a04114eb0 | 💎 Release new version 2.1.0 Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-09-23 15:03:59 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 8eefeeef86 | 📝 Update README with badges | 2016-09-08 13:30:19 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 086fb1d4e9 | ✨ Add BubbleExample to app.vue | 2016-09-08 12:12:15 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | af373cf09d | 📝 Add BubbleChart Preview to README | 2016-09-08 12:04:36 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | c0e93cd824 | 📝 Update README | 2016-08-23 21:11:24 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 5248534991 | 📝 Update README Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-23 20:32:47 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 2f66dd9a44 | 📝 📖 🐛 Fix README and Template Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-21 14:41:59 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 57f3c651ed | 📝 Update README with contribution and license section Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-21 14:26:38 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | df7b6ec93e | 🐛 Fix npm badge Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-20 12:40:59 +02:00 |  | 
			
				
					| 
							
							
								 Jakub | 44eb15a89a | Update README.md Add dependency badge | 2016-08-01 20:04:03 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 4c84718f7c | ✨ Add npm badge Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-07-27 22:07:55 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 533e0ee205 | 🐛 Fix readme Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-07-27 21:58:41 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 976adab62c | 📝 Update readme Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-07-27 21:57:04 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 3095684a37 | Refactor basic structure | 2016-07-03 12:36:38 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 39de4195f6 | ✨ Add Polar Area Chart component | 2016-07-03 10:38:24 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | ca1d884074 | ✨ Add Radar Chart component | 2016-07-03 10:31:35 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 65251700d7 | ✨ Add Pie  Chart component | 2016-07-01 19:02:41 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 84ae683bfa | ✨ Add Doughnut Chart component | 2016-07-01 18:58:25 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 70a3b983b2 | 📝 Update readme with todo section | 2016-06-28 15:09:18 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | b0adde407a | 🐛  📝  Fix typo in readme | 2016-06-28 15:03:14 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 15b3c22a38 | 📝 Add another example to readme | 2016-06-26 16:12:27 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 067f0be01f | 📝 Update readme and add another example | 2016-06-26 16:08:10 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 3018b5dc2b | 📝 Update readme | 2016-06-26 16:03:38 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 0820ba63b3 | 🎉 Initial commit | 2016-06-26 15:24:29 +02:00 |  |