Commit graph

3025 commits

Author SHA1 Message Date
M.Ravi
57f0757fa3 Update datacenterlight django.po 2017-09-28 15:00:44 +02:00
Arvind Tiwari
abb7c38d75 translation fix 2017-09-28 18:27:26 +05:30
M.Ravi
46925c29c4 Add error detail to the message 2017-09-28 14:57:03 +02:00
Arvind Tiwari
b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
M.Ravi
4add1af933 Fix flake8 warnings 2017-09-28 14:49:17 +02:00
M.Ravi
07aaa20efe Fix issue : stripe user created every time for unauthenticated user 2017-09-28 14:46:56 +02:00
PCoder
e110fd10f2 Update Changelog 2017-09-28 05:06:30 +05:30
Pcoder
ed459c827b Merge pull request #493 from pcoder/tiwariav-task/3756/landing_billing_page
Tiwariav task/3756/landing billing page
2017-09-27 23:32:05 +00:00
PCoder
3ceaf0192f Fix flake8 warnings 2017-09-28 04:57:40 +05:30
PCoder
39cb930326 Compute vm price on post of dcl index and set in session 2017-09-28 04:22:15 +05:30
PCoder
e215a85a4d dcl order confirmation: add code to show button on modal 2017-09-28 04:14:35 +05:30
PCoder
fccd75f1fc Add missing imports 2017-09-28 03:46:05 +05:30
PCoder
06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari
f0a49ef075 translations 2017-09-28 03:12:03 +05:30
Arvind Tiwari
88706b0088 merged master 2017-09-28 03:06:47 +05:30
Arvind Tiwari
4379cebbed default 'card' translated 2017-09-28 03:05:47 +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
Arvind Tiwari
c103c916ef Merge remote-tracking branch 'ungleich/master' 2017-09-28 02:06:24 +05:30
PCoder
5a43a38e19 Update Changelog 2017-09-28 01:57:17 +05:30
Pcoder
e4ba4f0dfc Merge pull request #496 from pcoder/task/3730/refactor_price_parameter
Task/3730,3736/Refactor price parameters in dcl flow and compute vm price parameter
2017-09-27 20:25:46 +00:00
PCoder
5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder
edd79bcd32 Update Changelog 2017-09-28 01:19:26 +05:30
Pcoder
a0eada2e77 Merge pull request #500 from pcoder/task/3764/show_cancelled_vms_my_orders
Task/3764/show cancelled vms my orders
2017-09-27 19:47:17 +00:00
PCoder
3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-28 01:14:37 +05:30
Arvind Tiwari
7a07785a94 vm cancel email subject changed 2017-09-28 01:11:39 +05:30
Arvind Tiwari
8b9935f677 padding fix 2017-09-28 00:59:49 +05:30
Arvind Tiwari
77b2684217 mobile alignment fix for btn 2017-09-28 00:50:38 +05:30
Arvind Tiwari
4194a7c2d7 table header fixed 2017-09-27 22:50:42 +05:30
M.Ravi
f1d273b9d0 .gitignore: remove .gitconfig 2017-09-27 13:47:28 +02:00
M.Ravi
172fffe7be .gitignore: change .sql to *.sql 2017-09-27 13:13:16 +02:00
M.Ravi
aceaecc748 Add .gitconfig and .sql to .gitignore 2017-09-27 13:08:23 +02:00
Arvind Tiwari
11c1781839 fix for gmail autoformatiing 2017-09-27 04:37:02 +05:30
Arvind Tiwari
313b32e098 vm name bold in email 2017-09-27 04:24:22 +05:30
Arvind Tiwari
06bc37a977 paddings changed 2017-09-27 04:13:04 +05:30
Arvind Tiwari
937cd2cd82 minor fix 2017-09-27 03:41:18 +05:30
Arvind Tiwari
45df525a37 vm cancel name fix 2017-09-27 03:38:39 +05:30
Arvind Tiwari
96f24881fe vm name fix 2017-09-27 03:36:02 +05:30
Arvind Tiwari
f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari
5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari
2d06173edb logo padding 2017-09-27 02:50:59 +05:30
Arvind Tiwari
d888b260ee welcome user mail 2017-09-27 02:45:24 +05:30
Arvind Tiwari
8307636b9b Merge branch 'master' into task/3794/update_email_styles 2017-09-27 02:16:09 +05:30
Arvind Tiwari
fc6d600db3 Merge remote-tracking branch 'ungleich/master' 2017-09-27 02:15:47 +05:30
Arvind Tiwari
03b4ff1b65 png logo 2017-09-27 02:14:45 +05:30
Arvind Tiwari
d3f2fd2aa0 dcl logo changed to png 2017-09-27 02:14:20 +05:30