Commit Graph

709 Commits

Author SHA1 Message Date
Arvind Tiwari a37c734c94 translation fix 2017-09-26 02:53:09 +05:30
Arvind Tiwari f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +05:30
PCoder 114511e924 Fixed some flake8 warnings 2017-09-25 00:34:18 +05:30
PCoder 7278a20135 Added get_or_create_vm_detail function 2017-09-25 00:02:36 +05:30
PCoder 03a565b4d0 Corrected a small de text füll->fülle 2017-09-24 04:44:20 +05:30
PCoder 39a2455817 Merged upstream master into task/3730/refactor_price_parameter 2017-09-24 04:20:41 +05:30
PCoder c6c5a20a17 Updated datacenterlight django.po 2017-09-24 03:06:05 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder 537e350c8c Redirecting users on creation of accounts to my virtual machines page 2017-09-24 00:22:18 +05:30
PCoder 8781905fc6 Removed DataCenterLight PricingView 2017-09-23 21:24:42 +05:30
PCoder b428a0933e Deleted datacenterlight pricing.html 2017-09-23 21:23:48 +05:30
PCoder 93d36306fb Removed total and price fields used in dcl flow 2017-09-23 13:21:01 +05:30
PCoder 0bc2b22f62 Reformatted datacenterlight/tasks.py 2017-09-23 13:09:14 +05:30
PCoder b17af3bb09 Merge branch 'task/3736/refactor_compute_vm_price' into task/3730/refactor_price_parameter 2017-09-23 12:48:31 +05:30
PCoder 8de4a75107 Removed some occurrences of price 2017-09-23 12:48:21 +05:30
PCoder 99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions 2017-09-23 03:18:05 +05:30
Arvind Tiwari 6983b6f72e all emails redesigned 2017-09-23 02:27:19 +05:30
Arvind Tiwari 057a2c77a6 password reset email, user activation email redesigned 2017-09-23 01:57:40 +05:30
Arvind Tiwari 29fb7224a6 new translations 2017-09-23 01:08:09 +05:30
Arvind Tiwari 6004a7ede4 new welcome email 2017-09-23 01:03:43 +05:30
M.Ravi c362dccd0f Handling payment error response by json 2017-09-22 21:30:42 +02:00
M.Ravi a48188a190 datacenterlight: Added create vm modal and responding with json 2017-09-22 21:20:00 +02:00
M.Ravi ab66d25abe Removed some commented code 2017-09-22 13:54:20 +02:00
M.Ravi 0e5a27862a Added base_url and fixed new account emails 2017-09-22 13:46:22 +02:00
M.Ravi 4c0c1ffb27 Do a user login after creation 2017-09-22 12:46:33 +02:00
M.Ravi 31f7c4a51a Simplified code 2017-09-22 12:38:05 +02:00
M.Ravi 994ffaf117 Send account details in email 2017-09-22 12:01:09 +02:00
M.Ravi f67b69d490 Formatted code and added condition to create user only if an email does not exist 2017-09-22 11:45:21 +02:00
M.Ravi e5ad57d3f1 Resolved some issues 2017-09-21 14:29:49 +02:00
PCoder e2cb70a697 first attempt at refatoring the user creating to order confirmaton page 2017-09-21 06:41:09 +05:30
Arvind Tiwari f0e50a4e94 removed commented code 2017-09-21 01:20:51 +05:30
Arvind Tiwari 0f5bf606da minor fixes 2017-09-20 23:32:48 +05:30
Arvind Tiwari 65618bb2aa merged master 2017-09-20 23:24:20 +05:30
Arvind Tiwari fc03df4652 merged master 2017-09-20 23:21:24 +05:30
Arvind Tiwari 772469a23e design modifications 2017-09-18 19:49:14 +05:30
PCoder 0cf8e237b5 Now passing user's language to celery task 2017-09-16 20:55:37 +05:30
PCoder acb739944b Added sending email to user on create vm 2017-09-16 19:30:31 +05:30
PCoder 7256160a7b Merge branch 'master' into task/3772/hosting_billing_monthly_subscription 2017-09-16 14:45:34 +05:30
Arvind Tiwari 2de0fc13b9 translation fix 2017-09-15 20:17:54 +05:30
Arvind Tiwari 556ed75262 translations 2017-09-15 20:14:32 +05:30
Arvind Tiwari 87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
M.Ravi a06753ca4b Use hostname and send celery errors to DCL_ERROR_EMAILS_TO 2017-09-15 13:09:46 +02:00
M.Ravi 2731ea8635 Fixed getting custom_user when calling create_vm for hosting 2017-09-15 11:32:20 +02:00
PCoder 0561688f84 Add ssh keys on creation of new VM 2017-09-15 12:43:48 +05:30
PCoder 805f1129e8 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-15 03:34:50 +05:30
M.Ravi 5c3cf7682f Fixed some flake8 warnings 2017-09-14 15:27:25 +02:00
Arvind Tiwari 787ff6b6d3 mixxing translation 2017-09-13 01:58:40 +05:30
Arvind Tiwari 6237469ab2 mobile order fixed 2017-09-13 01:55:58 +05:30
Arvind Tiwari 4d2903ca86 billing address save and get 2017-09-12 00:54:02 +05:30
Arvind Tiwari 5f6f2e4ca9 added more translations 2017-09-11 23:52:30 +05:30
Arvind Tiwari 5d9a20dd94 merged master and added translations 2017-09-11 23:47:35 +05:30
PCoder 38a8997e29 Refactored code 2017-09-10 15:26:29 +05:30
PCoder 56a8ad2edf Changed VM name format for create vm when user is already logged in 2017-09-10 14:52:06 +05:30
PCoder c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
PCoder d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
PCoder 085786907c Removed a comment 2017-09-09 18:20:03 +05:30
PCoder 6d826fdfd2 Added logged in user as a parameter to create VM 2017-09-09 18:19:09 +05:30
PCoder be55e2613d DE translation fix
Vielen Dank für Ihre Anfrage ->
Vielen Dank für Deine Anfrage
2017-09-09 11:49:38 +05:30
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari d4e73f4c74 Merge branch 'master' into task/3756/landing_billing_page 2017-09-09 02:13:24 +05:30
Arvind Tiwari 7a4573f7ad user logged in after signup on payment page 2017-09-09 02:10:25 +05:30
Arvind Tiwari 71e6fac997 Merge pull request #482 from tiwariav/task/3759/hosting_navbar
Task/3759 hosting navbar redesign
2017-09-09 00:28:57 +05:30
Arvind Tiwari f2a04c20f2 form submit fix 2017-09-09 00:05:13 +05:30
Arvind Tiwari 2dc9ce4d31 vm specs fixed 2017-09-08 23:53:32 +05:30
Arvind Tiwari de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
Arvind Tiwari daba6ae2fb merged master 2017-09-08 20:22:22 +05:30
Arvind Tiwari 5c543af25c code cleanup 2017-09-08 20:14:43 +05:30
Arvind Tiwari 60bc1a86b3 font weight on mobile 2017-09-08 03:52:24 +05:30
Arvind Tiwari fc170462e2 font weight on mobile 2017-09-08 03:41:25 +05:30
Arvind Tiwari 4937baa2e0 dropdown style updated 2017-09-08 02:22:03 +05:30
Arvind Tiwari 223606947a removed icon 2017-09-07 23:48:53 +05:30
Arvind Tiwari c8b0e2388d login btn special style reset 2017-09-07 23:10:05 +05:30
Arvind Tiwari ac2791a3f1 dcl navbar border dadded 2017-09-07 22:44:06 +05:30
Arvind Tiwari 3dca3a40ae Merge pull request #464 from tiwariav/task/3704/my_settings
Task/3704 my settings page
2017-09-07 22:36:09 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
Arvind Tiwari 43c6abea7e minor changes 2017-09-07 20:27:18 +05:30
Arvind Tiwari d643e6a5b1 login btn on datacenterlight pages 2017-09-07 20:24:19 +05:30
Arvind Tiwari a0451fc8ea Merge remote-tracking branch 'ungleich/master' 2017-09-07 19:59:36 +05:30
Arvind Tiwari 0ed104cd56 logged in user 2017-09-07 19:56:34 +05:30
Arvind Tiwari 114b4bea48 new translations 2017-09-07 02:52:25 +05:30
Arvind Tiwari 98e8be1da9 landing payment page layout complete 2017-09-07 02:47:57 +05:30
M.Ravi 4925146715 Using one lettered url patterns for social media links 2017-09-06 22:05:52 +02:00
M.Ravi c072d382ee Added /fb and /li routes to datacenterlight 2017-09-06 20:13:30 +02:00
Arvind Tiwari aaf3bc18d8 landing_payment all sections arranged 2017-09-06 00:12:13 +05:30
Arvind Tiwari 09b80467b9 landing payment page cleanup 2017-09-05 00:24:18 +05:30
Arvind Tiwari 046b716091 Merge branch 'master' into task/3756/landing_billing_page 2017-09-04 23:58:22 +05:30
M.Ravi a98832c6d3 Fixed datacenterlight django.po 2017-09-03 18:49:28 +02:00
M.Ravi 7a4e0760ae Updated account activation txt email template 2017-09-03 18:47:42 +02:00
PCoder 3b444b38b1 Regenerated dcl django.po 2017-09-02 16:53:49 +05:30
PCoder 5381e0fa67 Fixed another incorrect template 2017-09-02 14:30:10 +05:30
PCoder ede949004e Fixed an incorrect template name 2017-09-02 14:28:18 +05:30
PCoder 61988ae27b Renamed base_email to base_email_datacenterlight 2017-09-02 14:24:23 +05:30
PCoder cf83a67d51 Further refactored to base_email_datacenterlight.html 2017-09-02 14:17:08 +05:30
PCoder 75611deadd Further refactored user activation email 2017-09-02 13:32:20 +05:30
PCoder eb79251fc0 Added translation and refactored user activation txt email 2017-09-02 13:25:47 +05:30
PCoder aecdff2ab7 Made into a single text -- Your Data Center Light Team 2017-09-02 12:47:44 +05:30
PCoder f4726954b8 Removed Raleway font 2017-09-02 12:35:01 +05:30
PCoder 79f4b38e4c Refactored user activation email 2017-09-02 12:24:10 +05:30
PCoder 39b996ea1a Merge branch 'task/3318/mail_style_fix' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3318/mail_style_fix 2017-09-02 11:03:05 +05:30
Arvind Tiwari f0bca697b1 fix 2017-09-02 03:20:32 +05:30
Arvind Tiwari 95f4cb3753 fix 2017-09-02 03:14:02 +05:30
Arvind Tiwari b9f0a886e0 translation fixes 2017-09-02 03:09:02 +05:30
Arvind Tiwari e524281d16 Merge pull request #466 from pcoder/task/3709/faq_tos_cms_template
Task/3709/Improvements to Data Center Light CMS template
2017-09-02 02:27:46 +05:30
Arvind Tiwari 979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari cc5eaa4047 new template for datacenterlight/payment 2017-09-01 23:06:57 +05:30
Arvind Tiwari 03a96f5457 Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
Task/3678 remove lato font files
2017-09-01 22:53:52 +05:30
Arvind Tiwari ffa0abee34 contact link fix 2017-09-01 02:16:18 +05:30
Arvind Tiwari b1baf564db navbar-header clickable, contact href fixed, highlights focus color fixed 2017-09-01 02:05:24 +05:30
Arvind Tiwari fa538e7747 landing buttons fixed 2017-09-01 01:32:06 +05:30
Arvind Tiwari 5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
Arvind Tiwari 3ed2399337 merge master 2017-09-01 00:39:01 +05:30
Arvind Tiwari e94f9a5d2b dropdown style fix 2017-08-31 23:42:18 +05:30
Arvind Tiwari d1f5ead9a0 place order msg posiotion fixed for mobile 2017-08-31 21:26:39 +05:30
PCoder 51190a5546 Added page_title in the title tag and the page title text 2017-08-31 00:36:19 +05:30
PCoder a7b1819d04 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-31 00:10:02 +05:30
M.Ravi 5ffb2a2bb7 Improved the contact us email message subject & reformatted code 2017-08-30 10:04:19 +02:00
PCoder 657f64d7b9 Merged latest master into task/3757/add_new_routes_to_dcl 2017-08-30 00:32:31 +05:30
M.Ravi 12bb95f685 Fixed a mistake 2017-08-29 10:46:16 +02:00
M.Ravi 2f2dcb0814 Added datacenterlight/t, datacenterlight/g, datacenterlight/f
url routes to point to dcl's IndexView
2017-08-29 10:43:30 +02:00
PCoder 1da04a05d1 Created send_plain_email_task celery task and calling it on contact send 2017-08-27 16:42:14 +05:30
PCoder d69dbcb720 Cleaned up some comment code 2017-08-27 16:42:14 +05:30
PCoder 7c9ec6fdde Added contact us migrations after --merge with the existing migrations 2017-08-27 16:42:14 +05:30
PCoder 28bcef082c Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message 2017-08-27 16:41:39 +05:30
PCoder 6cca92ec3a Reformatted dcl's _navbar.html.
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
2017-08-27 16:37:49 +05:30
M.Ravi b044acab5d Refactored class names to better names 2017-08-27 16:37:49 +05:30
M.Ravi 597541a2ee Updated _navbar to show menu on other pages except for index and whydcl 2017-08-27 16:37:49 +05:30
M.Ravi 8caeaf0217 Added cms.css and renamed faq.html to cms_page.html 2017-08-27 16:37:48 +05:30
PCoder 189adbadfb Added cms_tags, sekizai_tags and cms_toolbar 2017-08-27 16:37:48 +05:30
PCoder cd67bb9938 Added faq.html cms template 2017-08-27 16:37:48 +05:30
PCoder 6c1307d1d3 Reverted back to original title in base.html 2017-08-26 21:01:21 +05:30
PCoder af713a0e96 cms_page.html: Added placeholder for title tag 2017-08-26 20:49:17 +05:30
PCoder 0be3266ed3 Moved cms toolbar before title tag 2017-08-26 20:46:51 +05:30
PCoder 2a76167d10 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-24 23:59:09 +05:30
M.Ravi 7153b635e5 Removed (incl. VAT) text in hosting,dcl payment template 2017-08-24 13:29:39 +02:00
M.Ravi 60df9a888c Added translation for month 2017-08-24 12:48:30 +02:00
PCoder f2b0ff04ca Added text and styles for monthly payment clarification 2017-08-24 13:41:48 +05:30
PCoder eab0c9fac1 Added price to specs as it is being used in create_vm_task 2017-08-24 12:30:17 +05:30
PCoder 16f000c723 dcl views.py: passing cc details to create_vm_task + reformatted code 2017-08-24 11:54:12 +05:30
PCoder 3111255673 Updated test_create_vm_task for monthly subscriptions 2017-08-24 11:50:43 +05:30
PCoder 0256b0bf03 Added credit card details as param for create_vm_task 2017-08-24 11:49:41 +05:30
PCoder a964f2fb5b Merged master into task/3701/enable_monthly_payments 2017-08-24 04:06:48 +05:30
PCoder 6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
M.Ravi 0846718893 Rearranged imports 2017-08-23 20:16:27 +02:00
M.Ravi 82b73df6e7 Added test case to check whether celery task executes properly on production. 2017-08-23 20:12:50 +02:00
PCoder 487ab6b927 Changed the subscription plan id field size to 256 characters 2017-08-22 01:55:45 +05:30
PCoder 83df42b5df Fixed checking active status of subscription + redirection to payment page on error 2017-08-22 00:07:58 +05:30
Arvind Tiwari a0d5b4d04f removed Lato font files from web server, and its usage from css files 2017-08-21 23:35:17 +05:30
PCoder 6c80f94f67 Reformatted dcl's _navbar.html.
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
2017-08-21 23:16:55 +05:30
M.Ravi 6339442bfe Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-21 18:01:28 +02:00
M.Ravi 696af58bff Refactored class names to better names 2017-08-21 18:00:41 +02:00
M.Ravi c8dcd65adc Updated _navbar to show menu on other pages except for index and whydcl 2017-08-21 17:52:57 +02:00
M.Ravi 090f338878 Added cms.css and renamed faq.html to cms_page.html 2017-08-21 17:51:38 +02:00
PCoder 506b5a904a Added missing code from the merge 2017-08-21 01:54:55 +05:30
PCoder 7def893028 Merged origin/master into task/3701/enable_monthly_payments 2017-08-21 00:27:44 +05:30
PCoder ddbaf902af Removed __future__ datacenterlight/tasks 2017-08-20 20:23:59 +05:30
Arvind Tiwari 65ac2df002 dropdown style changed to match landing page style 2017-08-20 01:46:26 +05:30
PCoder 69f5aea560 Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow 2017-08-20 01:39:12 +05:30
PCoder bc43d9225a Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-20 01:37:54 +05:30
PCoder 9a0592ec4b Merge branch 'master' into task/3701/enable_monthly_payments 2017-08-20 01:36:45 +05:30
Arvind Tiwari 6764e1ccee Merge pull request #441 from tiwariav/task/3565/warning-color
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
2017-08-20 00:29:21 +05:30
PCoder 2b71795431 Added missing oneadmin's ssh key statement 2017-08-19 18:02:55 +05:30
PCoder 687cf96287 Added cms_tags, sekizai_tags and cms_toolbar 2017-08-19 06:39:56 +05:30
PCoder 17fbaa59be Added faq.html cms template 2017-08-19 06:37:40 +05:30
PCoder 339a6283cd Removed unused imports 2017-08-19 03:32:30 +05:30
PCoder 6b7ae88f74 Merged master into task/3622/decouple_opennebula_dcl_flow 2017-08-19 03:24:22 +05:30
PCoder fc70c30f21 Merged master into task/3701/enable_monthly_payments 2017-08-18 00:40:57 +05:30
Pcoder a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
M.Ravi fcaa5e31dd Added condition that the status should be 'active' for new subscription 2017-08-17 18:31:27 +02:00
M.Ravi 171a463261 Updated dcl views.py to create subscriptions instead of one time charge 2017-08-17 18:24:10 +02:00
PCoder 1a2b0e4e29 Added datacenterlight/migrations/0007_stripeplan.py migration file 2017-08-17 04:26:04 +05:30
PCoder fc1ddbdd3b Added StripePlan model 2017-08-17 04:22:23 +05:30
PCoder 73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
ARvind Tiwari 7cf46ad8b8 override bootstrap default danger color #a94442 -> #eb4d5c 2017-08-09 00:21:25 +05:30
ARvind Tiwari 451f2a141e file reformated 2017-08-08 22:46:00 +05:30
ARvind Tiwari 6c4e0067ba font-family changed to 'Lato' in all css files 2017-08-08 00:35:58 +05:30
ARvind Tiwari 5cea467deb master merged 2017-08-07 22:23:51 +05:30
Siarhei Puhach 72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00
Siarhei Puhach 4cd3d6a4aa Added stripe make_charge error handler 2017-08-07 13:36:21 +03:00
M.Ravi 29b28d551c Fixed flake8 lint warnings 2017-08-06 22:19:27 +02:00
M.Ravi 58bb754814 Introduced MaxRetries and MaxRetriesExceededError handling code 2017-08-06 21:54:12 +02:00
M.Ravi e7864f5d85 Added condition to check if create_vm succeeded 2017-08-06 18:52:28 +02:00
M.Ravi f950c1defb Added datacenterlight/tasks.py 2017-08-06 18:42:27 +02:00
M.Ravi bd2edf599a Merged views from master 2017-08-06 15:08:05 +02:00
M.Ravi 3ad5928aa0 A working version of celery create_vm_task added 2017-08-06 14:33:55 +02:00
Pcoder 90f01c277b Merge pull request #436 from tiwariav/task/3660/webringfuture
task #3660 whydatacenterlight 'we bring future' section
2017-08-04 21:02:53 +02:00
Pcoder 5f71b19fb1 Merge pull request #429 from amarynets/bugfix/add_vmtemplate_mig_file
Add file with VMTemplate hosting migrations
2017-08-04 19:44:34 +02:00
ARvind Tiwari d93942fa0b heading sizes changed 2017-08-04 18:32:34 +05:30
ARvind Tiwari 6cef45beee lead line break and alignment fixed 2017-08-04 17:20:53 +05:30
Siarhei Puhach 657e97fc6d Merge branch 'master' into feature/task3637 2017-08-04 11:05:37 +03:00
Siarhei Puhach 29fb771afb Changed payment error place, changed message source to Stripe errors handler 2017-08-04 11:01:32 +03:00
PCoder 94bc552f75 Resolved conflicts 2017-08-04 03:25:47 +05:30
Pcoder 3d051aee14 Merge pull request #428 from tiwariav/task/3620/ssh_keys
task/3620 ssh_keys_choice page new design
2017-08-03 22:53:12 +02:00
ARvind Tiwari 9d37e3f58c views fix 2017-08-04 00:58:54 +05:30
ARvind Tiwari 8edbd29fad navbar made white, dropdown fix 2017-08-03 23:18:58 +05:30
ARvind Tiwari 0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
Siarhei Puhach 34acf2310b Added stripe failed payment error handler 2017-08-03 12:47:34 +03:00
ARvind Tiwari 3081786f0b merged master, conflict resolved 2017-08-03 03:27:46 +05:30
ARvind Tiwari fda20eacd6 translation fix and font-weight bold 2017-08-03 03:12:40 +05:30