Commit Graph

142 Commits

Author SHA1 Message Date
Arvind Tiwari fc659cab9f number localization format for de set same as en 2018-03-07 19:22:13 +05:30
Arvind Tiwari 4b752f31ab Merge branch 'master' into task/3713/clean_up_css 2018-02-22 23:04:09 +05:30
PCoder 4035ffcfd4 Log the error also 2018-02-22 07:07:26 +01:00
PCoder 575835aa05 Load multisite urls using json 2018-02-20 08:48:19 +01:00
PCoder 05e49b04bb Revert back aldryn_newsblog app 2018-02-20 07:05:56 +01:00
PCoder c1d98603e6 Obtain value for MULTISITE_CMS_URLS from env 2018-02-20 06:25:02 +01:00
PCoder d5a0224476 Set FILER_ENABLE_PERMISSIONS to True 2018-02-17 17:01:07 +01:00
PCoder 4c5ff149f7 Some multisite parameters 2018-02-17 16:52:54 +01:00
PCoder c1c8b38cf2 Update multisite cms urls, aliases and fallback urls 2018-02-17 11:30:36 +01:00
M.Ravi bea1f40b1b Add multisite dependent apps and corresponding settings 2018-02-15 17:37:51 +01:00
M.Ravi cb5dd8a592 REmove aldryn_newsblog for the moment 2018-02-15 11:58:44 +01:00
M.Ravi a30e8a6adf Configure multisite SITE_ID 2018-02-15 10:58:06 +01:00
M.Ravi 6a9232851a Set CMS_PERMISSION True for per page access control 2018-02-13 02:40:29 +01:00
M.Ravi 7f5866b777 Move djangocms_admin_style above django.contrib.auth in the
INSTALLED_APPS
2018-02-13 02:39:07 +01:00
Arvind Tiwari b9c53717e3 Merge branch 'master' into task/3713/clean_up_css 2018-02-08 17:11:41 +05:30
PCoder dd9b0d8fd9 Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX 2018-01-08 19:50:42 +01:00
Arvind Tiwari 0697492ab8 removed unused css files 2018-01-08 07:36:30 +05:30
PCoder ace2abc47e Obtain email host, port and tls settings from env 2017-12-31 00:58:37 +01:00
PCoder 77209921f9 Some more refactoring 2017-12-01 21:03:59 +01:00
PCoder b6e734d84e Refactor code 2017-11-29 07:32:17 +01:00
PCoder 6e82add935 Rename debug.log to django-debug.log and refactor MODULES_TO_LOG_LEVEL 2017-11-29 07:07:03 +01:00
M.Ravi 137b45c12c Enable logging custom modules 2017-11-29 06:45:09 +01:00
M.Ravi 4367b9e58a Add ungleich cms page template 2017-11-17 16:32:40 +01:00
M.Ravi 38330d562c Remove unused cms config from base.py 2017-10-18 23:29:57 +02:00
M.Ravi e563ae642f Merge branch 'master' into feature/glasfaser_cms_template 2017-10-18 18:24:53 +02:00
M.Ravi f6468a7c8c First attempt to services section
- base.py: add settings to load GlasfaserServicesPlugin by default
    - glasfaser_cms_page.html: create a placeholder for services
    - cms_plugins.py: add the plugin code
    - models.py: add UngelichTextSectionWithImage model
2017-10-18 09:10:50 +02:00
M.Ravi b6f1309735 Add glasfaser_cms_page.html 2017-10-17 09:06:45 +02:00
M.Ravi 24cce4eed7 - Remove registration link from DG registration email
- Remove multiple declared settings
2017-10-16 20:53:51 +02:00
M.Ravi 3a33dd2035 Add CSRF_FAILURE_VIEW 2017-10-01 20:14:46 +02:00
M.Ravi e6514f8061 Refactored DCL_ERROR_EMAILS_TO_ADDRESS to DCL_ERROR_EMAILS_TO 2017-09-15 13:10:11 +02:00
M.Ravi a06753ca4b Use hostname and send celery errors to DCL_ERROR_EMAILS_TO 2017-09-15 13:09:46 +02:00
M.Ravi a4fe2e2db9 Updated SaveSSHKeyTestCase to include add/remove ssh keys 2017-09-14 15:05:28 +02:00
PCoder a32bb9b774 We use the default timezone available to celery 2017-09-05 02:26:00 +05:30
PCoder 2a76167d10 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-24 23:59:09 +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 4d18dc6f7c Corrected/added missing google analytics and reformated code 2017-08-24 01:20:32 +05:30
M.Ravi 4cc2e09b0a Rearranged imports in base.py 2017-08-23 20:18:46 +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
M.Ravi 6339442bfe Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-21 18:01:28 +02:00
M.Ravi 7d7260ce6d Renamed faq.html to cms_page.html 2017-08-21 17:59:56 +02:00
PCoder f28f55c775 faq.html now referred as DCL.Faq 2017-08-19 06:41:29 +05:30
PCoder 6b7ae88f74 Merged master into task/3622/decouple_opennebula_dcl_flow 2017-08-19 03:24:22 +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
PCoder 8029f05824 Added env variable to logger message 2017-08-08 02:12:13 +05:30
M.Ravi 26b4feb1d1 Introduced int_env and CELERY_MAX_RETRIES env variable 2017-08-06 18:39:45 +02:00
M.Ravi 5a5654be01 Moved CELERY_BROKER_URL and CELERY_RESULT_BACKEND to .env file 2017-08-06 16:51:07 +02:00
M.Ravi 68505e73a8 Added django-celery-results and setup redis as backend for celery tasks 2017-08-06 16:32:35 +02:00
PCoder d8592fc6d8 Added celery files 2017-08-06 12:30:56 +05:30
ARvind Tiwari a2f705f012 Merge branch 'master' into feature/3517/ssh_keys 2017-07-31 18:50:07 +05:30
Pcoder d565294119 Update base.py
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +05:30