| 
							
							
								 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 | 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 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 | 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 | 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 | 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 | 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 | 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 | 377ae5e27a | Change example location to src folder for easier testing | 2016-09-08 13:06:36 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | f241613107 | ✨ Add canvas id as prop | 2016-09-08 12:08:19 +02:00 |  | 
			
				
					| 
							
							
								 Juan Carlos Alonso | 3785e73b43 | Added bubble chart type | 2016-09-07 22:50:18 +01:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 9f02e95355 | 🐛 Fix props | 2016-09-07 10:19:05 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 92982ef2ac | Change deprecated v-el to ref Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-23 20:06:50 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 012b9a82bf | Change render() method name to renderChart This way it does not conflict with the vue 2.0 render function.
Signed-off-by: Jakub Juszczak <netghost03@gmail.com> | 2016-08-23 20:01:38 +02:00 |  | 
			
				
					| 
							
							
								 Jakub | 5258ab1a0f | Feature/merge options #5 (#6) * ➕ Add dependency lodash
* ✨ Add helper function to merge chartOptions
* Change Charts to merge options
* And renamed options data to defaultOptions | 2016-08-21 14:04:34 +02:00 |  | 
			
				
					| 
							
							
								 Thorsten | 90d9d87523 | correct hook name. | 2016-08-19 21:35:10 +02:00 |  | 
			
				
					| 
							
							
								 Thorsten | 998b190007 | save chart instance on vm instance and add destroy() hooks to properly destroy chart when component is destroyed. | 2016-08-19 21:30:39 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 3095684a37 | Refactor basic structure | 2016-07-03 12:36:38 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | a428b51741 | Add index file for npm package | 2016-07-03 12:06:58 +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 | 3018b5dc2b | 📝 Update readme | 2016-06-26 16:03: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 | 5b704cc739 | ✨ Add LineChart Example component | 2016-06-26 15:46:19 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | fde877e49f | Refactor modules | 2016-06-26 15:34:26 +02:00 |  | 
			
				
					| 
							
							
								 Jakub Juszczak | 0820ba63b3 | 🎉 Initial commit | 2016-06-26 15:24:29 +02:00 |  |