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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
							
							
	a8952700d6  
						 
						
							
							
								
								
								Partial fixes for issues pointed by  @rscnt  
							
							... 
							
							
							
							
							- Moved opennebula constants to base.py
- Refactored all opennebula functions from admin.py to opennebula_functions.py
- string#format for some strings
- Renamed my_view function to show_vms
- Added logger to show logs of exceptions generated 
							
						 
						
							2017-04-24 18:51:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	af3818d64a  
						 
						
							
							
								
								
								Removed some unwanted changes and prepared for a pull request.  
							
							
							
							
						 
						
							2017-04-24 03:16:43 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	73cfccd00c  
						 
						
							
							
								
								
								Merge branch 'master' into opennebula-integration  
							
							
							
							
						 
						
							2017-04-24 03:11:03 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	d537fcb118  
						 
						
							
							
								
								
								Manual merge of ungleich/master into opennebula-integration  
							
							
							
							
						 
						
							2017-04-24 03:01:05 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	1028ab0eca  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/ungleich/dynamicweb  
							
							
							
							
						 
						
							2017-04-24 02:02:01 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	d10285e23d  
						 
						
							
							
								
								
								Made to use random passwords for creating opennebula users and managing their VMs.  
							
							
							
							
						 
						
							2017-04-23 22:46:59 +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 
								
							 
						 
						
							
							
								
							
							
	354cb144f7  
						 
						
							
							
								
								
								Added graceful handling of OpenNebula network not available  
							
							
							
							
						 
						
							2017-04-23 22:16:13 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	41d1e8b003  
						 
						
							
							
								
								
								Merge branch 'opennebula-integration' of  https://github.com/ungleich/dynamicweb  into opennebula-integration  
							
							
							
							
						 
						
							2017-04-23 21:27:32 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	37dc1f1c57  
						 
						
							
							
								
								
								Added the functionality to create opennebula user corresponding to dynamicweb user and creating and listing vms of the logged in user.  
							
							
							
							
						 
						
							2017-04-23 21:22:50 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pcoder 
								
							 
						 
						
							
							
								
							
							
	d3f7110c60  
						 
						
							
							
								
								
								Update README-opennebula-integration.md  
							
							
							
							
						 
						
							2017-04-22 10:52:19 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pcoder 
								
							 
						 
						
							
							
								
							
							
	9645895112  
						 
						
							
							
								
								
								Rename README-opennebula-integration to README-opennebula-integration.md  
							
							
							
							
						 
						
							2017-04-22 10:51:35 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	f0d812970e  
						 
						
							
							
								
								
								Merge pull request  #211  from ungleich/develop  
							
							... 
							
							
							
							
							Develop 
							
						 
						
							2017-04-20 14:23:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	c8614f4f63  
						 
						
							
							
								
								
								Added functionality to select templates for the VMs being created  
							
							
							
							
						 
						
							2017-04-18 13:34:29 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	25c09819e7  
						 
						
							
							
								
								
								Merge pull request  #210  from levivm/develop  
							
							... 
							
							
							
							
							Develop 
							
						 
						
							2017-04-17 21:42:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	970e1b5368  
						 
						
							
							
								
								
								Merge pull request  #1  from levivm/feature/new_digitalglarus  
							
							... 
							
							
							
							
							added translations 
							
						 
						
							2017-04-17 21:38:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	ef713a2ba7  
						 
						
							
							
								
								
								Merge branch 'master' of github.com:ungleich/dynamicweb  
							
							
							
							
						 
						
							2017-04-17 21:32:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	19db768619  
						 
						
							
							
								
								
								added translations  
							
							
							
							
						 
						
							2017-04-17 21:31:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	c9be516e9b  
						 
						
							
							
								
								
								Remove author from blog_item  
							
							
							
							
						 
						
							2017-04-12 12:30:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	ef8ae14582  
						 
						
							
							
								
								
								Change border-color if contact field is empty  
							
							... 
							
							
							
							
							The conact modals where moved in seperated templates. Further to
evaluate the form without reloading the page some ajax was added. 
							
						 
						
							2017-04-12 11:17:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	b68fe31361  
						 
						
							
							
								
								
								Added start/stop functionality for VMs. Refactored a few functions.  
							
							
							
							
						 
						
							2017-04-11 00:44:55 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	c7334dfac2  
						 
						
							
							
								
								
								Merge branch 'opennebula-integration' of  https://github.com/ungleich/dynamicweb  into opennebula-integration  
							
							
							
							
						 
						
							2017-04-10 13:44:24 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									M.Ravi 
								
							 
						 
						
							
							
								
							
							
	167e0482a9  
						 
						
							
							
								
								
								Added Delete VM functionality.  
							
							
							
							
						 
						
							2017-04-10 13:43:13 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	74f134cccc  
						 
						
							
							
								
								
								Add default DJANGO_SECRET_KEY  
							
							
							
							
						 
						
							2017-04-10 09:48:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	353d0497ff  
						 
						
							
							
								
								
								Add travis-ci integration  
							
							
							
							
						 
						
							2017-04-10 09:35:22 +02:00