Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	23f58ead52
						 | 
						
							
							
								
								
								Merge pull request #224 from levivm/opennebula-integration
							
							
							
							
							
							
							
							
							Opennebula integration 
							
						 | 
						
							2017-05-07 17:48:05 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	233642a6b1
						 | 
						
							
							
								
								
								removed pdb
							
							
							
							
							
							
						 | 
						
							2017-05-07 17:47:41 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	1ebc3b8be4
						 | 
						
							
							
								
								
								testing
							
							
							
							
							
							
						 | 
						
							2017-05-07 17:46:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	c2a76e6c39
						 | 
						
							
							
								
								
								Merge migrations and fix spacing
							
							
							
							
							
							
						 | 
						
							2017-05-07 16:09:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	4ab8963149
						 | 
						
							
							
								
								
								Follow fat models small views
							
							
							
							
							
							
							
							
							Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model. 
							
						 | 
						
							2017-05-07 16:07:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	d146c25899
						 | 
						
							
							
								
								
								Merge branch 'opennebula-integration' into vm_bill
							
							
							
							
							
							
						 | 
						
							2017-05-07 06:29:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	6d4e9d8a83
						 | 
						
							
							
								
								
								Refactored code to introduce different VM templates
							
							
							
							
							
							
						 | 
						
							2017-05-07 05:31:39 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	07a3d8649c
						 | 
						
							
							
								
								
								Merge pull request #223 from levivm/opennebula-integration
							
							
							
							
							
							
							
							
							fixing vm list 
							
						 | 
						
							2017-05-06 18:40:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	e67148ff59
						 | 
						
							
							
								
								
								fixing vm list
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:39:19 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	a04955eb59
						 | 
						
							
							
								
								
								Merge pull request #222 from levivm/opennebula-integration
							
							
							
							
							
							
							
							
							adding method to list vms 
							
						 | 
						
							2017-05-06 18:37:30 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	b0a27b8c75
						 | 
						
							
							
								
								
								adding method to list vms
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:36:51 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	e1a61ba930
						 | 
						
							
							
								
								
								Merge pull request #217 from levivm/opennebula-integration
							
							
							
							
							
							
							
							
							Opennebula integration 
							
						 | 
						
							2017-05-06 18:27:35 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	70e80758ac
						 | 
						
							
							
								
								
								Merge pull request #221 from ungleich/develop
							
							
							
							
							
							
							
							
							Develop 
							
						 | 
						
							2017-05-06 18:26:53 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	2ac34ff295
						 | 
						
							
							
								
								
								fixed virtual machines template
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:25:15 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	e99be51de1
						 | 
						
							
							
								
								
								adding list vm
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:19:28 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	767a5fc5da
						 | 
						
							
							
								
								
								fixing errors on vm creation
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:17:47 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	3994d2d33b
						 | 
						
							
							
								
								
								added migratin
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:12:25 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	90307724c8
						 | 
						
							
							
								
								
								added null true to opennebula id atribute
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:09:01 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	c9c7023c73
						 | 
						
							
							
								
								
								fixed create vm method
							
							
							
							
							
							
						 | 
						
							2017-05-06 18:04:45 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	97fecf88db
						 | 
						
							
							
								
								
								fixed typo
							
							
							
							
							
							
						 | 
						
							2017-05-06 17:42:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	ac9ba1480b
						 | 
						
							
							
								
								
								fixed payment issues
							
							
							
							
							
							
						 | 
						
							2017-05-06 17:36:02 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	bd362cb619
						 | 
						
							
							
								
								
								Change to user_email add TODOs
							
							
							
							
							
							
						 | 
						
							2017-05-06 15:28:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	6f252def5d
						 | 
						
							
							
								
								
								Return error if HostingBill object does not exist
							
							
							
							
							
							
						 | 
						
							2017-05-06 15:16:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	673e8a0c79
						 | 
						
							
							
								
								
								Add total_price to HostingBill model
							
							
							
							
							
							
						 | 
						
							2017-05-06 14:44:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	2ff8b9e4a5
						 | 
						
							
							
								
								
								Add hosting bill view, model and urls
							
							
							
							
							
							
						 | 
						
							2017-05-05 14:59:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	6d6093975c
						 | 
						
							
							
								
								
								Merge pull request #219 from ungleich/develop
							
							
							
							
							
							
							
							
							Develop 
							
						 | 
						
							2017-05-04 10:45:55 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	ed806910e6
						 | 
						
							
							
								
								
								adding integration opennebula-hosting app
							
							
							
							
							
							
						 | 
						
							2017-05-03 23:19:32 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pcoder
								
							 
						 | 
						
							
							
								
							
							
	9884eefa19
						 | 
						
							
							
								
								
								Update managevms.html
							
							
							
							
							
							
						 | 
						
							2017-05-03 11:44:04 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	58d3dd6624
						 | 
						
							
							
								
								
								Fixed some issues.
							
							
							
							
							
							
						 | 
						
							2017-05-03 11:09:22 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	4a4ca3ff15
						 | 
						
							
							
								
								
								Merge pull request #206 from Modulos/feature/3040
							
							
							
							
							
							
							
							
							Change border-color if contact field is empty 
							
						 | 
						
							2017-05-03 00:13:05 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	f525606100
						 | 
						
							
							
								
								
								Merge pull request #216 from Modulos/feature/no_author
							
							
							
							
							
							
							
							
							Remove author from blog posts 
							
						 | 
						
							2017-05-02 23:55:49 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	7cc2af420b
						 | 
						
							
							
								
								
								Added DEV_PREFIX parameter when creating VM, so that we create KVM virtual disk
							
							
							
							
							
							
						 | 
						
							2017-05-01 14:28:23 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bcc93d28b0
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
						 | 
						
							2017-05-01 00:09:05 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	2658205008
						 | 
						
							
							
								
								
								showing VMS
							
							
							
							
							
							
						 | 
						
							2017-04-29 12:54:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	4ec830550c
						 | 
						
							
							
								
								
								showing VMS
							
							
							
							
							
							
						 | 
						
							2017-04-29 12:51:30 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	3e755b3b68
						 | 
						
							
							
								
								
								added vm_template parameter to djangohosting view
							
							
							
							
							
							
						 | 
						
							2017-04-29 12:46:56 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	085133fb53
						 | 
						
							
							
								
								
								integrating hosting app with opennebula integration
							
							
							
							
							
							
						 | 
						
							2017-04-29 12:39:55 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	56e6e43742
						 | 
						
							
							
								
								
								Merge pull request #2 from ungleich/opennebula-integration
							
							
							
							
							
							
							
							
							Opennebula integration 
							
						 | 
						
							2017-04-29 11:44:28 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	32f52c1791
						 | 
						
							
							
								
								
								Remove author from blog posts
							
							
							
							
							
							
						 | 
						
							2017-04-27 03:25:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	68e81472d5
						 | 
						
							
							
								
								
								Fixed a bug related to incorrect opennebula parameter. Added python oca's github repo to the requirements.txt.
							
							
							
							
							
							
						 | 
						
							2017-04-26 23:26:35 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	12dd3abd5f
						 | 
						
							
							
								
								
								Merge branch 'develop' into opennebula-integration
							
							
							
							
							
							
						 | 
						
							2017-04-26 22:48:38 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	9abffdfc8a
						 | 
						
							
							
								
								
								Manual merge of develop into opennebula-integration
							
							
							
							
							
							
						 | 
						
							2017-04-26 22:48:28 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	a0a2a4aecb
						 | 
						
							
							
								
								
								Merge pull request #208 from Modulos/feature/3057
							
							
							
							
							
							
							
							
							Remove author from blog_item 
							
						 | 
						
							2017-04-26 11:24:21 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	0a5a9630cf
						 | 
						
							
							
								
								
								Merge pull request #215 from ungleich/develop
							
							
							
							
							
							
							
							
							Develop 
							
						 | 
						
							2017-04-26 11:15:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	cb4d96604c
						 | 
						
							
							
								
								
								Manual merge of develop into opennebula-integration
							
							
							
							
							
							
						 | 
						
							2017-04-26 10:40:52 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	e9646c878e
						 | 
						
							
							
								
								
								Merge branch 'develop' into opennebula-integration
							
							
							
							
							
							
						 | 
						
							2017-04-26 10:35:24 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	c938ce738d
						 | 
						
							
							
								
								
								Setting the opennebula params from the env
							
							
							
							
							
							
						 | 
						
							2017-04-26 10:27:22 +05:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	3537d4bf6f
						 | 
						
							
							
								
								
								Merge pull request #204 from Modulos/feature/travis-ci
							
							
							
							
							
							
							
							
							Feature/travis ci 
							
						 | 
						
							2017-04-25 22:17:40 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	d7674877a8
						 | 
						
							
							
								
								
								Merge pull request #213 from levivm/develop
							
							
							
							
							
							
							
							
							fixed translations 
							
						 | 
						
							2017-04-24 23:46:16 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	1f85dfc5b3
						 | 
						
							
							
								
								
								fixed translations
							
							
							
							
							
							
						 | 
						
							2017-04-24 23:44:34 -05:00 | 
						
						
							
							
							
							
								
							
							
						 |