PCoder 
								
							 
						 
						
							
							
								
							
							
	dd9e7dde35  
						 
						
							
							
								
								
								Merge branch 'master' into task/5690/generic-payment-page  
							
							
							
								
								
							
							
						 
						
							2018-10-02 09:01:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	f2f95c8559  
						 
						
							
							
								
								
								Update min attribute according to minimum ram in the plugin  
							
							
							
								
								
							
							
						 
						
							2018-10-01 08:56:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	a93c900109  
						 
						
							
							
								
								
								Pass 512 MB to memory parameter  
							
							
							
								
								
							
							
						 
						
							2018-10-01 08:54:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	c2dbbf0424  
						 
						
							
							
								
								
								Update views.py to include 512mb ram case  
							
							... 
							
							
							
								
								
							
							
							RAM server side validation is as follows:
- pid is a mandatory parameter for a valid RAM, otherwise a
 validation error is raised
- check if enable_512mb_ram is enabled. In this case, validate
if the input ram is either a whole number or 0.5 and in the range
0.5 <= value <= 200
- otherwise check ram is a whole number in the range
1 <= value <= 200 
							
						 
						
							2018-10-01 07:52:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	f85ef714ab  
						 
						
							
							
								
								
								Pass instance context  
							
							... 
							
							
							
								
								
							
							
							Also POST plugin_id as a form parameter to check enable_512mb_ram
case 
							
						 
						
							2018-10-01 07:50:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	24d719e4f1  
						 
						
							
							
								
								
								Update migration  
							
							
							
								
								
							
							
						 
						
							2018-09-29 07:37:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	5452c1c478  
						 
						
							
							
								
								
								Merge master into task/5681/offer-512mb-ram  
							
							
							
								
								
							
							
						 
						
							2018-09-28 08:36:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	8743853a7b  
						 
						
							
							
								
								
								Update Changelog  
							
							
							
								
								
									
	 
								
							
							
						 
						
							2018-09-28 08:13:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	737d890a7c  
						 
						
							
							
								
								
								Update Changelog for 2.2.2  
							
							
							
								
								
							
							
						 
						
							2018-09-28 08:11:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	db20e3cbe7  
						 
						
							
							
								
								
								Add plus minus ram handler for 512MB option  
							
							
							
								
								
							
							
						 
						
							2018-09-28 08:07:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pcoder 
								
							 
						 
						
							
							
								
							
							
	
	
	32767fed68 
 
						 
						
							
							
								
								
								Merge pull request  #668  from pcoder/task/5721/set_calculator_OS_order  
							
							... 
							
							
							
								
								
							
							
							Task/5721/set calculator OS order 
							
						 
						
							2018-09-28 07:32:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	e1ce017ec8  
						 
						
							
							
								
								
								Add migration  
							
							
							
								
								
							
							
						 
						
							2018-09-27 22:48:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	b047ccdef1  
						 
						
							
							
								
								
								Fix flake8 error  
							
							
							
								
								
							
							
						 
						
							2018-09-27 22:33:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	56460ac8f0  
						 
						
							
							
								
								
								Update migration  
							
							
							
								
								
							
							
						 
						
							2018-09-27 22:16:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	d93861ca32  
						 
						
							
							
								
								
								Set Devuan Ascii as default template  
							
							
							
								
								
							
							
						 
						
							2018-09-27 22:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	a02c3c6973  
						 
						
							
							
								
								
								Sort templates alphabetically  
							
							... 
							
							
							
								
								
							
							
							And also select the chosen template as the default one 
							
						 
						
							2018-09-27 22:12:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	768f3532f7  
						 
						
							
							
								
								
								Add default_selected_template field to DCLCalculatorPluginModel  
							
							
							
								
								
							
							
						 
						
							2018-09-27 22:09:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	21084cdc9f  
						 
						
							
							
								
								
								Initialize minRam js variable from what is passed from backend  
							
							
							
								
								
							
							
						 
						
							2018-09-27 09:07:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	12f139976d  
						 
						
							
							
								
								
								Simplify logic to set min_ram in the calculator form  
							
							
							
								
								
							
							
						 
						
							2018-09-27 09:06:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	da21699212  
						 
						
							
							
								
								
								Merge branch 'master' into task/5681/offer-512mb-ram  
							
							
							
								
								
							
							
						 
						
							2018-09-26 23:10:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	3075cffd77  
						 
						
							
							
								
								
								Include product_id in generic payment Stripe plan name  
							
							
							
								
								
							
							
						 
						
							2018-09-26 23:01:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	232022aaaf  
						 
						
							
							
								
								
								Fix flake8 errors  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:51:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	b7929a16e2  
						 
						
							
							
								
								
								Update datacenterlight django.po  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:45:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	6c03e3f712  
						 
						
							
							
								
								
								Change generic payment subject and correct misplaced comma  
							
							... 
							
							
							
								
								
							
							
							Data Center LightConfirmation of your payment ->
Confirmation of your payment 
							
						 
						
							2018-09-26 22:42:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	72c16713a7  
						 
						
							
							
								
								
								Update .po of datacenterlight  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:37:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	52d048a555  
						 
						
							
							
								
								
								Add missing Cheers string in email  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:35:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	3148dbccf8  
						 
						
							
							
								
								
								Translate text + reformat  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:31:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	84056a5b36  
						 
						
							
							
								
								
								Correct generic payment email as per Sanghee's corrections  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:21:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	fcc113e9d9  
						 
						
							
							
								
								
								Add locale_date class to date fields so that we can localize  
							
							
							
								
								
							
							
						 
						
							2018-09-26 22:06:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	1041284866  
						 
						
							
							
								
								
								Refactor moment.js locale date code to virutal_machine_detail.js  
							
							
							
								
								
							
							
						 
						
							2018-09-26 21:52:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	737681136f  
						 
						
							
							
								
								
								Correct flake8 error  
							
							
							
								
								
							
							
						 
						
							2018-09-26 21:23:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	efae2b1d9a  
						 
						
							
							
								
								
								Update Changelog  
							
							
							
								
								
							
							
						 
						
							2018-09-26 21:17:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pcoder 
								
							 
						 
						
							
							
								
							
							
	
	
	31e8467f20 
 
						 
						
							
							
								
								
								Merge pull request  #667  from pcoder/bugfix/corrections_by_malcolm  
							
							... 
							
							
							
								
								
							
							
							Bugfix/corrections by malcolm
- virutal -> virtual
- some DE corrections 
							
						 
						
							2018-09-26 21:11:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	4feeec23d4  
						 
						
							
							
								
								
								Correct spelling: virutal -> virtual  
							
							
							
								
								
							
							
						 
						
							2018-09-26 20:50:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	ca578ecf56  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/MalcolmA/dynamicweb  into MalcolmA-master  
							
							
							
								
								
							
							
						 
						
							2018-09-26 20:46:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	b021a8ed6e  
						 
						
							
							
								
								
								Remove filer dependency in migration  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:29:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	99b11f013f  
						 
						
							
							
								
								
								Remove old migration  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:25:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	1f990b1ab7  
						 
						
							
							
								
								
								Update migration  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:24:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	41cba9daa3  
						 
						
							
							
								
								
								Show product name in dcl order detail template  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:15:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	4575ff60ec  
						 
						
							
							
								
								
								Refactor validation code + Add product_id to context  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:15:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	508360472a  
						 
						
							
							
								
								
								Add amount/recurring form fields validation  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:14:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	48ba6a6166  
						 
						
							
							
								
								
								Remove disabled on amount/recurring fields  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:13:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	10e8f0a820  
						 
						
							
							
								
								
								Show product name in hosting order detail  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:10:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	5df2080f92  
						 
						
							
							
								
								
								Reset amount and recurring fields on error  
							
							
							
								
								
							
							
						 
						
							2018-09-26 09:09:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	9ff20491bd  
						 
						
							
							
								
								
								Merge branch 'master' into task/5690/generic-payment-page  
							
							
							
								
								
							
							
						 
						
							2018-09-25 23:25:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	ce2ac4524c  
						 
						
							
							
								
								
								Update Changelog for release 2.2.1  
							
							
							
								
								
									
	 
								
							
							
						 
						
							2018-09-25 22:49:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pcoder 
								
							 
						 
						
							
							
								
							
							
	
	
	5d5408eb8c 
 
						 
						
							
							
								
								
								Merge pull request  #665  from pcoder/manage_navbar_login  
							
							... 
							
							
							
								
								
							
							
							Change DCLNavbarPlugin to show login option only if set 
							
						 
						
							2018-09-25 22:43:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	c9ac959ff6  
						 
						
							
							
								
								
								Change DCLNavbarPlugin to show login option only if set  
							
							
							
								
								
							
							
						 
						
							2018-09-25 22:29:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	d54bf84b1e  
						 
						
							
							
								
								
								Format code  
							
							
							
								
								
							
							
						 
						
							2018-09-25 02:20:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PCoder 
								
							 
						 
						
							
							
								
							
							
	50e5fea339  
						 
						
							
							
								
								
								Add GenericProduct model and associate it to HostingOrder  
							
							
							
								
								
							
							
						 
						
							2018-09-25 02:20:31 +02:00