| 
								
								
									 M.Ravi | 9ffd32b4cb | Merge branch 'master' of https://github.com/HenryGBC/dynamicweb into henry_pr | 2017-06-06 22:10:35 +05:30 |  | 
				
					
						| 
								
								
									 Henry Bravo | 6f6277cc49 | Mobile styles to calculator card | 2017-06-06 10:36:47 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | b5f93e4ea7 | align buttons | 2017-06-06 10:33:36 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 96272ffd44 | added mo files | 2017-06-06 00:08:22 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 6fa14971d9 | Merge branch 'master' of github.com:ungleich/dynamicweb | 2017-06-05 23:08:58 -05:00 |  | 
				
					
						| 
								
								
									 M.Ravi | d31b05a219 | Added jquery validation for the order form | 2017-06-06 05:26:02 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 74c57a42db | Added top margin style for error messages | 2017-06-06 05:24:39 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 949f47d124 | Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template | 2017-06-06 04:28:41 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | b54b46c08b | Renamed success url to order_success for clarity. | 2017-06-06 04:23:15 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 474e0ddc95 | Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this) | 2017-06-06 04:22:03 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 92fb72197d | Resolved some conflicts | 2017-06-06 03:47:37 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | f4a81e9096 | Fixed getting template name from template id | 2017-06-06 03:43:50 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | b68f116931 | Added the logic to handle orders manually | 2017-06-06 03:09:34 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | d7625712f1 | Changed template variable name in email template for new order notification | 2017-06-06 03:02:57 +05:30 |  | 
				
					
						| 
								
								
									 M.Ravi | 4ad45dfd43 | Added notification email template | 2017-06-06 02:55:07 +05:30 |  | 
				
					
						| 
								
								
									 Henry Bravo | 515cbff001 | copy PricingView | 2017-06-05 16:03:32 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 2ead42bd1a | Add input fields (email, name) in Calculator (Pricing page) and Sucess page | 2017-06-05 15:35:48 -05:00 |  | 
				
					
						| 
								
								
									 M.Ravi | 5583648293 | Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing | 2017-06-06 01:44:23 +05:30 |  | 
				
					
						| 
								
								
									 Henry Bravo | c69694274f | Fix conflicts | 2017-06-05 14:55:41 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | b44ab0ce0a | Add input fields (email, name) in Calculator (Pricing page) | 2017-06-05 14:30:41 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | ba03cf232e | 'what is it' section text change and fixed typo | 2017-06-03 21:57:21 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 9b121cc702 | improveded mobile responsiveness | 2017-06-03 21:19:13 -05:00 |  | 
				
					
						| 
								
								
									 Nico Schottelius | d8bb051f23 | Remove unused code | 2017-06-03 16:03:02 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 31e9377818 | Merge branch 'develop' into hosting_i18n | 2017-06-03 09:59:48 +02:00 |  | 
				
					
						| 
								
								
									 Levi Velázquez | 8d47018aae | Merge pull request #301 from levivm/develop removed more info button | 2017-06-02 10:37:24 -05:00 |  | 
				
					
						| 
								
								
									 Levi | 83705984d0 | removed more info button | 2017-06-02 10:36:17 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | be04bee643 | Fix center login pages | 2017-06-01 15:40:19 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 851ae298e9 | Collapse navbar when i clicked url dcl | 2017-06-01 14:49:05 -05:00 |  | 
				
					
						| 
								
								
									 modulos | 37a9629408 | Add more translations | 2017-05-30 15:57:36 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 9416586d0b | Merge branch 'develop' into hosting_i18n | 2017-05-30 15:10:22 +02:00 |  | 
				
					
						| 
								
								
									 M.Ravi | 9a7df541c5 | Removed a bogus call to languages() method that caused no showing of the VM templates | 2017-05-30 12:20:13 +05:30 |  | 
				
					
						| 
								
								
									 Henry Bravo | a7c28f5644 | Fix conflic translates | 2017-05-29 15:05:11 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 8207bc2dab | Fixed pricing page mobile | 2017-05-29 14:54:18 -05:00 |  | 
				
					
						| 
								
								
									 modulos | 48050a2360 | Remove .mo files and update .po files | 2017-05-29 16:12:28 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 40fe3f4d29 | Merge branch 'develop' into hosting_i18n | 2017-05-29 15:47:22 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 1d95f87b8d | Merge branch 'develop' into dcl_i18n | 2017-05-29 15:25:18 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 6937fb98f0 | Merge branch 'develop' into hosting_i18n | 2017-05-29 14:00:53 +02:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | aaf1dcbc7e | Fix input width | 2017-05-28 15:13:13 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 8d8b387cc7 | Fix select languages in dcl | 2017-05-27 12:49:42 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | ac28ab0d6b | Fix texts bugs and hosting mobile design | 2017-05-27 10:39:30 -05:00 |  | 
				
					
						| 
								
								
									 modulos | f8bbd94f8f | Change 15 to 10 GB Storage | 2017-05-26 17:12:37 +02:00 |  | 
				
					
						| 
								
								
									 modulos | a044490ec3 | Add i18n to hosting/order With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet. | 2017-05-26 17:02:22 +02:00 |  | 
				
					
						| 
								
								
									 modulos | 5869c6dd87 | Add i18n to datacenterlight The pricing page is now fully i18n as well as the subscription modal | 2017-05-26 15:53:21 +02:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 22a876e134 | Fix and add input values in calc | 2017-05-25 16:16:18 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 792219f6ac | Fix image beta | 2017-05-25 15:18:42 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 7b452740d7 | fix values | 2017-05-25 14:24:04 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | fbc1ab28b7 | Fix minimun values calculator order widget | 2017-05-25 13:40:45 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | 549acd400a | Merge branch 'develop' of github.com:ungleich/dynamicweb into develop | 2017-05-25 13:31:16 -05:00 |  | 
				
					
						| 
								
								
									 Henry Bravo | c91a61b33c | Fix order columns in hosting/payment | 2017-05-25 13:27:47 -05:00 |  | 
				
					
						| 
								
								
									 Noe Thalheim | 1ff411e426 | Merge branch 'develop' of https://github.com/ungleich/dynamicweb/ | 2017-05-25 18:38:58 +02:00 |  |