SILVER PANG
							
						 
					 | 
					
						
						
							
						
						4d02df581f
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
						
						fix the syntax error of the example 
						
						
							
						
					 | 
					
						2016-11-07 15:37:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						1d6e375e05
					 | 
					
						
						
							
							🐛 📝 Update CHANGELOG
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-24 11:36:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						c827562839
					 | 
					
						
						
							
							📝 Update CHANGELOG
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-24 11:34:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						720d75b56b
					 | 
					
						
						
							
							💎 Release new version 2.2.0
						
						
						
						
						
						
							
 v2.2.0
						
					 | 
					
						2016-10-24 11:33:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub
							
						 
					 | 
					
						
						
							
						
						75925f0d5c
					 | 
					
						
						
							
							Merge pull request #14 from wahaha2012/feature-horizontal-bar
						
						
						
						
						
						
						
						add horizontal bar parameter 
						
						
							
						
					 | 
					
						2016-10-23 19:20:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wxwdesign
							
						 
					 | 
					
						
						
							
						
						ddb47ff63a
					 | 
					
						
						
							
							add horizontal bar parameter
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-22 21:17:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub
							
						 
					 | 
					
						
						
							
						
						2df29e1cf1
					 | 
					
						
						
							
							Merge pull request #11 from apertureless/feature/reactive_chart_data
						
						
						
						
						
						
						
						WIP Feature/reactive chart data #11 
						
						
							
						
					 | 
					
						2016-10-15 13:37:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						6f77de832e
					 | 
					
						
						
							
							🐛 Fix missing export
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-15 13:00:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						f94b320dfa
					 | 
					
						
						
							
							✨ Change reactiveDataMixin
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-15 12:58:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						4ec6fa4cae
					 | 
					
						
						
							
							✨ Add codecov yml
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-09 17:17:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						ecdb98c4c8
					 | 
					
						
						
							
							🐛 Fix paths
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 18:30:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						c21cf2f3ac
					 | 
					
						
						
							
							✨ Add export for mixins
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 18:26:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						ef9fbe472a
					 | 
					
						
						
							
							📝 Update README with reactive Data and props example
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 18:26:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						06c3148897
					 | 
					
						
						
							
							⬆️ Update examples
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 18:25:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						e716482154
					 | 
					
						
						
							
							✨ Add reactiveProperty mixin
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 18:10:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						59cc74a00d
					 | 
					
						
						
							
							✨ Add reactiveData Example
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 10:34:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						a7194b990f
					 | 
					
						
						
							
							✨ Add reactive Data example
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 10:32:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						45e543b636
					 | 
					
						
						
							
							✨ Add reactiveData mixin
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 10:31:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						ae93b96b9c
					 | 
					
						
						
							
							⬆️ Update dependencies
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 09:40:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						b3faeb4f2b
					 | 
					
						
						
							
							📝 Update Changelog
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 09:34:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						42f552a1f2
					 | 
					
						
						
							
							📝 Update README
						
						
						
						
						
						
							
						
					 | 
					
						2016-10-02 09:29:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						b847becdc7
					 | 
					
						
						
							
							💎 Release new version 2.1.1
						
						
						
						
						
						
							
 v2.1.1
						
					 | 
					
						2016-10-02 09:26:08 +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
							
						 
					 | 
					
						
						
							
						
						7d256e6492
					 | 
					
						
						
							
							📝 Update CHANGELOG
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-23 15:14:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						0a04114eb0
					 | 
					
						
						
							
							💎 Release new version 2.1.0
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
 v.2.1.0
						
					 | 
					
						2016-09-23 15:03:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						b14b107890
					 | 
					
						
						
							
							✨ Add travis config
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-23 14:55:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						13ff782ec8
					 | 
					
						
						
							
							🐛 Fix tests
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-23 14:52:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						975a804570
					 | 
					
						
						
							
							✨ Add chartId as prop and fix width and height props
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-23 13:29:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						3c252ce904
					 | 
					
						
						
							
							✨ Add bubble-chart example
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-23 13:28:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						74cedd4ec4
					 | 
					
						
						
							
							✅ Add tests
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-23 12:59:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						d6c3f50ba8
					 | 
					
						
						
							
							✨ Add chart type Bubble
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-23 12:59:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						d7003306d1
					 | 
					
						
						
							
							Move examples into src for better testing
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-23 12:49:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						b8e7ce11de
					 | 
					
						
						
							
							📝 Update CHANGELOG
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:40:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						98961547f3
					 | 
					
						
						
							
							💎 Release new version 1.1.3
						
						
						
						
						
						
							
 v1.1.3
						
					 | 
					
						2016-09-08 13:39:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						c11127e64f
					 | 
					
						
						
							
							1.1.3
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:38:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						0f98800b92
					 | 
					
						
						
							
							✨ Add prepublish command to package.json for np
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:34:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						8eefeeef86
					 | 
					
						
						
							
							📝 Update README with badges
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:30:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						d913e9c515
					 | 
					
						
						
							
							✅ Add unit tests and travis.yml
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:21:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						377ae5e27a
					 | 
					
						
						
							
							Change example location to src folder for easier testing
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 13:06:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						9bcffae429
					 | 
					
						
						
							
							✨ Add missing image for readme
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 12:12:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						086fb1d4e9
					 | 
					
						
						
							
							✨ Add BubbleExample to app.vue
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 12:12:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						f241613107
					 | 
					
						
						
							
							✨ Add canvas id as prop
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 12:08:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						af373cf09d
					 | 
					
						
						
							
							📝 Add BubbleChart Preview to README
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 12:04:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						a7776f8407
					 | 
					
						
						
							
							✨ Add bubbleChart example
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-08 12:03:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub
							
						 
					 | 
					
						
						
							
						
						776f3976ec
					 | 
					
						
						
							
							Merge pull request #9 from jcalonso/feature/bubble-chart
						
						
						
						
						
						
						
						Add bubble chart type 
						
						
							
						
					 | 
					
						2016-09-08 11:49:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Juan Carlos Alonso
							
						 
					 | 
					
						
						
							
						
						3785e73b43
					 | 
					
						
						
							
							Added bubble chart type
						
						
						
						
						
						
							
						
					 | 
					
						2016-09-07 22:50:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						9bf6e6078d
					 | 
					
						
						
							
							📝 Update CHANGELOG
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-07 10:38:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						e62e8c81fb
					 | 
					
						
						
							
							Update npm version
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-07 10:30:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakub Juszczak
							
						 
					 | 
					
						
						
							
						
						9f79fb581d
					 | 
					
						
						
							
							🔥 Remove placeholder test
						
						
						
						
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com> 
						
						
							
						
					 | 
					
						2016-09-07 10:29:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |