Commit graph

712 commits

Author SHA1 Message Date
Arvind Tiwari fc9b901f9a translations added 2017-12-22 01:06:55 +05:30
PCoder 3852ce04de Set default RAM value to 2G in landing and hosting VM calculators 2017-12-21 08:41:29 +01:00
PCoder 4dff4e07cb Change minimum required RAM from 2GB to 1GB 2017-12-21 01:25:52 +01:00
PCoder a339f65170 Correct _target to target and blank to _blank 2017-12-12 21:02:18 +01:00
PCoder 56962d5fdf Use target=_blank for links in landing payment page 2017-12-12 20:58:07 +01:00
PCoder 54185792cf Add resend activation link in the landing payment page 2017-12-12 20:48:47 +01:00
Arvind Tiwari 2d05720016 merged master 2017-11-27 16:30:42 +05:30
PCoder 45777878d7 Merge branch 'master' into task/3672/cleaning_existing_tests 2017-11-26 23:19:04 +01:00
PCoder a9a77cd6ac Add Stripe key to skipif condition for CeleryTaskTestCase 2017-11-26 00:06:58 +01:00
PCoder e95967c668 Update skipif condition for dcl.tests.test_create_vm_task 2017-11-26 00:01:40 +01:00
PCoder a0e36adebc Put skipIf condition at correct place 2017-11-25 21:56:48 +01:00
PCoder 7be92c72d4 Add skipIf condition to create_vm_task 2017-11-25 21:49:04 +01:00
PCoder 4d68f3bcbe Reformat code 2017-11-25 18:52:00 +01:00
Arvind Tiwari 71a522977f glasfaser height fix, about section last image fix, testimonials logo fix 2017-11-25 04:32:33 +05:30
PCoder 16e5fb8f5c Add multiply filter 2017-11-22 00:16:39 +01:00
PCoder 6d7d24eafe Remove unwanted br tag in de translation 2017-11-13 19:40:00 +01:00
PCoder 0038bb8ee4 Remove commented translation 2017-11-13 19:37:46 +01:00
PCoder 629eb41ff5 Remove "From confirmation to access" text 2017-11-13 19:00:59 +01:00
PCoder 0b340f29e1 Add DE translation 2017-11-11 11:40:26 +01:00
PCoder de76311ea3 Change "affordable vm hosting.." text 2017-11-11 11:39:29 +01:00
Arvind Tiwari 387cad476f Update translations for user activation email 2017-10-17 00:19:03 +05:30
Arvind Tiwari 9bc86255c4 user account details added and translation fix 2017-10-16 01:04:49 +05:30
Arvind Tiwari c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari 7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
M.Ravi 64695d0a38 Remove commented code 2017-10-13 00:57:30 +02:00
M.Ravi 152c930180 Redirect explicitly to the payment page on dcl landing login 2017-10-12 22:50:54 +02:00
Arvind Tiwari 606a687bc7 conflicts resolved 2017-10-13 02:08:28 +05:30
M.Ravi 4f6fd52ce8 Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page 2017-10-11 21:23:13 +02:00
Arvind Tiwari f7e6c26a34 merged master 2017-10-11 01:28:35 +05:30
M.Ravi 09f67e46b9 glasfaser: Fix email to parameter 2017-10-10 21:22:11 +02:00
Arvind Tiwari 7410a73e60 from email removed direct dependency from post request 2017-10-11 00:36:17 +05:30
M.Ravi 1c67d66ff7 Merge remote-tracking branch 'mainRepo/master' into task/3829/handle_landing_login_fail_in_same_page 2017-10-10 19:22:37 +02:00
Arvind Tiwari b908fc582c Merge branch 'master' into task/glasfaser_page 2017-10-10 22:37:38 +05:30
Arvind Tiwari ff3f0e8ed3 converted png to jpg, removed unused scripts/styles, cdn links added 2017-10-10 22:16:51 +05:30
Arvind Tiwari 452089e103 translation fix 2017-10-10 21:38:49 +05:30
Arvind Tiwari dedbcec8e7 mobile layout fix, animation directions changed 2017-10-10 21:32:01 +05:30
Arvind Tiwari 0616be9864 op text sections added, from email fixed 2017-10-10 20:58:11 +05:30
Arvind Tiwari 8c37f02b91 text changed 2017-10-10 02:38:19 +05:30
Arvind Tiwari f68857cacb border padding aded 2017-10-10 02:18:56 +05:30
Arvind Tiwari c1d03b1281 hero image changed to progressive 2017-10-10 02:16:27 +05:30
Arvind Tiwari 96a993b235 images added, ungleich landing modified 2017-10-10 02:09:03 +05:30
Arvind Tiwari 695a8687fd first iteration 2017-10-10 00:04:19 +05:30
M.Ravi 8b36d9cba4 Create stripe customer if not exists 2017-10-08 21:01:25 +02:00
M.Ravi b44948b277 Prefill cc info on landing for logged in case
Attention: We still support only one card
2017-10-08 20:21:20 +02:00
M.Ravi 86c931cde1 Remove prefixes for billing_address_forms 2017-10-08 19:24:58 +02:00
M.Ravi cdbab541bc Refactor billing_address_form for not logged in case 2017-10-08 17:29:10 +02:00
M.Ravi 5a2657e357 Create billing_address_form only for a logged user 2017-10-08 17:21:38 +02:00
M.Ravi 564f47cf8a Handle login and billing address forms together in PaymentOrderView 2017-10-08 13:50:43 +02:00
Arvind Tiwari 25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
M.Ravi 02d144fbf9 Add form name and error fields to payment login form 2017-10-07 12:59:40 +02:00
Arvind Tiwari 7d7b8661ea translations 2017-10-07 16:19:53 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 60b233f082 Fix flake8 warnings 2017-10-03 00:26:50 +02:00
M.Ravi 42224a5d38 Add missing form ids 2017-10-02 01:34:32 +02:00
M.Ravi a605901850 Update datacenterlight django.po 2017-10-02 00:15:13 +02:00
M.Ravi 22af001489 Merge upstream master 2017-10-02 00:09:38 +02:00
M.Ravi 4bf73db14f Update datacenterlight django.po 2017-09-29 22:01:28 +02:00
M.Ravi 5bbfb54b79 Revert back to simple error message 2017-09-29 21:54:31 +02:00
M.Ravi 5393ffa10d Small code reorganizing 2017-09-29 09:16:00 +02:00
M.Ravi d06f5ffb00 datacenterlight/views: remove billing_address_id in call to
create_vm_task
2017-09-29 08:58:45 +02:00
M.Ravi 61a4060e10 datacenterlight/tests: remove billing_address_id in call to
create_vm_task
2017-09-29 08:55:30 +02:00
M.Ravi 483aa493bb Remove billing_address_id as it is no more used 2017-09-29 08:51:58 +02:00
M.Ravi caad79304b Pass subscription_id instead of subscription object 2017-09-29 08:40:43 +02:00
M.Ravi f29a3ad0e6 Pass subscription_id to create_vm_task instead of the object 2017-09-29 08:39:20 +02:00
M.Ravi 5783e42171 Refactor code and add following fixes
- create_vm_task receiving stripe_subscription_id instead of object
    - Fix: use BillingAddress instead of UserBillingAddress in
    HostingOrder, HostingPlan
    - Remove DictDotLookup class
2017-09-29 08:37:25 +02:00
M.Ravi f60a2c3482 Make correct icons load on dcl createvm error modal 2017-09-28 23:20:43 +02:00
M.Ravi 0202d5ba93 Add initial values for dcl billing form 2017-09-28 22:56:33 +02:00
PCoder fcda0b5637 DCL payment page: Get form data from session on error 2017-09-29 01:25:22 +05:30
M.Ravi c13015eabd Refactor and correct some logic 2017-09-28 15:56:09 +02:00
Arvind Tiwari 519a74e834 logo update 2017-09-28 19:08:25 +05:30
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
M.Ravi 57f0757fa3 Update datacenterlight django.po 2017-09-28 15:00:44 +02:00
Arvind Tiwari abb7c38d75 translation fix 2017-09-28 18:27:26 +05:30
M.Ravi 46925c29c4 Add error detail to the message 2017-09-28 14:57:03 +02:00
Arvind Tiwari b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
M.Ravi 07aaa20efe Fix issue : stripe user created every time for unauthenticated user 2017-09-28 14:46:56 +02:00
PCoder 39cb930326 Compute vm price on post of dcl index and set in session 2017-09-28 04:22:15 +05:30
PCoder e215a85a4d dcl order confirmation: add code to show button on modal 2017-09-28 04:14:35 +05:30
PCoder fccd75f1fc Add missing imports 2017-09-28 03:46:05 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari f0a49ef075 translations 2017-09-28 03:12:03 +05:30
Arvind Tiwari 88706b0088 merged master 2017-09-28 03:06:47 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder 3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-28 01:14:37 +05:30
Arvind Tiwari 11c1781839 fix for gmail autoformatiing 2017-09-27 04:37:02 +05:30
Arvind Tiwari 313b32e098 vm name bold in email 2017-09-27 04:24:22 +05:30
Arvind Tiwari 06bc37a977 paddings changed 2017-09-27 04:13:04 +05:30
Arvind Tiwari 96f24881fe vm name fix 2017-09-27 03:36:02 +05:30
Arvind Tiwari f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari 5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari 2d06173edb logo padding 2017-09-27 02:50:59 +05:30
Arvind Tiwari 8307636b9b Merge branch 'master' into task/3794/update_email_styles 2017-09-27 02:16:09 +05:30
Arvind Tiwari 03b4ff1b65 png logo 2017-09-27 02:14:45 +05:30
Arvind Tiwari d3f2fd2aa0 dcl logo changed to png 2017-09-27 02:14:20 +05:30
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
Arvind Tiwari 2a99d053dc text fixes 2017-09-26 03:42:10 +05:30
Arvind Tiwari 3cf28c793c form method fix 2017-09-26 03:29:38 +05:30