Arvind Tiwari
4b752f31ab
Merge branch 'master' into task/3713/clean_up_css
2018-02-22 23:04:09 +05:30
PCoder
d9760ba203
Use /cms prefix for multisites also
2018-02-22 10:41:34 +01:00
PCoder
4035ffcfd4
Log the error also
2018-02-22 07:07:26 +01:00
PCoder
d72df9b350
Merge remote-tracking branch 'mainRepo/master' into multisite
2018-02-21 20:19:05 +01:00
Nico Schottelius
2927ca96cb
Update allowed hosts with nüglarus.ch
2018-02-21 11:28:45 +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
de4d1bc7c8
Change the multisite url prefix multi to ncms
2018-02-20 06:55:09 +01:00
PCoder
cc4f0dc32d
Cleanup unused code from urls_multi
2018-02-20 06:53:29 +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
aa63515ff5
Change url for multi domains
2018-02-17 16:54:11 +01:00
PCoder
4c5ff149f7
Some multisite parameters
2018-02-17 16:52:54 +01:00
PCoder
be3aeb45e7
Remove urls2.py
2018-02-17 11:33:48 +01:00
PCoder
bca2956e06
Rename urls1.py to urls_multi.py
2018-02-17 11:33:28 +01:00
PCoder
c1c8b38cf2
Update multisite cms urls, aliases and fallback urls
2018-02-17 11:30:36 +01:00
M.Ravi
df35fd1f35
Add urls for example1 and example2
2018-02-15 17:58:30 +01:00
M.Ravi
d7d831a831
Comment out debug_toolbar for DEBUG version
2018-02-15 17:57:54 +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
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
