Commit graph

948 commits

Author SHA1 Message Date
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
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
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
ed05411dac Return if the form already contains error 2017-10-14 12:52:18 +02:00
Arvind Tiwari
606a687bc7 conflicts resolved 2017-10-13 02:08:28 +05:30
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
Arvind Tiwari
3e6084a1b1 translation fix 2017-10-11 00:30:32 +05:30
Arvind Tiwari
452089e103 translation fix 2017-10-10 21:38:49 +05:30
Arvind Tiwari
6cdca621b2 original pattern.jpg added 2017-10-07 23:35:13 +05:30
Arvind Tiwari
25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
Arvind Tiwari
c400fdb02e width adjusted 2017-10-07 23:17:57 +05:30
Arvind Tiwari
2dd2945ee9 wider auth box 2017-10-07 17:51:18 +05:30
Arvind Tiwari
d0003ce9f3 style fixes 2017-10-07 17:35:10 +05:30
Arvind Tiwari
f3832c1db9 content-dashboard removed for unregistered pages 2017-10-07 17:06:55 +05:30
Arvind Tiwari
1dc374e09d footer links color changed 2017-10-07 16:23:04 +05:30
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
88781e992c 24 hr fix 2017-10-06 04:20:38 +05:30
Arvind Tiwari
d3d57ade37 formats fixed 2017-10-06 04:16:58 +05:30
Arvind Tiwari
8e5654bdb5 date time converted to locale 2017-10-06 04:11:40 +05:30
Arvind Tiwari
4dbf08f995 Merge branch 'master' into task/3828/invoice_period 2017-10-06 02:39:07 +05:30
Arvind Tiwari
cc2e08aff5 translations 2017-10-06 02:02:22 +05:30
Arvind Tiwari
ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari
bd3c59eb3e card_input template 2017-10-06 01:17:50 +05:30
Arvind Tiwari
6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
Arvind Tiwari
5e8b34d39c Update hosting favicon to dcl favicon 2017-10-06 01:02:14 +05:30
Arvind Tiwari
fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text
task/3811 create vm page lead text added
2017-10-04 01:00:03 +05:30
Arvind Tiwari
242f4edf8c Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
2017-10-04 00:05:27 +05:30
Arvind Tiwari
1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari
e7545247c9 Merge remote-tracking branch 'ungleich/master' 2017-10-03 23:46:43 +05:30
Arvind Tiwari
0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon
task/3823 hosting favicon link fixed
2017-10-03 23:42:57 +05:30
Arvind Tiwari
618a82fc66 Merge remote-tracking branch 'ungleich/master' 2017-10-03 21:51:28 +05:30
Arvind Tiwari
7e380267b7 Update payment.css 2017-10-03 21:49:51 +05:30
Arvind Tiwari
eb7b1a4ea0 Merge remote-tracking branch 'ungleich/master' 2017-10-03 21:46:23 +05:30
Arvind Tiwari
96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input
Bugfix/hosting_card_input
2017-10-03 21:39:44 +05:30
Arvind Tiwari
c410e2cbc5 stripe_customer_id retrieved from request.user relation 2017-10-03 21:35:08 +05:30
Arvind Tiwari
bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page
Task/3785 update my bills page
2017-10-03 21:31:27 +05:30
Arvind Tiwari
315ce92a78 post request attributes changed 2017-10-03 21:24:35 +05:30
Arvind Tiwari
0263964705 stripe_id used instead of id 2017-10-03 21:04:25 +05:30
Arvind Tiwari
6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari
734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari
2e34d404ea translation 2017-10-03 18:25:32 +05:30