Pcoder
|
0c519de3f4
|
Merge pull request #524 from ungleich/bugfix/digitalglarus_registration_link
bugfix/remove DG email registration validate link
|
2017-10-16 21:07:28 +02:00 |
|
Arvind Tiwari
|
1839a1c27c
|
translation re compilation
|
2017-10-17 00:35:51 +05:30 |
|
Arvind Tiwari
|
2a71be354b
|
conflicts resolved
|
2017-10-17 00:27:50 +05:30 |
|
M.Ravi
|
24cce4eed7
|
- Remove registration link from DG registration email
- Remove multiple declared settings
|
2017-10-16 20:53:51 +02:00 |
|
Arvind Tiwari
|
387cad476f
|
Update translations for user activation email
|
2017-10-17 00:19:03 +05:30 |
|
M.Ravi
|
c939106a35
|
Prepare to handle delete card
|
2017-10-16 16:29:09 +02:00 |
|
M.Ravi
|
bff37d6246
|
Add card id param to card details
|
2017-10-16 16:20:03 +02:00 |
|
M.Ravi
|
3d50868c6a
|
Add url for card delete
|
2017-10-16 16:18:39 +02:00 |
|
M.Ravi
|
de275c23ac
|
Add modal for card delete
|
2017-10-16 16:18:17 +02:00 |
|
M.Ravi
|
619f37829e
|
Now showing cards from UserCardDetails
|
2017-10-15 23:57:15 +02:00 |
|
M.Ravi
|
52791f5e48
|
Refactor cc_brand to brand
|
2017-10-15 23:56:38 +02:00 |
|
M.Ravi
|
3f9c1a68d1
|
Remove unused code
|
2017-10-15 23:38:18 +02:00 |
|
M.Ravi
|
74a1f82c30
|
Refactor handling post for settings card input form
|
2017-10-15 23:37:01 +02:00 |
|
M.Ravi
|
a3ce43fd53
|
Add add_card_to_stripe_customer function
|
2017-10-15 23:32:16 +02:00 |
|
M.Ravi
|
83363f4701
|
Remove some lines
|
2017-10-15 21:46:26 +02:00 |
|
M.Ravi
|
7d69d8d5d4
|
Add get_cards_details_from_token function
|
2017-10-15 21:45:17 +02:00 |
|
Arvind Tiwari
|
220a85b4a4
|
Merge pull request #523 from tiwariav/bugfix/account_activation_email
bugfix user account details added and translation fix
|
2017-10-16 01:08:54 +05:30 |
|
Arvind Tiwari
|
88be7be180
|
translation fix
|
2017-10-16 01:07:54 +05:30 |
|
Arvind Tiwari
|
9bc86255c4
|
user account details added and translation fix
|
2017-10-16 01:04:49 +05:30 |
|
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 |
|
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 |
|