Commit graph

4159 commits

Author SHA1 Message Date
M.Ravi
167e3589d4 Rename user to stripe_customer 2017-10-15 21:21:36 +02:00
M.Ravi
a1d7b07e0c Relate UserCardDetail with StripeCustomer and add more fields to uniquely identify if a user already has a card 2017-10-15 21:19:13 +02:00
M.Ravi
9a9a764023 Add preferred card field to UserCardDetail 2017-10-15 20:06:56 +02:00
M.Ravi
f3ca9110e1 Add UserCardDetail migration 2017-10-15 19:56:40 +02:00
M.Ravi
6420a9869b Add functionality to save UserCardDetail 2017-10-15 19:55:37 +02:00
M.Ravi
f71c8e553d Add name to user details form button name 2017-10-15 19:54:01 +02:00
M.Ravi
1a25bbf11e Add name to card form button name 2017-10-15 19:51:58 +02:00
M.Ravi
a4b63e220a Relate UserCardDetail to CustomUser and rename some fields 2017-10-15 19:49:44 +02:00
M.Ravi
707f1a8768 Add UserCardDetail model + Reorganize imports 2017-10-15 18:00:43 +02:00
M.Ravi
e6f92d9ae4 Manual merge 2017-10-15 16:14:33 +02:00
Arvind Tiwari
839b7acd74 Update Changelog 2017-10-15 02:31:19 +05:30
Arvind Tiwari
5d35cb02ad Merge pull request #516 from tiwariav/task/3838/restyle_login_pages
Task/3838 restyle login pages
2017-10-15 02:31:09 +05:30
Arvind Tiwari
3370f06bff msg fix 2017-10-15 02:30:42 +05:30
Arvind Tiwari
c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari
1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
2017-10-15 01:27:02 +05:30
Arvind Tiwari
6fe0e27e04 Merge pull request #494 from tiwariav/task/3794/update_email_styles
Task/3794 update email styles
2017-10-15 00:47:14 +05:30
Arvind Tiwari
ed1f1451ce [] removed around the vm name 2017-10-15 00:41:31 +05:30
Arvind Tiwari
2cd1850f02 password reset email fix 2017-10-15 00:30:52 +05:30
Arvind Tiwari
7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
Arvind Tiwari
1fd5b51cae cdn links for vendor files 2017-10-14 23:04:19 +05:30
M.Ravi
d452118b2f Update Changelog 2017-10-14 13:08:21 +02:00
Pcoder
49cb69b2a8 Merge pull request #517 from pcoder/task/3829/handle_landing_login_fail_in_same_page
Task/3829/handle landing login fail in same page
2017-10-14 13:05:35 +02:00
M.Ravi
ed05411dac Return if the form already contains error 2017-10-14 12:52:18 +02:00
M.Ravi
e7882c0dec Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page 2017-10-14 11:41:25 +02:00
M.Ravi
64695d0a38 Remove commented code 2017-10-13 00:57:30 +02:00
Arvind Tiwari
ce5513621d Merge pull request #522 from tiwariav/bugfix/ungleich_landing
bugfix line break on subheading
2017-10-13 02:25:01 +05:30
Arvind Tiwari
d250539ade minor fix 2017-10-13 02:24:29 +05:30
Arvind Tiwari
2493536fb4 line break on subheading 2017-10-13 02:22:51 +05:30
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
Arvind Tiwari
bb0b2f33a7 Update Changelog 2017-10-13 02:05:10 +05:30
Arvind Tiwari
f9819428a7 Merge pull request #521 from tiwariav/bugfix/3847/ungleich_landing
Bugfix/3847 ungleich landing text
2017-10-13 02:02:55 +05:30
M.Ravi
1018792df3 Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page 2017-10-12 22:32:26 +02:00
Arvind Tiwari
0e0057c8ce translation update 2017-10-13 01:57:25 +05:30
Arvind Tiwari
2d5acff4a8 sub heading text changed 2017-10-13 01:55:36 +05:30
M.Ravi
764a51c0e7 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-12 19:32:00 +02:00
M.Ravi
07e67f727a Update Changelog 2017-10-12 19:12:32 +02:00
Pcoder
3b9cfed794 Merge pull request #520 from ungleich/bugfix/stripe_js_error
Bugfix/stripe js error in confirm order page
2017-10-12 19:10:28 +02:00
M.Ravi
859ccd54a6 Remove some more commented code and console logs 2017-10-12 19:06:26 +02:00
M.Ravi
1b14598cc9 Create Stripe elements only stripe key is defined 2017-10-12 00:43:55 +02:00
M.Ravi
8678f7f8ea Remove unused import 2017-10-12 00:32:47 +02:00
M.Ravi
a03040b449 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-11 21:25:52 +02:00
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
9ae2b94b44 hosting products -> our products 2017-10-12 00:01:31 +05:30
M.Ravi
53956a6c2f Update Changelog for 1.2.6 2017-10-10 22:41:59 +02:00
Arvind Tiwari
5a3ba0dad3 Merge pull request #519 from tiwariav/task/glasfaser_page
Bugfix/glasfaser_page
2017-10-11 01:42:54 +05:30
Arvind Tiwari
f7e6c26a34 merged master 2017-10-11 01:28:35 +05:30
Arvind Tiwari
e13a2fba01 fixed html lang attr 2017-10-11 01:23:53 +05:30
Arvind Tiwari
31781778e4 bootstrap js file added 2017-10-11 01:16:31 +05:30
M.Ravi
09f67e46b9 glasfaser: Fix email to parameter 2017-10-10 21:22:11 +02:00