Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						bb21a40506 
					 
					
						
						
							
							Rewrite template option to render function  
						
						
						
						
							
						
					 
					
						2016-12-20 14:36:35 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						e4ba9ea5a3 
					 
					
						
						
							
							➕  Add dependency: template-compiler  
						
						
						
						
							
						
					 
					
						2016-12-20 14:34:05 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						fee32b57df 
					 
					
						
						
							
							🔥  Remove vue standalone alias from webpack  
						
						
						
						
							
						
					 
					
						2016-12-20 14:33:47 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						14413e438d 
					 
					
						
						
							
							Replace package quality badge with shield like version  
						
						
						
						
							
						
					 
					
						2016-12-17 18:33:11 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						7ddc385edb 
					 
					
						
						
							
							✨  Add license badge  
						
						
						
						
							
						
					 
					
						2016-12-17 18:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						a62a108318 
					 
					
						
						
							
							✨  Add package quality and liscense badge  
						
						
						
						
							
						
					 
					
						2016-12-17 18:31:13 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						5ec1f31a4b 
					 
					
						
						
							
							📝  Update changelog  
						
						
						
						
							
						
					 
					
						2016-12-17 18:22:33 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						193b5cac33 
					 
					
						
						
							
							Merge branch 'hotfix/minification' into develop  
						
						... 
						
						
						
						* hotfix/minification:
  ⬆️  Update npm version
  💎  Release new version v2.3.0
  📝  Update README
  ✨  Add mixins to alias
  ⬆️  Update dependencies
  Change mixins exports to be seperate 
						
						
							
						
					 
					
						2016-12-17 18:20:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						dde366c154 
					 
					
						
						
							
							⬆️  Update npm version  
						
						
						
						
							
						
					 
					
						2016-12-17 18:19:06 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						4fe9a2bcb6 
					 
					
						
						
							
							💎  Release new version v2.3.0  
						
						
						
						
							
 
						
					 
					
						2016-12-17 18:17:50 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						4badb99d84 
					 
					
						
						
							
							📝  Update README  
						
						
						
						
							
						
					 
					
						2016-12-17 18:15:07 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						3101945481 
					 
					
						
						
							
							✨  Add mixins to alias  
						
						
						
						
							
						
					 
					
						2016-12-17 17:29:41 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						6e7efb39ae 
					 
					
						
						
							
							⬆️  Update dependencies  
						
						
						
						
							
						
					 
					
						2016-12-17 17:29:30 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						5fe11ea5a9 
					 
					
						
						
							
							Change mixins exports to be seperate  
						
						
						
						
							
						
					 
					
						2016-12-17 17:29:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						015aebfc9f 
					 
					
						
						
							
							📝  Update CHANGELOG  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:54:22 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						49c5bfe238 
					 
					
						
						
							
							📝  Update README  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:53:27 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						2b75895589 
					 
					
						
						
							
							🐛  Fix script naming  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:50:02 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						ac2be97a10 
					 
					
						
						
							
							⬆️  Update npm package version  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:41:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						241fdb89d9 
					 
					
						
						
							
							Rename folder to docs for gh pages  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:40:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						1f91c96f83 
					 
					
						
						
							
							✨  Add demo page for github pages  
						
						... 
						
						
						
						Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
						
					 
					
						2016-12-07 08:38:30 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						d980e32116 
					 
					
						
						
							
							💎  Release new version 2.2.1  
						
						... 
						
						
						
						Updated dependencies
Signed-off-by: Jakub Juszczak <netghost03@gmail.com > 
						
						
							
 
						
					 
					
						2016-12-07 08:23:50 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Juszczak 
							
						 
					 
					
						
						
							
						
						6732907fc5 
					 
					
						
						
							
							Merged branch master into develop  
						
						
						
						
							
						
					 
					
						2016-12-07 08:16:55 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub 
							
						 
					 
					
						
						
							
						
						d2f23156cc 
					 
					
						
						
							
							Merge pull request  #16  from Ag47/master  
						
						... 
						
						
						
						Update README.md 
						
						
							
						
					 
					
						2016-11-07 10:05:21 +01:00 
						 
				 
			
				
					
						
							
							
								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  
						
						
						
						
							
 
						
					 
					
						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  
						
						
						
						
							
 
						
					 
					
						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 > 
						
						
							
 
						
					 
					
						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