be72b9628c
Add djangocms_blog namespace and urls
2018-04-10 13:21:58 +02:00
24a9b8ab78
Redirect multi-tenant urls to /cms also
2018-04-07 00:13:24 +02:00
1aa8319feb
Change order of ungleich_page namespace
2018-04-04 01:05:05 +02:00
035f5c39ae
Format code
2018-04-04 00:35:25 +02:00
ae4a83bdb8
Remove name for cms.urls
2018-04-04 00:35:12 +02:00
9b45b758c4
Add ungleich_page urlconf namespace again
2018-04-04 00:34:29 +02:00
0ec29be4ec
Use /cms for redirection instead of incorrect namespaces
2018-04-03 23:28:47 +02:00
e0df641dbd
Merge master into task/4362/fix_need_of_cms_dummy_page
2018-04-03 22:50:00 +02:00
41d073da3b
Remove conflicting cms/ urlconf
2018-04-01 08:14:50 +02:00
d52c061709
use humanize to add comma to numbers
2018-03-27 19:38:09 +05:30
c9ee9f6ec3
merge master
2018-03-21 01:09:47 +05:30
d3faf94b4e
Add analytics codes for devuanhosting.com, ipv6onlyhosting.{com,net}
2018-03-14 21:51:43 +01:00
44e913a744
Remove datacentelright_content placeholder conf
2018-03-11 21:24:24 +01:00
dafaa13fbc
Add devuanhosting.com to ALLOWED_HOSTS
2018-03-09 22:39:45 +01:00
fc659cab9f
number localization format for de set same as en
2018-03-07 19:22:13 +05:30
819848c90c
why dcl plugin and id for each section
2018-03-02 02:05:42 +05:30
3cd89e244e
minor style fixes
2018-02-28 04:22:48 +05:30
d85e1c671b
All major DCL plugins added
2018-02-28 04:09:19 +05:30
4b752f31ab
Merge branch 'master' into task/3713/clean_up_css
2018-02-22 23:04:09 +05:30
d9760ba203
Use /cms prefix for multisites also
2018-02-22 10:41:34 +01:00
4035ffcfd4
Log the error also
2018-02-22 07:07:26 +01:00
d72df9b350
Merge remote-tracking branch 'mainRepo/master' into multisite
2018-02-21 20:19:05 +01:00
2927ca96cb
Update allowed hosts with nüglarus.ch
2018-02-21 11:28:45 +01:00
575835aa05
Load multisite urls using json
2018-02-20 08:48:19 +01:00
05e49b04bb
Revert back aldryn_newsblog app
2018-02-20 07:05:56 +01:00
de4d1bc7c8
Change the multisite url prefix multi to ncms
2018-02-20 06:55:09 +01:00
cc4f0dc32d
Cleanup unused code from urls_multi
2018-02-20 06:53:29 +01:00
c1d98603e6
Obtain value for MULTISITE_CMS_URLS from env
2018-02-20 06:25:02 +01:00
d5a0224476
Set FILER_ENABLE_PERMISSIONS to True
2018-02-17 17:01:07 +01:00
aa63515ff5
Change url for multi domains
2018-02-17 16:54:11 +01:00
4c5ff149f7
Some multisite parameters
2018-02-17 16:52:54 +01:00
be3aeb45e7
Remove urls2.py
2018-02-17 11:33:48 +01:00
bca2956e06
Rename urls1.py to urls_multi.py
2018-02-17 11:33:28 +01:00
c1c8b38cf2
Update multisite cms urls, aliases and fallback urls
2018-02-17 11:30:36 +01:00
df35fd1f35
Add urls for example1 and example2
2018-02-15 17:58:30 +01:00
d7d831a831
Comment out debug_toolbar for DEBUG version
2018-02-15 17:57:54 +01:00
bea1f40b1b
Add multisite dependent apps and corresponding settings
2018-02-15 17:37:51 +01:00
cb5dd8a592
REmove aldryn_newsblog for the moment
2018-02-15 11:58:44 +01:00
a30e8a6adf
Configure multisite SITE_ID
2018-02-15 10:58:06 +01:00
6a9232851a
Set CMS_PERMISSION True for per page access control
2018-02-13 02:40:29 +01:00
7f5866b777
Move djangocms_admin_style above django.contrib.auth in the
...
INSTALLED_APPS
2018-02-13 02:39:07 +01:00
b9c53717e3
Merge branch 'master' into task/3713/clean_up_css
2018-02-08 17:11:41 +05:30
dd9b0d8fd9
Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX
2018-01-08 19:50:42 +01:00
0697492ab8
removed unused css files
2018-01-08 07:36:30 +05:30
ace2abc47e
Obtain email host, port and tls settings from env
2017-12-31 00:58:37 +01:00
77209921f9
Some more refactoring
2017-12-01 21:03:59 +01:00
b6e734d84e
Refactor code
2017-11-29 07:32:17 +01:00
6e82add935
Rename debug.log to django-debug.log and refactor MODULES_TO_LOG_LEVEL
2017-11-29 07:07:03 +01:00
137b45c12c
Enable logging custom modules
2017-11-29 06:45:09 +01:00
4367b9e58a
Add ungleich cms page template
2017-11-17 16:32:40 +01:00
3d192ed59f
Replace alplora.ch with .hack4glarus.ch
2017-10-21 08:33:37 +02:00
38330d562c
Remove unused cms config from base.py
2017-10-18 23:29:57 +02:00
e563ae642f
Merge branch 'master' into feature/glasfaser_cms_template
2017-10-18 18:24:53 +02:00
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
b6f1309735
Add glasfaser_cms_page.html
2017-10-17 09:06:45 +02:00
24cce4eed7
- Remove registration link from DG registration email
...
- Remove multiple declared settings
2017-10-16 20:53:51 +02:00
8678f7f8ea
Remove unused import
2017-10-12 00:32:47 +02:00
695a8687fd
first iteration
2017-10-10 00:04:19 +05:30
3a33dd2035
Add CSRF_FAILURE_VIEW
2017-10-01 20:14:46 +02:00
faa26a05dd
Reverted back some lines for preserving format
2017-09-22 08:51:35 +02:00
2b0dbfa1e5
Added /cms prefix to django-cms urls
2017-09-22 08:47:42 +02:00
28661c0c48
Replaced all occurrences of digitalglarus.ungliech.ch with digitalglarus.ch
2017-09-18 11:57:41 +05:30
e6514f8061
Refactored DCL_ERROR_EMAILS_TO_ADDRESS to DCL_ERROR_EMAILS_TO
2017-09-15 13:10:11 +02:00
a06753ca4b
Use hostname and send celery errors to DCL_ERROR_EMAILS_TO
2017-09-15 13:09:46 +02:00
a4fe2e2db9
Updated SaveSSHKeyTestCase to include add/remove ssh keys
2017-09-14 15:05:28 +02:00
f9abdfe1bc
Merged upstream master into task/3731/cdist_ssh_key_handler
2017-09-09 13:44:46 +05:30
db891aaa1e
hosting navbar changed and consistent with dcl navbar
2017-09-07 21:01:17 +05:30
a32bb9b774
We use the default timezone available to celery
2017-09-05 02:26:00 +05:30
2a76167d10
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-24 23:59:09 +05:30
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
4d18dc6f7c
Corrected/added missing google analytics and reformated code
2017-08-24 01:20:32 +05:30
4cc2e09b0a
Rearranged imports in base.py
2017-08-23 20:18:46 +02:00
82b73df6e7
Added test case to check whether celery task executes properly on production.
2017-08-23 20:12:50 +02:00
6339442bfe
Merge branch 'master' into task/3709/faq_tos_cms_template
2017-08-21 18:01:28 +02:00
7d7260ce6d
Renamed faq.html to cms_page.html
2017-08-21 17:59:56 +02:00
f28f55c775
faq.html now referred as DCL.Faq
2017-08-19 06:41:29 +05:30
6b7ae88f74
Merged master into task/3622/decouple_opennebula_dcl_flow
2017-08-19 03:24:22 +05:30
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
8029f05824
Added env variable to logger message
2017-08-08 02:12:13 +05:30
227d3a20a5
Removed __future__
2017-08-08 01:57:29 +05:30
29b28d551c
Fixed flake8 lint warnings
2017-08-06 22:19:27 +02:00
26b4feb1d1
Introduced int_env and CELERY_MAX_RETRIES env variable
2017-08-06 18:39:45 +02:00
5a5654be01
Moved CELERY_BROKER_URL and CELERY_RESULT_BACKEND to .env file
2017-08-06 16:51:07 +02:00
68505e73a8
Added django-celery-results and setup redis as backend for celery tasks
2017-08-06 16:32:35 +02:00
477c8e81a4
Added default celery.py code
2017-08-06 15:10:26 +02:00
d6d0b9c8c0
Added default init code for celery
2017-08-06 15:08:46 +02:00
d8592fc6d8
Added celery files
2017-08-06 12:30:56 +05:30
0993d8c106
reviewed changes
2017-08-03 22:00:41 +05:30
a2f705f012
Merge branch 'master' into feature/3517/ssh_keys
2017-07-31 18:50:07 +05:30
8a9f130832
Merge pull request #421 from pcoder/feature/enable_logging
...
Introduced ENABLE_DEBUG_LOGGING
2017-07-28 22:45:25 +02:00
d565294119
Update base.py
...
Renamed `ENABLE_LOGGING` to `ENABLE_DEBUG_LOGGING`
2017-07-29 02:02:40 +05:30
308851285e
Removed patterns import
2017-07-29 01:48:56 +05:30
925252f1c9
merged master
2017-07-28 16:45:34 +05:30
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
ea97a6bf83
Fix url for datecenterlight. Need to add /
2017-07-19 22:28:11 +03:00
3fc1cd9463
Fix url which will be deprecated in Django 1.10
2017-07-19 00:39:52 +03:00
ddd0594976
Fix url warning in dynamicweb
2017-07-18 23:18:23 +03:00
c7feed6a73
Delete commented code
2017-07-13 23:50:11 +03:00
a8be59d7a2
Add GA to all important apps
2017-07-13 22:53:15 +03:00
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
M.Ravi
PCoder
Arvind Tiwari
Nico Schottelius
Andrii Marynets