Commit Graph

273 Commits

Author SHA1 Message Date
M.Ravi a60ef7cf7a Changed BaseEmail to accept from_address to modify the from header accordingly 2017-06-07 11:35:16 +05:30
M.Ravi 94bac7222c Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before. 2017-06-07 02:02:31 +05:30
M.Ravi 663ea2d713 Merged master into feature/manualorder 2017-06-07 00:41:27 +05:30
Levi 6fa14971d9 Merge branch 'master' of github.com:ungleich/dynamicweb 2017-06-05 23:08:58 -05:00
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 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
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
Nico Schottelius d8bb051f23 Remove unused code 2017-06-03 16:03:02 +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 8d8b387cc7 Fix select languages in dcl 2017-05-27 12:49:42 -05:00
Levi ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
modulos e6f2157b83 Correct pricing page redriection 2017-05-23 19:58:29 +02:00
Henry Bravo 398b7062e0 resolve conflicts 2017-05-23 12:13:44 -05:00
Henry Bravo 506fbca204 Design calculator page 2017-05-22 23:35:29 -05:00
modulos 920e7669dc Show modal after beta access signup
The beta access form is now in it's own html page. this makes it easier
to work with djangos form validation with reloading the whole page.
2017-05-22 18:03:33 +02:00
Levi 5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
M.Ravi d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
Levi ed28fc411e fixed some index datacenterlight issues 2016-12-21 01:24:04 -05:00
Levi abfab6915c added datacenterlight 2016-12-20 18:05:20 -05:00