Commit graph

  • 519a74e834 logo update Arvind Tiwari 2017-09-28 19:08:25 +05:30
  • d751aa6d63 padding fix Arvind Tiwari 2017-09-28 18:48:21 +05:30
  • 7bd61f708c Merge branch 'master' into task/3785/my_bills_page Arvind Tiwari 2017-09-28 18:38:49 +05:30
  • ba366eed77 merge master Arvind Tiwari 2017-09-28 18:37:33 +05:30
  • 57f0757fa3 Update datacenterlight django.po M.Ravi 2017-09-28 15:00:44 +02:00
  • abb7c38d75 translation fix Arvind Tiwari 2017-09-28 18:27:26 +05:30
  • 46925c29c4 Add error detail to the message M.Ravi 2017-09-28 14:57:03 +02:00
  • b65bc3f1f5 merge master Arvind Tiwari 2017-09-28 18:23:48 +05:30
  • 4add1af933 Fix flake8 warnings M.Ravi 2017-09-28 14:49:17 +02:00
  • 07aaa20efe Fix issue : stripe user created every time for unauthenticated user M.Ravi 2017-09-28 14:46:56 +02:00
  • e110fd10f2 Update Changelog PCoder 2017-09-28 05:06:30 +05:30
  • ed459c827b Merge pull request #493 from pcoder/tiwariav-task/3756/landing_billing_page Pcoder 2017-09-27 23:32:05 +00:00
  • 3ceaf0192f Fix flake8 warnings PCoder 2017-09-28 04:57:40 +05:30
  • 39cb930326 Compute vm price on post of dcl index and set in session PCoder 2017-09-28 04:22:15 +05:30
  • e215a85a4d dcl order confirmation: add code to show button on modal PCoder 2017-09-28 04:14:35 +05:30
  • fccd75f1fc Add missing imports PCoder 2017-09-28 03:46:05 +05:30
  • 06ef940b01 Merge upstream PCoder 2017-09-28 03:33:43 +05:30
  • f0a49ef075 translations Arvind Tiwari 2017-09-28 03:12:03 +05:30
  • 88706b0088 merged master Arvind Tiwari 2017-09-28 03:06:47 +05:30
  • 4379cebbed default 'card' translated Arvind Tiwari 2017-09-28 03:05:47 +05:30
  • e0c9764e4e Merge pull request #505 from tiwariav/bugfix/order_details Pcoder 2017-09-27 21:26:36 +00:00
  • 3ba1f191a3 show period if dates exist Arvind Tiwari 2017-09-28 02:47:58 +05:30
  • df67fa3333 period added Arvind Tiwari 2017-09-28 02:39:55 +05:30
  • 4e080c9afc Invoice: Get VM name from id and configuration PCoder 2017-09-28 02:36:49 +05:30
  • 858fdd5e3f Update order_detail.html Arvind Tiwari 2017-09-28 02:11:11 +05:30
  • 7039ccd3b9 modal btn color changed Arvind Tiwari 2017-09-28 02:09:03 +05:30
  • c103c916ef Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-09-28 02:06:24 +05:30
  • 5a43a38e19 Update Changelog PCoder 2017-09-28 01:57:17 +05:30
  • e4ba4f0dfc Merge pull request #496 from pcoder/task/3730/refactor_price_parameter Pcoder 2017-09-27 20:25:46 +00:00
  • 5a2a134070 Merge upstream master PCoder 2017-09-28 01:35:09 +05:30
  • edd79bcd32 Update Changelog PCoder 2017-09-28 01:19:26 +05:30
  • a0eada2e77 Merge pull request #500 from pcoder/task/3764/show_cancelled_vms_my_orders Pcoder 2017-09-27 19:47:17 +00:00
  • 3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders PCoder 2017-09-28 01:14:37 +05:30
  • 7a07785a94 vm cancel email subject changed Arvind Tiwari 2017-09-28 01:11:39 +05:30
  • 8b9935f677 padding fix Arvind Tiwari 2017-09-28 00:59:49 +05:30
  • 77b2684217 mobile alignment fix for btn Arvind Tiwari 2017-09-28 00:50:38 +05:30
  • 4194a7c2d7 table header fixed Arvind Tiwari 2017-09-27 22:50:42 +05:30
  • 13556ef672 Merge branch 'master' into task/3672/cleaning_existing_tests M.Ravi 2017-09-27 14:18:14 +02:00
  • f1d273b9d0 .gitignore: remove .gitconfig M.Ravi 2017-09-27 13:46:00 +02:00
  • 172fffe7be .gitignore: change .sql to *.sql M.Ravi 2017-09-27 13:13:16 +02:00
  • aceaecc748 Add .gitconfig and .sql to .gitignore M.Ravi 2017-09-27 13:08:23 +02:00
  • 11c1781839 fix for gmail autoformatiing Arvind Tiwari 2017-09-27 04:37:02 +05:30
  • 313b32e098 vm name bold in email Arvind Tiwari 2017-09-27 04:24:22 +05:30
  • 06bc37a977 paddings changed Arvind Tiwari 2017-09-27 04:13:04 +05:30
  • 937cd2cd82 minor fix Arvind Tiwari 2017-09-27 03:41:18 +05:30
  • 45df525a37 vm cancel name fix Arvind Tiwari 2017-09-27 03:38:39 +05:30
  • 96f24881fe vm name fix Arvind Tiwari 2017-09-27 03:36:02 +05:30
  • f4b6b38522 minor fix Arvind Tiwari 2017-09-27 03:28:06 +05:30
  • 5747468c21 outline removed Arvind Tiwari 2017-09-27 03:09:43 +05:30
  • 2d06173edb logo padding Arvind Tiwari 2017-09-27 02:50:59 +05:30
  • d888b260ee welcome user mail Arvind Tiwari 2017-09-27 02:45:24 +05:30
  • 8307636b9b Merge branch 'master' into task/3794/update_email_styles Arvind Tiwari 2017-09-27 02:16:09 +05:30
  • fc6d600db3 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-09-27 02:15:47 +05:30
  • 03b4ff1b65 png logo Arvind Tiwari 2017-09-27 02:14:45 +05:30
  • d3f2fd2aa0 dcl logo changed to png Arvind Tiwari 2017-09-27 02:14:20 +05:30
  • 21660f8d00 font-size reduced, vm cancel and vm create email data fixed Arvind Tiwari 2017-09-27 02:07:52 +05:30
  • 96933d50c8 Update Changelog 1.2.3 Arvind Tiwari 2017-09-27 00:46:14 +05:30
  • ce63d397be Merge pull request #504 from tiwariav/task/3812/modal_weight_fix Arvind Tiwari 2017-09-27 00:42:37 +05:30
  • 6ef5d2f777 typo fix Arvind Tiwari 2017-09-27 00:08:14 +05:30
  • 42985c28f1 using data.redirect to set redirect path on success Arvind Tiwari 2017-09-26 22:58:56 +05:30
  • e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page PCoder 2017-09-26 12:20:56 +05:30
  • c17604e5c1 Merge master into task/3730/refactor_price_parameter PCoder 2017-09-26 12:16:50 +05:30
  • a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders PCoder 2017-09-26 12:09:09 +05:30
  • 2dbaa1c693 template name Arvind Tiwari 2017-09-26 03:57:07 +05:30
  • 2a99d053dc text fixes Arvind Tiwari 2017-09-26 03:42:10 +05:30
  • 3cf28c793c form method fix Arvind Tiwari 2017-09-26 03:29:38 +05:30
  • dfbda2a53b load tag Arvind Tiwari 2017-09-26 03:21:20 +05:30
  • 3c32abbf8e dcl form added Arvind Tiwari 2017-09-26 03:18:19 +05:30
  • 050f750322 merged master Arvind Tiwari 2017-09-26 03:06:12 +05:30
  • b782c6212a Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-09-26 02:53:25 +05:30
  • a37c734c94 translation fix Arvind Tiwari 2017-09-26 02:53:09 +05:30
  • f35c3dbc10 modal check icon thinner, terminate modal text smaller Arvind Tiwari 2017-09-26 02:38:31 +05:30
  • 543465e89b Update Changelog for 1.2.3 PCoder 2017-09-26 02:34:10 +05:30
  • 29a45e81bf Include cdist 4.7.0 in requirements.txt PCoder 2017-09-26 02:24:17 +05:30
  • 7933584942 Updated changelog PCoder 2017-09-26 02:13:49 +05:30
  • 3095b64561 Merge pull request #498 from pcoder/task/3781/resend_activation_mail Pcoder 2017-09-25 20:39:20 +00:00
  • 6bf89669ef some more de translations PCoder 2017-09-26 02:07:28 +05:30
  • 3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders PCoder 2017-09-26 01:58:42 +05:30
  • 75ff7e4ea8 Added some translations PCoder 2017-09-26 01:53:19 +05:30
  • 1fdc533f4d bills list page updated Arvind Tiwari 2017-09-26 01:18:39 +05:30
  • 81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail PCoder 2017-09-26 01:18:02 +05:30
  • 230866e563 Merge branch 'master' into task/3808/dcl_order_confirm Arvind Tiwari 2017-09-26 01:10:16 +05:30
  • a646fef2c7 merged master Arvind Tiwari 2017-09-26 01:09:45 +05:30
  • 25f3118126 Updated Changelog PCoder 2017-09-26 01:06:35 +05:30
  • ed4c968974 Merge pull request #501 from pcoder/bug/3806/cannot_create_vms_after_password_reset Pcoder 2017-09-25 19:34:39 +00:00
  • 63ea7dac37 datacenterlight invoice redesigned Arvind Tiwari 2017-09-26 01:04:38 +05:30
  • 6321f44c08 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset PCoder 2017-09-26 00:54:33 +05:30
  • 177c4719e1 Merge remote-tracking branch 'mainRepo/master' PCoder 2017-09-26 00:53:58 +05:30
  • f35663b5ac Update django.po verysanghee 2017-09-25 21:18:46 +02:00
  • e85a7c9e2a Update django.po verysanghee 2017-09-25 21:14:19 +02:00
  • 2f4b7bb749 Update django.po verysanghee 2017-09-25 21:07:33 +02:00
  • f0ba9a0c0c Updated hosting django.po PCoder 2017-09-26 00:36:06 +05:30
  • a9755ccbff Updated hosting django.po PCoder 2017-09-26 00:34:33 +05:30
  • 889d737c7c Update django.po verysanghee 2017-09-25 20:58:59 +02:00
  • e2779314b0 Fix cancel vm modal text translation PCoder 2017-09-26 00:25:54 +05:30
  • c2844d25ed Corrected a de spelling PCoder 2017-09-26 00:06:17 +05:30
  • 78abc0c740 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset PCoder 2017-09-25 23:55:20 +05:30
  • bb8c1a72fd Add missing import get_language PCoder 2017-09-25 23:52:40 +05:30
  • 04c29d0622 Update django.po verysanghee 2017-09-25 20:17:12 +02:00
  • a73bcaef05 Store hash M.Ravi 2017-09-25 09:35:18 +02:00