Commit graph

842 commits

Author SHA1 Message Date
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
1dfe1d7cf8 Redirect to my virtual machines page if any error 2017-09-29 21:53:02 +02:00
M.Ravi
4b8d68fc8e Reuse price parameter 2017-09-29 09:35:45 +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
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
4ce1ff073a Some more modal styles 2017-09-28 23:31:29 +02:00
M.Ravi
f60a2c3482 Make correct icons load on dcl createvm error modal 2017-09-28 23:20:43 +02:00
M.Ravi
9cab43f051 Update modal with html from server 2017-09-28 23:03:22 +02:00
PCoder
4efc1b4943 Merge branch 'master' into bugfix/stripe_error 2017-09-28 23:43:21 +05:30
M.Ravi
03442398c2 Handle message create vm request in js 2017-09-28 17:31:29 +02:00
Arvind Tiwari
9c69c4cb25 Update landing-page.css 2017-09-28 19:14:13 +05:30
PCoder
06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Pcoder
e0c9764e4e Merge pull request #505 from tiwariav/bugfix/order_details
Bugfix/ order details page
2017-09-27 21:26:36 +00:00
Arvind Tiwari
3ba1f191a3 show period if dates exist 2017-09-28 02:47:58 +05:30
Arvind Tiwari
df67fa3333 period added 2017-09-28 02:39:55 +05:30
PCoder
4e080c9afc Invoice: Get VM name from id and configuration 2017-09-28 02:36:49 +05:30
Arvind Tiwari
858fdd5e3f Update order_detail.html 2017-09-28 02:11:11 +05:30
Arvind Tiwari
7039ccd3b9 modal btn color changed 2017-09-28 02:09:03 +05:30
PCoder
5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder
3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-28 01:14:37 +05:30
Arvind Tiwari
ce63d397be Merge pull request #504 from tiwariav/task/3812/modal_weight_fix
Task/3812 modal font size and check icon weight fix
2017-09-27 00:42:37 +05:30
Arvind Tiwari
6ef5d2f777 typo fix 2017-09-27 00:08:14 +05:30
Arvind Tiwari
42985c28f1 using data.redirect to set redirect path on success 2017-09-26 22:58:56 +05:30
PCoder
e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder
c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder
a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
Arvind Tiwari
f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
PCoder
3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
PCoder
81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder
6321f44c08 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-26 00:54:33 +05:30
PCoder
177c4719e1 Merge remote-tracking branch 'mainRepo/master' 2017-09-26 00:53:58 +05:30
verysanghee
f35663b5ac Update django.po 2017-09-25 21:18:46 +02:00
verysanghee
e85a7c9e2a Update django.po 2017-09-25 21:14:19 +02:00
verysanghee
2f4b7bb749 Update django.po 2017-09-25 21:07:33 +02:00
PCoder
f0ba9a0c0c Updated hosting django.po 2017-09-26 00:36:06 +05:30
PCoder
a9755ccbff Updated hosting django.po 2017-09-26 00:34:33 +05:30
verysanghee
889d737c7c Update django.po 2017-09-25 20:58:59 +02:00
PCoder
e2779314b0 Fix cancel vm modal text translation 2017-09-26 00:25:54 +05:30
PCoder
78abc0c740 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-25 23:55:20 +05:30
PCoder
bb8c1a72fd Add missing import get_language 2017-09-25 23:52:47 +05:30
M.Ravi
a73bcaef05 Store hash 2017-09-25 09:35:18 +02:00
PCoder
70d5efb21a Update hosting django.po with a de translation 2017-09-25 02:09:49 +05:30
PCoder
46d82268f4 Show terminated in invoice for VM that has been terminated 2017-09-25 02:04:40 +05:30
PCoder
7fcece40c1 Using VMDetail model to show order details 2017-09-25 01:49:00 +05:30
PCoder
f2213305f6 Reformatted hosting views.py 2017-09-25 00:46:39 +05:30
PCoder
83ccb9cffa Added vmdetail migration file 2017-09-25 00:36:33 +05:30
PCoder
f2f2fc22df Update VMDetail's terminated_at on delete of a vm 2017-09-25 00:30:28 +05:30
PCoder
f4899ffc18 Added missing get_language import 2017-09-25 00:01:48 +05:30