Commit graph

2357 commits

Author SHA1 Message Date
PCoder
a7b1819d04 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-31 00:10:02 +05:30
Arvind Tiwari
e91ea758e3 Merge pull request #461 from tiwariav/task/3717/input_border_warning
Task/3717/ changed border color for error input
2017-08-30 17:11:12 +05:30
Arvind Tiwari
9fff4ca544 Merge pull request #459 from tiwariav/task/3703/hosting_dashboard
Task/3703 new hosting dashboard
2017-08-30 16:42:28 +05:30
Arvind Tiwari
e4b5ed5e4b hover color fix 2017-08-30 16:14:02 +05:30
Arvind Tiwari
03ab40eed5 proportions fixed for dashboard box 2017-08-30 16:05:35 +05:30
M.Ravi
adb75b488c Merged dynamicwebs master into task/3731/cdist_ssh_key_handler 2017-08-30 12:10:44 +02:00
M.Ravi
51b1ee2013 Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
2017-08-30 12:02:53 +02:00
Pcoder
96c2d2ec65 Merge pull request #469 from pcoder/task/3740/contact_send_message
Task/3740/Improved the contact us email message subject & reformatted code
2017-08-30 10:18:56 +02:00
M.Ravi
5ffb2a2bb7 Improved the contact us email message subject & reformatted code 2017-08-30 10:04:19 +02:00
M.Ravi
a4a2b2a803 Refactored and commented utils/tasks 2017-08-30 09:44:33 +02:00
M.Ravi
666cf187ea Refactored and added comments 2017-08-30 09:43:54 +02:00
M.Ravi
92e47b6f90 Added manage_public_key when deleting a key (However, this does not seem to work in cdist) 2017-08-30 09:42:56 +02:00
PCoder
3e88b3bd53 Updated Changelog for 1.1.1 2017-08-30 01:51:59 +05:30
Pcoder
7df5d0514f Merge pull request #468 from pcoder/task/3757/add_new_routes_to_dcl
Task/3757/add new routes to dcl
2017-08-29 21:08:56 +02:00
PCoder
657f64d7b9 Merged latest master into task/3757/add_new_routes_to_dcl 2017-08-30 00:32:31 +05:30
Pcoder
989420d71f Merge pull request #467 from pcoder/task/3740/contact_send_message
Task/3657 contact section new design
Task/3740/contact section send email message
2017-08-29 20:29:59 +02:00
M.Ravi
96be1245dc utils/tasks: Refactored code 2017-08-29 18:15:23 +02:00
M.Ravi
d25bca0860 Added save_public_key and reformatted code 2017-08-29 18:02:56 +02:00
M.Ravi
34580b6514 Refactored saving public key functionality to opennebula_api.models.save_public_key. Also, now creating hosting VMs loaded by default with ONEADMIN_USER_SSH_PUBLIC_KEY 2017-08-29 17:53:25 +02:00
Arvind Tiwari
919ad6e869 email added to contact button 2017-08-29 18:01:00 +05:30
Arvind Tiwari
591c51bb46 translation fix 2017-08-29 17:57:11 +05:30
Arvind Tiwari
42a4c319a3 Merge branch 'master' into task/3703/hosting_dashboard 2017-08-29 17:52:06 +05:30
Arvind Tiwari
e032fb744c svg images fixed 2017-08-29 14:24:27 +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
12255364b2 Attempted to get hosts for adding ssh keys (to be tested) 2017-08-29 13:31:05 +05:30
M.Ravi
21f51692c4 Improved save_ssh_key celery task 2017-08-28 11:40:59 +02:00
M.Ravi
2b541da94b Added SaveSSHKeyTestCase 2017-08-28 11:39:46 +02:00
PCoder
568f38dd67 Added utils/tasks.py 2017-08-28 12:25:39 +05:30
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
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
464b48000d Added cdist requirement 2017-08-27 12:52:30 +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