Commit graph

567 commits

Author SHA1 Message Date
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