Commit graph

1345 commits

Author SHA1 Message Date
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
Pcoder
170f386811 Merge pull request #313 from HenryGBC/master
Add input fields (email, name) in Calculator (Pricing page) and Suces…
2017-06-06 00:11:56 +02:00
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
Nico Schottelius
ccfa36bdd7 Update changelog 2017-06-05 15:32:39 +02:00
Nico Schottelius
6204cbc990 Add all domains to ALLOwED_HOSTS 2017-06-05 15:29:37 +02:00
Nico Schottelius
073fe76ece Delete old dump 2017-06-03 15:40:44 +02:00
Levi Velázquez
7773b841c9 Merge pull request #302 from levivm/master
hidden footbar on mobile devices
2017-06-02 11:12:57 -05:00
Levi
cd9c8938ed hidden footbar on mobile devices 2017-06-02 11:11:04 -05:00
Levi Velázquez
4492d6700c Merge pull request #292 from Modulos/fix/ssh_key_location
Move keys section underneath user name menu
2017-05-30 09:26:11 -05:00
modulos
f142bb1ce9 Move keys section underneath user name menu 2017-05-29 15:00:47 +02:00
Levi Velázquez
5a516c4c39 Merge pull request #291 from ungleich/develop
Develop
2017-05-28 15:03:56 -05:00
Levi Velázquez
760dd59e95 Merge pull request #290 from levivm/develop
Develop
2017-05-28 15:03:38 -05:00
Levi
079970852a added changelog 2017-05-28 15:03:01 -05:00
Levi
47be413298 fixed redirect link 2017-05-28 15:01:18 -05:00
Levi Velázquez
3fc9d2c431 Merge pull request #287 from ungleich/develop
Develop
2017-05-26 13:06:04 -05:00
Levi Velázquez
5962c4fdb7 Merge pull request #286 from levivm/develop
Develop
2017-05-26 13:05:44 -05:00
Levi
59be6a7413 Merge branch 'master' into develop 2017-05-26 13:03:08 -05:00
Levi Velázquez
2c96db6397 Merge pull request #285 from levivm/master
added changelog for prod deploy (2017-05-26)
2017-05-26 12:49:26 -05:00
Levi
b8242b3345 added changelog for prod deploy (2017-05-26) 2017-05-26 12:48:57 -05:00
Levi Velázquez
5a45c639bd Merge pull request #281 from ungleich/change_GiB_to_GB
Changed GiB to GB in datacenterlight/pricing.html and hosting/payment…
2017-05-26 11:33:06 -05:00
Noe
3e92dc293e Merge pull request #284 from Modulos/fix/dcl_typo
Change 15 to 10 GB Storage
2017-05-26 17:15:15 +02:00
modulos
f8bbd94f8f Change 15 to 10 GB Storage 2017-05-26 17:12:37 +02:00
Levi Velázquez
00f9f6bb76 Merge pull request #280 from HenryGBC/develop
Fixed bugs in dcl and hosting/payment
2017-05-25 23:53:21 -05:00
M.Ravi
6a6f403704 Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html 2017-05-26 02:47:20 +05:30
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
879d0efb9a Merge branch 'develop' 2017-05-25 21:25:51 +02:00
4ad7d30d04 Merge remote-tracking branch 'refs/remotes/origin/master' 2017-05-25 21:25:28 +02:00
Henry Bravo
7b452740d7 fix values 2017-05-25 14:24:04 -05:00
dc7f78ab87 added Changelog 2017-05-25 21:22:53 +02: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
Levi Velázquez
211e1be0fb Merge pull request #279 from levivm/develop
Develop
2017-05-25 13:05:48 -05:00
Levi
d9d8ddc9e1 removed import pdb 2017-05-25 13:05:32 -05:00
Levi
9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
Noe Thalheim
1ff411e426 Merge branch 'develop' of https://github.com/ungleich/dynamicweb/ 2017-05-25 18:38:58 +02:00
Noe Thalheim
cb73bf7b80 Replace lorem ipsum text 2017-05-25 18:37:42 +02:00
Levi Velázquez
505e5920c9 Merge pull request #278 from Modulos/pr/henry
Henry's changes
2017-05-25 10:16:13 -05:00
modulos
3027513d17 Remove .txt.py files 2017-05-25 16:55:37 +02:00