Commit graph

  • 6d826fdfd2 Added logged in user as a parameter to create VM PCoder 2017-09-09 18:19:09 +05:30
  • e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared session on completion of creation of VM M.Ravi 2017-09-09 13:27:17 +02:00
  • c8baf3d4c1 Implemented post method for hosting OrderDetailView M.Ravi 2017-09-09 12:06:29 +02:00
  • f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler PCoder 2017-09-09 13:44:41 +05:30
  • 1d5f92f7e1 Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email PCoder 2017-09-09 12:12:56 +05:30
  • be55e2613d DE translation fix PCoder 2017-09-09 11:49:32 +05:30
  • e9b5e052ac Merged upstream master into task/3484/email_refactoring PCoder 2017-09-09 11:38:48 +05:30
  • d4e73f4c74 Merge branch 'master' into task/3756/landing_billing_page Arvind Tiwari 2017-09-09 02:13:24 +05:30
  • 7a4573f7ad user logged in after signup on payment page Arvind Tiwari 2017-09-09 02:10:25 +05:30
  • 09852aade2 Changelog updated 1.2.1 -> 1.2.2 1.2.2 Arvind Tiwari 2017-09-09 02:04:28 +05:30
  • c157dd6124 Merge pull request #485 from tiwariav/bugfix/hosting_navbar_logo Arvind Tiwari 2017-09-09 00:47:13 +05:30
  • e9e72f4883 hosting navbar logo link fixed to dcl landing Arvind Tiwari 2017-09-09 00:46:13 +05:30
  • 71e6fac997 Merge pull request #482 from tiwariav/task/3759/hosting_navbar Arvind Tiwari 2017-09-09 00:28:57 +05:30
  • 3c4eb719b7 Merge pull request #481 from tiwariav/task/3644/login_btn_landing Arvind Tiwari 2017-09-09 00:27:35 +05:30
  • f2a04c20f2 form submit fix Arvind Tiwari 2017-09-09 00:05:13 +05:30
  • 2dc9ce4d31 vm specs fixed Arvind Tiwari 2017-09-08 23:53:32 +05:30
  • de1895d2a0 billing address form fixed Arvind Tiwari 2017-09-08 23:46:29 +05:30
  • daba6ae2fb merged master Arvind Tiwari 2017-09-08 20:22:22 +05:30
  • 5c543af25c code cleanup Arvind Tiwari 2017-09-08 20:14:43 +05:30
  • a71d4e1c5c Merge branch 'master' into task/3644/login_btn_landing Arvind Tiwari 2017-09-08 20:13:59 +05:30
  • 3852d26f37 merged master Arvind Tiwari 2017-09-08 20:13:17 +05:30
  • 60bc1a86b3 font weight on mobile Arvind Tiwari 2017-09-08 03:52:24 +05:30
  • fc170462e2 font weight on mobile Arvind Tiwari 2017-09-08 03:41:25 +05:30
  • bbee940720 padding fix Arvind Tiwari 2017-09-08 03:19:08 +05:30
  • 3b8c3265ca Merge pull request #484 from tiwariav/task/3779/transparent_navbar Arvind Tiwari 2017-09-08 02:57:10 +05:30
  • 6a56f4c689 logo position fix Arvind Tiwari 2017-09-08 02:43:11 +05:30
  • 9721784ff2 logo href fixed Arvind Tiwari 2017-09-08 02:32:46 +05:30
  • 4937baa2e0 dropdown style updated Arvind Tiwari 2017-09-08 02:22:03 +05:30
  • d5c0fef965 Merge pull request #483 from tiwariav/task/3775/hosting_default_page Arvind Tiwari 2017-09-08 02:03:08 +05:30
  • 84d35ea916 padding fixed Arvind Tiwari 2017-09-08 00:11:20 +05:30
  • b4641e9dfd font wieght 300 Arvind Tiwari 2017-09-08 00:07:09 +05:30
  • 223606947a removed icon Arvind Tiwari 2017-09-07 23:48:53 +05:30
  • c8b0e2388d login btn special style reset Arvind Tiwari 2017-09-07 23:10:05 +05:30
  • 73bbe29113 transparent navbar added to signup validate page Arvind Tiwari 2017-09-07 22:47:56 +05:30
  • ac2791a3f1 dcl navbar border dadded Arvind Tiwari 2017-09-07 22:44:06 +05:30
  • 3dca3a40ae Merge pull request #464 from tiwariav/task/3704/my_settings Arvind Tiwari 2017-09-07 22:36:09 +05:30
  • e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard Arvind Tiwari 2017-09-07 22:24:03 +05:30
  • db891aaa1e hosting navbar changed and consistent with dcl navbar Arvind Tiwari 2017-09-07 21:01:17 +05:30
  • 43c6abea7e minor changes Arvind Tiwari 2017-09-07 20:27:18 +05:30
  • d643e6a5b1 login btn on datacenterlight pages Arvind Tiwari 2017-09-07 20:24:19 +05:30
  • a0451fc8ea Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-09-07 19:59:36 +05:30
  • 0ed104cd56 logged in user Arvind Tiwari 2017-09-07 19:56:34 +05:30
  • ec300a76eb Handled some more errors that can be generated when creating SSHKey M.Ravi 2017-09-07 00:44:39 +02:00
  • cf6bd8a7c1 Validating ssh public keys using sshpubkeys M.Ravi 2017-09-07 00:31:09 +02:00
  • 0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view M.Ravi 2017-09-06 23:52:02 +02:00
  • 67ab4ef0a1 hosting: Added order-confirmation url M.Ravi 2017-09-06 23:50:19 +02:00
  • df23862ea1 Added per month text for price M.Ravi 2017-09-06 23:49:38 +02:00
  • 114b4bea48 new translations Arvind Tiwari 2017-09-07 02:52:25 +05:30
  • db90ea8713 new translations Arvind Tiwari 2017-09-07 02:51:07 +05:30
  • 98e8be1da9 landing payment page layout complete Arvind Tiwari 2017-09-07 02:47:57 +05:30
  • 367be351a2 Merged upstream origin 1.2.1 M.Ravi 2017-09-06 23:03:49 +02:00
  • 7c87b520c1 Updated Changelog for 1.2.1 M.Ravi 2017-09-06 22:58:44 +02:00
  • 4b2b88fc27 Merge pull request #479 from pcoder/task/3757-2/dcl_add_new_routes Pcoder 2017-09-06 20:51:14 +00:00
  • 4925146715 Using one lettered url patterns for social media links M.Ravi 2017-09-06 22:05:52 +02:00
  • c072d382ee Added /fb and /li routes to datacenterlight M.Ravi 2017-09-06 20:13:30 +02:00
  • 2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) PCoder 2017-09-06 13:25:18 +05:30
  • aaf3bc18d8 landing_payment all sections arranged Arvind Tiwari 2017-09-06 00:12:13 +05:30
  • d13d9bf441 removed edit option from card details Arvind Tiwari 2017-09-05 22:09:18 +05:30
  • dc6fa5428e Corrected filtering public ssh keys condition PCoder 2017-09-05 03:29:12 +05:30
  • a32bb9b774 We use the default timezone available to celery PCoder 2017-09-05 02:26:00 +05:30
  • 5d3f355c36 no card added Arvind Tiwari 2017-09-05 01:51:53 +05:30
  • 277fcdbac1 cdist: Updated requirements.txt PCoder 2017-09-05 00:34:22 +05:30
  • 09b80467b9 landing payment page cleanup Arvind Tiwari 2017-09-05 00:24:18 +05:30
  • 046b716091 Merge branch 'master' into task/3756/landing_billing_page Arvind Tiwari 2017-09-04 23:58:22 +05:30
  • 3ff0c4a1a2 merged master Arvind Tiwari 2017-09-04 23:52:22 +05:30
  • 0bdda9a542 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-09-04 23:43:58 +05:30
  • f84b95e385 Added some translations PCoder 2017-09-04 22:27:59 +05:30
  • 8ac8b25d78 Updated new vm email template PCoder 2017-09-04 12:32:53 +05:30
  • a98832c6d3 Fixed datacenterlight django.po M.Ravi 2017-09-03 18:49:28 +02:00
  • 7a4e0760ae Updated account activation txt email template M.Ravi 2017-09-03 18:47:42 +02:00
  • d481737518 Fixed subject of account activation email templates M.Ravi 2017-09-03 18:17:25 +02:00
  • f7129e0b23 Removed an invalid quote from cancel email template M.Ravi 2017-09-03 17:49:31 +02:00
  • 52edb5466d Added some translations in utils django.po M.Ravi 2017-09-03 17:22:16 +02:00
  • da4ca01524 Fixed hosting django.po error M.Ravi 2017-09-03 17:16:25 +02:00
  • 43e4c021a7 Removed order id from cancel vm email templates M.Ravi 2017-09-03 17:13:49 +02:00
  • a32c8ea467 Corrected VM cancellation email templates M.Ravi 2017-09-03 13:20:25 +02:00
  • 0d4c40cfa2 Fixed missing trans tag in _footer.html M.Ravi 2017-09-03 12:44:42 +02:00
  • f041a4047d Started with VM cancellation template PCoder 2017-09-03 02:33:05 +05:30
  • 8f2655bda2 Getting vm name properly in hosting views M.Ravi 2017-09-02 21:35:57 +02:00
  • 50431542f8 Corrected getting VM name in template M.Ravi 2017-09-02 20:42:58 +02:00
  • b5120040d3 Fixed an error and from address in new vm email template PCoder 2017-09-02 22:47:31 +05:30
  • e38df305c4 New VM email template updated PCoder 2017-09-02 22:08:25 +05:30
  • 3a739f1cde Added utils django.po PCoder 2017-09-02 17:23:10 +05:30
  • 3b444b38b1 Regenerated dcl django.po PCoder 2017-09-02 16:53:49 +05:30
  • 7d12eff9be Added translations and reformatted code PCoder 2017-09-02 16:50:09 +05:30
  • 2276533185 Reformatted utils/views.py and added a condition to DCL_TEXT in passoword reset email PCoder 2017-09-02 16:36:20 +05:30
  • 1c42623964 Fixed some password reset email translation issues PCoder 2017-09-02 16:24:25 +05:30
  • f701f10e24 Added missing site_name PCoder 2017-09-02 16:07:05 +05:30
  • 22f07837e0 Added missing password_reset_url PCoder 2017-09-02 16:05:24 +05:30
  • 00e4ae5b76 Added missing new line character PCoder 2017-09-02 16:03:39 +05:30
  • b4ba882c9c Added password reset email translation PCoder 2017-09-02 16:01:39 +05:30
  • 7c70ee637a Updated password reset template PCoder 2017-09-02 15:56:17 +05:30
  • 5381e0fa67 Fixed another incorrect template PCoder 2017-09-02 14:30:10 +05:30
  • ede949004e Fixed an incorrect template name PCoder 2017-09-02 14:28:18 +05:30
  • 61988ae27b Renamed base_email to base_email_datacenterlight PCoder 2017-09-02 14:24:23 +05:30
  • cf83a67d51 Further refactored to base_email_datacenterlight.html PCoder 2017-09-02 14:17:08 +05:30
  • 75611deadd Further refactored user activation email PCoder 2017-09-02 13:32:08 +05:30
  • eb79251fc0 Added translation and refactored user activation txt email PCoder 2017-09-02 13:25:47 +05:30
  • aecdff2ab7 Made into a single text -- Your Data Center Light Team PCoder 2017-09-02 12:47:44 +05:30
  • f4726954b8 Removed Raleway font PCoder 2017-09-02 12:35:01 +05:30