M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	385df4e069
						 | 
						
							
							
								
								
								Added vm_name parameter to create_vm
							
							
							
							
							
							
						 | 
						
							2017-06-21 13:13:10 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	5b4e9b733d
						 | 
						
							
							
								
								
								Tentative fix for error 500 on order details page
							
							
							
							
							
							
						 | 
						
							2017-06-15 07:30:47 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	993039c020
						 | 
						
							
							
								
								
								fixing 500 error
							
							
							
							
							
							
						 | 
						
							2017-06-11 12:59:57 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	817f800fbd
						 | 
						
							
							
								
								
								fixed #3350
							
							
							
							
							
							
						 | 
						
							2017-06-11 11:44:14 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	25bfb41081
						 | 
						
							
							
								
								
								Typo public_key -> ssh_key
							
							
							
							
							
							
						 | 
						
							2017-06-05 15:51:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	715d092b96
						 | 
						
							
							
								
								
								Add ssh key to new vm
							
							
							
							
							
							
							
							
							Create_vm now stes to public key correctly 
							
						 | 
						
							2017-06-02 00:53:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	06f372e56d
						 | 
						
							
							
								
								
								Fix tests, add remove_public_key
							
							
							
							
							
							
							
							
							The tests for VitualMachineSerializer were wrong. The manager now
contains a function to remove public keys from a user 
							
						 | 
						
							2017-06-01 22:25:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	d229d124e9
						 | 
						
							
							
								
								
								Merge branch 'develop' into api/cleanup
							
							
							
							
							
							
						 | 
						
							2017-06-01 21:51:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	0db15d99a5
						 | 
						
							
							
								
								
								Add exceptions, merge for ssh key
							
							
							
							
							
							
							
							
							The replace variable of the add_public_key function is now a merge
variable in order to append new keys to a user 
							
						 | 
						
							2017-06-01 19:08:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	ca63355914
						 | 
						
							
							
								
								
								Remove templates
							
							
							
							
							
							
							
							
							In the current setup the templates views are not necessary 
							
						 | 
						
							2017-06-01 17:30:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	0b5cf2c057
						 | 
						
							
							
								
								
								Cleanup and add tests
							
							
							
							
							
							
						 | 
						
							2017-05-31 18:01:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	2582e31868
						 | 
						
							
							
								
								
								Remove public- from vm name
							
							
							
							
							
							
						 | 
						
							2017-05-26 23:53:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	9753dfd2fc
						 | 
						
							
							
								
								
								Add UserHosting public key to opennebula user
							
							
							
							
							
							
						 | 
						
							2017-05-25 11:27:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	fb8dac7d00
						 | 
						
							
							
								
								
								Use client to create vms and set ssh key correct
							
							
							
							
							
							
						 | 
						
							2017-05-25 00:18:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	17a85e3831
						 | 
						
							
							
								
								
								Context fix
							
							
							
							
							
							
							
							
							By setting the ssh key in the context section network information were
overwritten. We use updateconf now 
							
						 | 
						
							2017-05-24 20:45:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	da3194fee3
						 | 
						
							
							
								
								
								fixed configuration name in vm detail
							
							
							
							
							
							
						 | 
						
							2017-05-23 11:58:48 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi Velázquez
								
							 
						 | 
						
							
							
								
							
							
	bed670c9e3
						 | 
						
							
							
								
								
								Merge pull request #261 from Modulos/public_ip
							
							
							
							
							
							
							
							
							Public ip 
							
						 | 
						
							2017-05-23 11:10:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	adf9b77e4e
						 | 
						
							
							
								
								
								Show ipv6 address
							
							
							
							
							
							
						 | 
						
							2017-05-23 11:30:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	4c8a4d0be8
						 | 
						
							
							
								
								
								Typo
							
							
							
							
							
							
						 | 
						
							2017-05-23 11:17:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	021a8e784d
						 | 
						
							
							
								
								
								Remove 'public-' prefix
							
							
							
							
							
							
						 | 
						
							2017-05-23 10:36:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	ccb583b20d
						 | 
						
							
							
								
								
								Add vm-ipv6-nat64-ipv4 network name check
							
							
							
							
							
							
						 | 
						
							2017-05-22 13:28:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									modulos
								
							 
						 | 
						
							
							
								
							
							
	866594f3fc
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into public_ip
							
							
							
							
							
							
						 | 
						
							2017-05-22 12:44:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	3f198bb4de
						 | 
						
							
							
								
								
								Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro
							
							
							
							
							
							
						 | 
						
							2017-05-21 22:01:26 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	d13efd4527
						 | 
						
							
							
								
								
								Get public ip for vms
							
							
							
							
							
							
							
							
							By using kamilas script we can get the ip from a vms mac address. 
							
						 | 
						
							2017-05-19 16:39:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	62be9ae789
						 | 
						
							
							
								
								
								Added ServiceUnvailable error handling for the case when we have no connection to OpenNebula.
							
							
							
							
							
							
						 | 
						
							2017-05-14 17:39:10 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	7cbe75014d
						 | 
						
							
							
								
								
								Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
							
							
							
							
							
							
						 | 
						
							2017-05-14 12:45:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	0353f72676
						 | 
						
							
							
								
								
								Try connection
							
							
							
							
							
							
						 | 
						
							2017-05-14 12:44:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	1e2b8b1652
						 | 
						
							
							
								
								
								Add connection error handling
							
							
							
							
							
							
						 | 
						
							2017-05-14 12:22:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	8a18c275c3
						 | 
						
							
							
								
								
								Display configuration in virtualmachine detail
							
							
							
							
							
							
						 | 
						
							2017-05-14 03:41:30 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	921fa209ce
						 | 
						
							
							
								
								
								Merge image into template
							
							
							
							
							
							
						 | 
						
							2017-05-14 02:18:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	46b918d175
						 | 
						
							
							
								
								
								Fix price calculation
							
							
							
							
							
							
						 | 
						
							2017-05-14 02:18:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	f80496a103
						 | 
						
							
							
								
								
								Quick fix remove cpu_cost etc.
							
							
							
							
							
							
						 | 
						
							2017-05-14 01:21:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	b8df86342a
						 | 
						
							
							
								
								
								Add try and except for template disks
							
							
							
							
							
							
							
							
							It turns out that some templates don't need a disk size if they use a
image. 
							
						 | 
						
							2017-05-14 01:02:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	9141e1211c
						 | 
						
							
							
								
								
								remove pdb
							
							
							
							
							
							
						 | 
						
							2017-05-13 18:00:30 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	c7b59ec762
						 | 
						
							
							
								
								
								added web-team@ungleich.ch email for error
							
							
							
							
							
							
						 | 
						
							2017-05-13 17:59:04 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	4f0bc72cc1
						 | 
						
							
							
								
								
								debugging templates
							
							
							
							
							
							
						 | 
						
							2017-05-13 17:21:07 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	edab311d62
						 | 
						
							
							
								
								
								Fix memory MB to GB
							
							
							
							
							
							
						 | 
						
							2017-05-13 17:32:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	cee507e34f
						 | 
						
							
							
								
								
								Update open_api/vms to include ssh_key and specs
							
							
							
							
							
							
						 | 
						
							2017-05-13 15:50:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	752e11bcea
						 | 
						
							
							
								
								
								Readded hostingplans
							
							
							
							
							
							
						 | 
						
							2017-05-13 13:47:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	8017fbb90f
						 | 
						
							
							
								
								
								Work on configuration
							
							
							
							
							
							
						 | 
						
							2017-05-13 10:00:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	75d93b2aad
						 | 
						
							
							
								
								
								Add images as configuration
							
							
							
							
							
							
						 | 
						
							2017-05-13 06:59:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	cfaf201064
						 | 
						
							
							
								
								
								Handle ConnectionException, add change_user_password
							
							
							
							
							
							
						 | 
						
							2017-05-13 05:50:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Levi
								
							 
						 | 
						
							
							
								
							
							
	8980f6b2fc
						 | 
						
							
							
								
								
								merged opnnebula api changes
							
							
							
							
							
							
						 | 
						
							2017-05-12 12:13:18 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	130c00c8ee
						 | 
						
							
							
								
								
								API Integration
							
							
							
							
							
							
							
							
							Please review carefully. 
							
						 | 
						
							2017-05-12 12:07:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	b7e8eceb25
						 | 
						
							
							
								
								
								Add opennebula api urls and add delete vm api
							
							
							
							
							
							
						 | 
						
							2017-05-11 17:39:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	358d70570a
						 | 
						
							
							
								
								
								Add authentication
							
							
							
							
							
							
						 | 
						
							2017-05-11 12:45:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	ef00d676f5
						 | 
						
							
							
								
								
								Access VirtualMachine via api!
							
							
							
							
							
							
							
							
							Serialization of VirtualMachine objects now fully works 
							
						 | 
						
							2017-05-11 05:51:30 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	cbc13de34f
						 | 
						
							
							
								
								
								Access VirtualMachineTemplates via api!
							
							
							
							
							
							
							
							
							Serialization of VirtualMachineTemplates now fully works 
							
						 | 
						
							2017-05-11 04:05:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	746dfaa40d
						 | 
						
							
							
								
								
								Merge branch 'serialize' into opennebula_api
							
							
							
							
							
							
						 | 
						
							2017-05-10 13:26:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Modulos
								
							 
						 | 
						
							
							
								
							
							
	4016dcfea9
						 | 
						
							
							
								
								
								Merge branch 'calculate_price' into opennebula_api
							
							
							
							
							
							
						 | 
						
							2017-05-10 13:25:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |