| 
								
								
									 Arvind Tiwari | 734a41a371 | merged master | 2017-10-03 18:42:00 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | df93dfe047 | day set to one before | 2017-09-30 18:10:34 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 1f09bab3e4 | minimum month diff set to 1 | 2017-09-30 18:08:02 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 3701899304 | timezone aware | 2017-09-30 18:06:50 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | f1790445cd | timezone aware | 2017-09-30 18:05:02 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | bd91883369 | end_date added | 2017-09-30 17:55:49 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 313ba9d502 | Refactor set_subscription_id - use stripe subscription id instead of obj | 2017-09-29 08:42:17 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | a45679d89a | Added VMDetail model | 2017-09-25 00:00:45 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 75da4a7711 | hosting/models.py: Fixed bug extracting cc info from dict | 2017-08-24 12:51:55 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 7c3a0b86d8 | HostingOrder: Updated set_subscription_id to include cc details as parameter | 2017-08-24 11:59:38 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 29d36faef0 | Refactored some code | 2017-08-21 00:41:46 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 35736ae593 | Refactored some code | 2017-08-18 01:49:27 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | ecbbe1eb6d | Added subscription_id field and reformatted the code | 2017-08-17 18:16:36 +02:00 |  | 
				
					
						| 
								
								
									 Siarhei Puhach | d2d96e9951 | Added private_key field to UserHostingkey model, some html updates | 2017-07-06 14:18:22 +03:00 |  | 
				
					
						| 
								
								
									 Siarhei Puhach | edcfd3e9f4 | Added Flake8 lib and fixed PEP8 violations | 2017-06-29 17:34:40 +03:00 |  | 
				
					
						| 
								
								
									 Modulos | 46b918d175 | Fix price calculation | 2017-05-14 02:18:10 +02:00 |  | 
				
					
						| 
								
								
									 Modulos | 752e11bcea | Readded hostingplans | 2017-05-13 13:47:53 +02:00 |  | 
				
					
						| 
								
								
									 Modulos | 75d93b2aad | Add images as configuration | 2017-05-13 06:59:57 +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 |  | 
				
					
						| 
								
								
									 Levi | 3873540849 | Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149 | 2017-05-12 00:56:35 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 1f10f04a9d | Fixed ssh key error, Now an existing user is not ask for his credit card again | 2017-05-11 00:11:33 -05:00 |  | 
				
					
						| 
								
								
									 Modulos | 63052df6c9 | Change to new OpenNebula functions | 2017-05-09 05:05:58 +02:00 |  | 
				
					
						| 
								
								
									 Modulos | d0fc0144e5 | Merge branch 'opennebula-integration' into vm_bill | 2017-05-09 04:56:03 +02:00 |  | 
				
					
						| 
								
								
									 Levi | 9a34518457 | attached opennebula vm id to virtualmachine plan | 2017-05-08 21:54:12 -05:00 |  | 
				
					
						| 
								
								
									 Levi | abf6dbddce | added create vm feature from a normal user in opennebula | 2017-05-08 21:49:40 -05:00 |  | 
				
					
						| 
								
								
									 Modulos | 6dedf3693e | Change to use OpenNebulaManager | 2017-05-09 04:41:45 +02:00 |  | 
				
					
						| 
								
								
									 Modulos | 3ee075fad9 | Merge branch 'opennebula-integration' into vm_bill | 2017-05-09 04:04:53 +02:00 |  | 
				
					
						| 
								
								
									 Levi | bd83545653 | Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration | 2017-05-08 19:06:12 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 7ae49d00dd | added opennebula manager claass | 2017-05-08 19:02:29 -05:00 |  | 
				
					
						| 
								
								
									 Modulos | 3078536bd7 | Merge branch 'opennebula-integration' into vm_bill | 2017-05-08 15:46:53 +02:00 |  | 
				
					
						| 
								
								
									 M.Ravi | 621376c5b4 | Added functionality to create opennebula user if it does not exist | 2017-05-08 16:23:03 +05:30 |  | 
				
					
						| 
								
								
									 Modulos | ae69a56ab2 | Add error handling | 2017-05-08 02:47:38 +02:00 |  | 
				
					
						| 
								
								
									 Levi | d72c1c810d | added get vms | 2017-05-07 18:57:44 -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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | ed806910e6 | adding integration opennebula-hosting app | 2017-05-03 23:19:32 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 085133fb53 | integrating hosting app with opennebula integration | 2017-04-29 12:39:55 -05:00 |  | 
				
					
						| 
								
								
									 M.Ravi | cb4d96604c | Manual merge of develop into opennebula-integration | 2017-04-26 10:40:52 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 43350869e0 | Reverted some files back to as they were in master. They had been reorganized. | 2017-04-25 03:55:05 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 1e61ec965d | Some more fixes for the issues of the review of rscnt. | 2017-04-25 03:37:50 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | a427fa8579 | Renamed 'manage vmss' model names so that we have a nice name | 2017-04-23 22:24:41 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | b363bf5f6a | First working version of opennebula-integration. | 2017-03-15 17:32:55 +05:30 |  | 
				
					
						| 
								
								
									 Levi | 4352094680 | Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission | 2016-07-10 22:08:51 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 3e6502133e | Merge branch 'develop' into feature/hosting_permission | 2016-07-09 17:43:28 -05:00 |  |