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 |
|
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 |
|
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 |
|