Commit Graph

260 Commits

Author SHA1 Message Date
M.Ravi 4367b9e58a Add ungleich cms page template 2017-11-17 16:32:40 +01:00
Nico Schottelius 3d192ed59f Replace alplora.ch with .hack4glarus.ch 2017-10-21 08:33:37 +02: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 8678f7f8ea Remove unused import 2017-10-12 00:32:47 +02:00
Arvind Tiwari 695a8687fd first iteration 2017-10-10 00:04:19 +05:30
M.Ravi 3a33dd2035 Add CSRF_FAILURE_VIEW 2017-10-01 20:14:46 +02:00
M.Ravi faa26a05dd Reverted back some lines for preserving format 2017-09-22 08:51:35 +02:00
M.Ravi 2b0dbfa1e5 Added /cms prefix to django-cms urls 2017-09-22 08:47:42 +02:00
PCoder 28661c0c48 Replaced all occurrences of digitalglarus.ungliech.ch with digitalglarus.ch 2017-09-18 11:57:41 +05:30
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 f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 13:44:46 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
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
PCoder 227d3a20a5 Removed __future__ 2017-08-08 01:57:29 +05:30
M.Ravi 29b28d551c Fixed flake8 lint warnings 2017-08-06 22:19:27 +02:00
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
M.Ravi 477c8e81a4 Added default celery.py code 2017-08-06 15:10:26 +02:00
M.Ravi d6d0b9c8c0 Added default init code for celery 2017-08-06 15:08:46 +02:00
PCoder d8592fc6d8 Added celery files 2017-08-06 12:30:56 +05:30
ARvind Tiwari 0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
ARvind Tiwari a2f705f012 Merge branch 'master' into feature/3517/ssh_keys 2017-07-31 18:50:07 +05:30
Pcoder 8a9f130832 Merge pull request #421 from pcoder/feature/enable_logging
Introduced ENABLE_DEBUG_LOGGING
2017-07-28 22:45:25 +02:00
Pcoder d565294119 Update base.py
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +05:30
Pcoder 308851285e Removed patterns import 2017-07-29 01:48:56 +05:30
ARvind Tiwari 925252f1c9 merged master 2017-07-28 16:45:34 +05:30
M.Ravi e8e7be7618 Updated base.py to check if ENABLE_LOGGING is True and in that case enable the logger to write DEBUG level logs to a file debug.log in project's root directory 2017-07-28 12:05:14 +02:00
Andrii Marynets ea97a6bf83 Fix url for datecenterlight. Need to add / 2017-07-19 22:28:11 +03:00
Andrii Marynets 3fc1cd9463 Fix url which will be deprecated in Django 1.10 2017-07-19 00:39:52 +03:00
Andrii Marynets ddd0594976 Fix url warning in dynamicweb 2017-07-18 23:18:23 +03:00
Andrii Marynets c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00