Commit graph

2815 commits

Author SHA1 Message Date
Arvind Tiwari
e7545247c9 Merge remote-tracking branch 'ungleich/master' 2017-10-03 23:46:43 +05:30
Arvind Tiwari
7362a2f14e Update Changelog 2017-10-03 23:43:30 +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
4c8be518a9 Update Changelog 2017-10-03 23:42:15 +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
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
0263964705 stripe_id used instead of id 2017-10-03 21:04:25 +05:30
Arvind Tiwari
2e34d404ea translation 2017-10-03 18:25:32 +05:30
Arvind Tiwari
e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi
65745b5098 Update Changelog for 1.2.4 2017-10-03 00:36:49 +02:00
M.Ravi
a79efa4db6 Update Changelog 2017-10-03 00:27:05 +02:00
M.Ravi
60b233f082 Fix flake8 warnings 2017-10-03 00:26:50 +02:00
M.Ravi
c63e3cb0ff Update Changelog 2017-10-02 23:43:25 +02:00
Pcoder
97ed965b8b Merge pull request #510 from ungleich/tiwariav-task/3808/dcl_order_confirm
Task/3808 dcl order confirmation redesign
2017-10-02 23:39:58 +02:00
M.Ravi
44b5d9bb3a hosting order: Add price to vm context 2017-10-02 23:17:37 +02:00
M.Ravi
b848841337 Add logger error messages for Stripe errors 2017-10-02 01:35:28 +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
7680e5aa25 Update hosting django.po 2017-10-02 00:13:28 +02:00
M.Ravi
22af001489 Merge upstream master 2017-10-02 00:09:38 +02:00
M.Ravi
7aa50dcfa7 Update Changelog 2017-10-01 23:31:26 +02:00
Pcoder
350a52c657 Merge pull request #506 from ungleich/bugfix/stripe_error
- Bugfix/stripe error
- #3835 [dcl] Forbidden (403) CSRF verification failed. Request aborted.
- hosting/dashboard only available after login
2017-10-01 23:24:06 +02:00
M.Ravi
68cbfdd393 Update translation and fix loginmixin required for dashboard view 2017-10-01 23:06:51 +02:00
M.Ravi
cf45a9ac75 Add messages to some hosting templates 2017-10-01 20:39:55 +02:00
M.Ravi
06b1ce9e72 Update error message 2017-10-01 20:32:51 +02:00
M.Ravi
167eaf2a0c Add forbidden_view method adds the message and redirects to the same path 2017-10-01 20:17:03 +02:00
M.Ravi
9e8d930a3b Refactor messages to includes/_messages.html 2017-10-01 20:16:05 +02:00
M.Ravi
3a33dd2035 Add CSRF_FAILURE_VIEW 2017-10-01 20:14:46 +02:00
Arvind Tiwari
1fb7511292 favicon link changed 2017-09-30 17:08:40 +05:30
M.Ravi
6ef8a03de7 Respond with JSON 2017-09-30 01:02:59 +02:00
M.Ravi
4334dfaa44 Update utils django.po 2017-09-29 22:36:38 +02:00
M.Ravi
43e6fc45e2 Add de translations 2017-09-29 22:19:26 +02:00
M.Ravi
b04f9ea1ec Update hosting django.po 2017-09-29 22:12:02 +02:00
M.Ravi
00341e014c Update hosting django.po 2017-09-29 22:02:53 +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
1dfe1d7cf8 Redirect to my virtual machines page if any error 2017-09-29 21:53:02 +02:00
M.Ravi
e6869612d8 Update resend activation link email text 2017-09-29 21:45:30 +02:00
M.Ravi
4b8d68fc8e Reuse price parameter 2017-09-29 09:35:45 +02:00
M.Ravi
5393ffa10d Small code reorganizing 2017-09-29 09:16:00 +02:00
M.Ravi
5c99dd4da7 hosting/views: remove billing_address_id in call to create_vm_task 2017-09-29 09:07:38 +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
ac37349aef Refactor code and pass subscription_id instead of obj 2017-09-29 08:50:03 +02:00
M.Ravi
313ba9d502 Refactor set_subscription_id - use stripe subscription id instead of obj 2017-09-29 08:42:17 +02:00
M.Ravi
caad79304b Pass subscription_id instead of subscription object 2017-09-29 08:40:43 +02:00