Commit graph

2325 commits

Author SHA1 Message Date
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
929d790517 Renamed faq.html to cms_page.html 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
8ab52c3398 faq.html now referred as DCL.Faq 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
67880d5d60 Added configuration for datacenterlight_cms_page_title_tag 2017-08-26 20:52:47 +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
0ee0d96e0f Added default text plugin for the cms page title 2017-08-26 02:56:05 +05:30
Pcoder
60cb27c728 Merge pull request #455 from pcoder/task/3709/faq_tos_cms_template
Task/3709/faq tos cms template
2017-08-25 22:17:52 +02:00
PCoder
2ed07e25ff Corrected translation for 'You are not making payment ...' 2017-08-25 09:49:55 +05:30
PCoder
2a76167d10 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-24 23:59:09 +05:30
Arvind Tiwari
9be42f3fd4 links added to the boxes 2017-08-24 20:36:00 +05:30
Arvind Tiwari
23bf602a16 merged master, fixed translation 2017-08-24 20:16:26 +05:30
Arvind Tiwari
cfb1a303a1 new icons 2017-08-24 19:56:30 +05:30
M.Ravi
bf304f9493 Fixed obtaining ga code from dict 2017-08-24 16:10:53 +02:00
M.Ravi
01b64fec88 Attempt to fix no ga code in www. sites 2017-08-24 16:04:37 +02:00
M.Ravi
63635f158e Updated requirements.txt 2017-08-24 15:39:10 +02:00
M.Ravi
eebbbcfa6d Updated Changelog for 1.1 2017-08-24 14:27:52 +02:00
Pcoder
6206f25b56 Merge pull request #452 from pcoder/task/3701/enable_monthly_payments
Task/3701/enable monthly payments
2017-08-24 13:42:42 +02:00
M.Ravi
c9357058f7 Added STRIPE_API_PRIVATE_KEY_TEST to the test case 2017-08-24 13:38:10 +02:00
M.Ravi
7153b635e5 Removed (incl. VAT) text in hosting,dcl payment template 2017-08-24 13:29:39 +02:00
M.Ravi
5e26d6df04 Simplified text -> You are not making payment + translation 2017-08-24 13:18:59 +02:00
M.Ravi
f32494af2f hosting po file: Removed fuzzy for a text 2017-08-24 13:05:26 +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
ebff2cbd94 hosting/payment.html: Added /month text and adjusted width 2017-08-24 12:55:22 +05:30
PCoder
2ae88ae287 Added style for /month text 2017-08-24 12:54:12 +05:30
PCoder
75da4a7711 hosting/models.py: Fixed bug extracting cc info from dict 2017-08-24 12:51:55 +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
7c3a0b86d8 HostingOrder: Updated set_subscription_id to include cc details as parameter 2017-08-24 11:59:38 +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
b5e488e326 Formatted utils/stripe_utils.py 2017-08-24 10:31:57 +05:30
PCoder
a964f2fb5b Merged master into task/3701/enable_monthly_payments 2017-08-24 04:06:48 +05:30
Pcoder
0026874f09 Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages
Corrected/added missing google analytics and reformated code
2017-08-24 00:00:22 +02:00
PCoder
703644ced4 Removed orphaned alt tag 2017-08-24 03:17:39 +05:30
Pcoder
a77b7b0ab5 Merge pull request #460 from pcoder/add_test_create_vm_celery_task
Added test for create vm celery task
2017-08-23 23:24:49 +02:00
PCoder
6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
PCoder
4d18dc6f7c Corrected/added missing google analytics and reformated code 2017-08-24 01:20:32 +05:30
Arvind Tiwari
738e4fc93f removed duplicate for "See Invoice" 2017-08-24 01:07:20 +05:30
Arvind Tiwari
c0ce522dbe Merge pull request #457 from tiwariav/task/3698/my_orders_page
task/3698 my orders page redesigned
2017-08-24 01:02:24 +05:30
Arvind Tiwari
30551e5ac5 merged master 2017-08-24 00:59:17 +05:30