Commit graph

241 commits

Author SHA1 Message Date
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
PCoder
9b10ac7deb Moved google_analytics code to templates/analytics folder. It was causing wrong footer to be loaded. 2017-07-09 19:21:30 +05:30
Siarhei Puhach
53f797472b Update base.py 2017-07-07 18:13:00 +03:00
Siarhei Puhach
1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
M.Ravi
3304d862cb Moved static images urlpattern out of DEBUG case 2017-07-05 00:07:06 +02:00
M.Ravi
4bdae326f7 Refactored the call to import local and prod files 2017-07-04 23:16:27 +02:00
M.Ravi
6d7a1d4e4a Added memcached cache 2017-07-04 21:00:00 +02:00
M.Ravi
41220ef172 Added bool_env function to retrieve env variable and convert to python boolean 2017-07-04 20:46:42 +02:00
M.Ravi
8bb7eee418 Corrected some mistakes 2017-07-04 08:48:04 +02:00
M.Ravi
f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +02:00
Andrii Marynets
5ea35bd4d8 add ids for dev and staging server 2017-07-02 23:00:56 +03:00
Andrii Marynets
9431e9846c Add middleware for fix "get_host() method fails when the host is behind multiple proxies" 2017-06-30 08:44:39 +03:00
Andrii Marynets
2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +03:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Andrii Marynets
007fc794c3 Add google analytics to data center light 2017-06-27 23:47:30 +03:00
M.Ravi
5e9330102e Added dcl email parameters to base.py 2017-06-19 12:29:22 +05:30
Henry Bravo
8acd249b4d Create Templatetag for change language whit the current path 2017-06-13 22:35:15 -05:00
Nico Schottelius
bc7f90b615 Merge branch 'master' into cleanup_201706 2017-06-05 18:41:22 +02:00