Commit graph

  • 4d485ef178 Add initial ungleich_page migration M.Ravi 2017-10-17 15:58:27 +02:00
  • 8e76a1c671 Set image and title dynamically M.Ravi 2017-10-17 15:52:30 +02:00
  • a5dea2b399 Add ungleich_page cms_plugins and section templates M.Ravi 2017-10-17 09:30:52 +02:00
  • b6f1309735 Add glasfaser_cms_page.html M.Ravi 2017-10-17 09:06:45 +02:00
  • daaf55b343 Update Changelog M.Ravi 2017-10-16 21:18:03 +02:00
  • 0c519de3f4 Merge pull request #524 from ungleich/bugfix/digitalglarus_registration_link Pcoder 2017-10-16 21:07:28 +02:00
  • 1839a1c27c translation re compilation Arvind Tiwari 2017-10-17 00:35:51 +05:30
  • 2a71be354b conflicts resolved Arvind Tiwari 2017-10-17 00:27:50 +05:30
  • 24cce4eed7 - Remove registration link from DG registration email - Remove multiple declared settings M.Ravi 2017-10-16 20:53:51 +02:00
  • 387cad476f Update translations for user activation email Arvind Tiwari 2017-10-17 00:19:03 +05:30
  • c939106a35 Prepare to handle delete card M.Ravi 2017-10-16 16:29:09 +02:00
  • bff37d6246 Add card id param to card details M.Ravi 2017-10-16 16:20:03 +02:00
  • 3d50868c6a Add url for card delete M.Ravi 2017-10-16 16:18:39 +02:00
  • de275c23ac Add modal for card delete M.Ravi 2017-10-16 16:18:17 +02:00
  • 619f37829e Now showing cards from UserCardDetails M.Ravi 2017-10-15 23:57:15 +02:00
  • 52791f5e48 Refactor cc_brand to brand M.Ravi 2017-10-15 23:56:38 +02:00
  • 3f9c1a68d1 Remove unused code M.Ravi 2017-10-15 23:38:18 +02:00
  • 74a1f82c30 Refactor handling post for settings card input form M.Ravi 2017-10-15 23:37:01 +02:00
  • a3ce43fd53 Add add_card_to_stripe_customer function M.Ravi 2017-10-15 23:32:16 +02:00
  • 83363f4701 Remove some lines M.Ravi 2017-10-15 21:46:26 +02:00
  • 7d69d8d5d4 Add get_cards_details_from_token function M.Ravi 2017-10-15 21:45:17 +02:00
  • 220a85b4a4 Merge pull request #523 from tiwariav/bugfix/account_activation_email Arvind Tiwari 2017-10-16 01:08:54 +05:30
  • 88be7be180 translation fix Arvind Tiwari 2017-10-16 01:07:54 +05:30
  • 9bc86255c4 user account details added and translation fix Arvind Tiwari 2017-10-16 01:04:49 +05:30
  • 167e3589d4 Rename user to stripe_customer M.Ravi 2017-10-15 21:21:36 +02:00
  • a1d7b07e0c Relate UserCardDetail with StripeCustomer and add more fields to uniquely identify if a user already has a card M.Ravi 2017-10-15 21:19:13 +02:00
  • 9a9a764023 Add preferred card field to UserCardDetail M.Ravi 2017-10-15 20:06:56 +02:00
  • f3ca9110e1 Add UserCardDetail migration M.Ravi 2017-10-15 19:56:40 +02:00
  • 6420a9869b Add functionality to save UserCardDetail M.Ravi 2017-10-15 19:55:37 +02:00
  • f71c8e553d Add name to user details form button name M.Ravi 2017-10-15 19:54:01 +02:00
  • 1a25bbf11e Add name to card form button name M.Ravi 2017-10-15 19:51:58 +02:00
  • a4b63e220a Relate UserCardDetail to CustomUser and rename some fields M.Ravi 2017-10-15 19:49:44 +02:00
  • 707f1a8768 Add UserCardDetail model + Reorganize imports M.Ravi 2017-10-15 18:00:43 +02:00
  • e6f92d9ae4 Manual merge M.Ravi 2017-10-15 16:14:33 +02:00
  • 839b7acd74 Update Changelog Arvind Tiwari 2017-10-15 02:31:19 +05:30
  • 5d35cb02ad Merge pull request #516 from tiwariav/task/3838/restyle_login_pages Arvind Tiwari 2017-10-15 02:31:09 +05:30
  • 3370f06bff msg fix Arvind Tiwari 2017-10-15 02:30:42 +05:30
  • c60d45c292 merge master Arvind Tiwari 2017-10-15 01:52:29 +05:30
  • 1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period Arvind Tiwari 2017-10-15 01:27:02 +05:30
  • 6fe0e27e04 Merge pull request #494 from tiwariav/task/3794/update_email_styles Arvind Tiwari 2017-10-15 00:47:14 +05:30
  • ed1f1451ce [] removed around the vm name Arvind Tiwari 2017-10-15 00:41:31 +05:30
  • 2cd1850f02 password reset email fix Arvind Tiwari 2017-10-15 00:30:52 +05:30
  • 7b71ba1749 merged master Arvind Tiwari 2017-10-15 00:10:02 +05:30
  • 1fd5b51cae cdn links for vendor files Arvind Tiwari 2017-10-14 23:04:19 +05:30
  • d452118b2f Update Changelog M.Ravi 2017-10-14 13:08:21 +02:00
  • 49cb69b2a8 Merge pull request #517 from pcoder/task/3829/handle_landing_login_fail_in_same_page Pcoder 2017-10-14 13:05:35 +02:00
  • ed05411dac Return if the form already contains error M.Ravi 2017-10-14 12:52:18 +02:00
  • e7882c0dec Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page M.Ravi 2017-10-14 11:41:25 +02:00
  • 64695d0a38 Remove commented code M.Ravi 2017-10-13 00:57:30 +02:00
  • ce5513621d Merge pull request #522 from tiwariav/bugfix/ungleich_landing Arvind Tiwari 2017-10-13 02:25:01 +05:30
  • d250539ade minor fix Arvind Tiwari 2017-10-13 02:24:29 +05:30
  • 2493536fb4 line break on subheading Arvind Tiwari 2017-10-13 02:22:51 +05:30
  • 152c930180 Redirect explicitly to the payment page on dcl landing login M.Ravi 2017-10-12 22:50:54 +02:00
  • 606a687bc7 conflicts resolved Arvind Tiwari 2017-10-13 02:08:28 +05:30
  • bb0b2f33a7 Update Changelog Arvind Tiwari 2017-10-13 02:05:10 +05:30
  • f9819428a7 Merge pull request #521 from tiwariav/bugfix/3847/ungleich_landing Arvind Tiwari 2017-10-13 02:02:55 +05:30
  • 1018792df3 Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page M.Ravi 2017-10-12 22:32:26 +02:00
  • 0e0057c8ce translation update Arvind Tiwari 2017-10-13 01:57:25 +05:30
  • 2d5acff4a8 sub heading text changed Arvind Tiwari 2017-10-13 01:55:36 +05:30
  • 764a51c0e7 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete M.Ravi 2017-10-12 19:32:00 +02:00
  • 07e67f727a Update Changelog M.Ravi 2017-10-12 19:12:27 +02:00
  • 3b9cfed794 Merge pull request #520 from ungleich/bugfix/stripe_js_error Pcoder 2017-10-12 19:10:28 +02:00
  • 859ccd54a6 Remove some more commented code and console logs M.Ravi 2017-10-12 19:06:26 +02:00
  • 1b14598cc9 Create Stripe elements only stripe key is defined M.Ravi 2017-10-12 00:43:55 +02:00
  • 8678f7f8ea Remove unused import M.Ravi 2017-10-12 00:32:47 +02:00
  • a03040b449 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete M.Ravi 2017-10-11 21:25:52 +02:00
  • 4f6fd52ce8 Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page M.Ravi 2017-10-11 21:23:13 +02:00
  • 9ae2b94b44 hosting products -> our products Arvind Tiwari 2017-10-12 00:01:31 +05:30
  • 53956a6c2f Update Changelog for 1.2.6 1.2.6 M.Ravi 2017-10-10 22:41:59 +02:00
  • 5a3ba0dad3 Merge pull request #519 from tiwariav/task/glasfaser_page Arvind Tiwari 2017-10-11 01:42:54 +05:30
  • f7e6c26a34 merged master Arvind Tiwari 2017-10-11 01:28:35 +05:30
  • e13a2fba01 fixed html lang attr Arvind Tiwari 2017-10-11 01:23:53 +05:30
  • 31781778e4 bootstrap js file added Arvind Tiwari 2017-10-11 01:16:31 +05:30
  • 09f67e46b9 glasfaser: Fix email to parameter M.Ravi 2017-10-10 21:22:11 +02:00
  • 8ad3cb16df timeline last icon extended line removed Arvind Tiwari 2017-10-11 00:50:09 +05:30
  • 7410a73e60 from email removed direct dependency from post request Arvind Tiwari 2017-10-11 00:36:17 +05:30
  • 3e6084a1b1 translation fix Arvind Tiwari 2017-10-11 00:30:32 +05:30
  • fe02cf0a1b links added to ungleich landing, svg icons added Arvind Tiwari 2017-10-10 23:04:54 +05:30
  • 1c67d66ff7 Merge remote-tracking branch 'mainRepo/master' into task/3829/handle_landing_login_fail_in_same_page M.Ravi 2017-10-10 19:22:37 +02:00
  • 25a4768bda animation diration and direction changed Arvind Tiwari 2017-10-10 22:46:29 +05:30
  • 50e6ecdc11 css link fixed Arvind Tiwari 2017-10-10 22:41:32 +05:30
  • b908fc582c Merge branch 'master' into task/glasfaser_page Arvind Tiwari 2017-10-10 22:37:38 +05:30
  • ff3f0e8ed3 converted png to jpg, removed unused scripts/styles, cdn links added Arvind Tiwari 2017-10-10 22:16:51 +05:30
  • 9530894308 translation fix Arvind Tiwari 2017-10-10 22:12:35 +05:30
  • c721d81075 Update changelog for 1.2.5 1.2.5 Nico Schottelius 2017-10-10 18:22:29 +02:00
  • 5237cef552 Merge pull request #518 from tiwariav/task/glasfaser_page Nico Schottelius 2017-10-10 18:15:43 +02:00
  • 452089e103 translation fix Arvind Tiwari 2017-10-10 21:38:49 +05:30
  • dedbcec8e7 mobile layout fix, animation directions changed Arvind Tiwari 2017-10-10 21:32:01 +05:30
  • 0616be9864 op text sections added, from email fixed Arvind Tiwari 2017-10-10 20:58:11 +05:30
  • 8c37f02b91 text changed Arvind Tiwari 2017-10-10 02:38:19 +05:30
  • f68857cacb border padding aded Arvind Tiwari 2017-10-10 02:18:56 +05:30
  • c1d03b1281 hero image changed to progressive Arvind Tiwari 2017-10-10 02:16:27 +05:30
  • 96a993b235 images added, ungleich landing modified Arvind Tiwari 2017-10-10 02:09:03 +05:30
  • 695a8687fd first iteration Arvind Tiwari 2017-10-10 00:04:19 +05:30
  • 8b36d9cba4 Create stripe customer if not exists M.Ravi 2017-10-08 21:01:25 +02:00
  • b44948b277 Prefill cc info on landing for logged in case M.Ravi 2017-10-08 20:21:17 +02:00
  • 86c931cde1 Remove prefixes for billing_address_forms M.Ravi 2017-10-08 19:24:58 +02:00
  • cdbab541bc Refactor billing_address_form for not logged in case M.Ravi 2017-10-08 17:29:10 +02:00
  • 5a2657e357 Create billing_address_form only for a logged user M.Ravi 2017-10-08 17:21:38 +02:00
  • 110888e5aa Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page M.Ravi 2017-10-08 13:51:45 +02:00