Commit graph

2693 commits

Author SHA1 Message Date
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
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
fc6d600db3 Merge remote-tracking branch 'ungleich/master' 2017-09-27 02:15:47 +05:30
Arvind Tiwari
96933d50c8 Update Changelog 2017-09-27 00:46:14 +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
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
2dbaa1c693 template name 2017-09-26 03:57:07 +05:30
Arvind Tiwari
2a99d053dc text fixes 2017-09-26 03:42:10 +05:30
Arvind Tiwari
3cf28c793c form method fix 2017-09-26 03:29:38 +05:30
Arvind Tiwari
dfbda2a53b load tag 2017-09-26 03:21:20 +05:30
Arvind Tiwari
3c32abbf8e dcl form added 2017-09-26 03:18:19 +05:30
Arvind Tiwari
b782c6212a Merge remote-tracking branch 'ungleich/master' 2017-09-26 02:53:25 +05:30
Arvind Tiwari
f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
PCoder
543465e89b Update Changelog for 1.2.3 2017-09-26 02:34:10 +05:30
PCoder
29a45e81bf Include cdist 4.7.0 in requirements.txt 2017-09-26 02:24:17 +05:30
PCoder
7933584942 Updated changelog 2017-09-26 02:13:49 +05:30
Pcoder
3095b64561 Merge pull request #498 from pcoder/task/3781/resend_activation_mail
Task/3781/resend activation mail
2017-09-25 20:39:20 +00:00
PCoder
6bf89669ef some more de translations 2017-09-26 02:07:28 +05:30
PCoder
3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
PCoder
75ff7e4ea8 Added some translations 2017-09-26 01:53:19 +05:30
PCoder
81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
Arvind Tiwari
230866e563 Merge branch 'master' into task/3808/dcl_order_confirm 2017-09-26 01:10:16 +05:30
Arvind Tiwari
a646fef2c7 merged master 2017-09-26 01:09:45 +05:30
PCoder
25f3118126 Updated Changelog 2017-09-26 01:06:41 +05:30
Pcoder
ed4c968974 Merge pull request #501 from pcoder/bug/3806/cannot_create_vms_after_password_reset
Fix cannot create vms after password reset
2017-09-25 19:34:39 +00:00
Arvind Tiwari
63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +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