PCoder
dca11c1b26
Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies
...
Use local resources instead
2019-05-05 20:23:02 +02:00
PCoder
3bf4f4dca7
Merge branch 'master' into feature/monthly-invoices
2019-04-13 12:13:38 +02:00
PCoder
f50af4f2aa
Improve log formatting
2019-04-13 12:04:18 +02:00
PCoder
f50e5dcaa4
Add ADMIN_EMAIL setting
2019-04-04 06:49:46 +02:00
PCoder
16b5f1e5a4
Merge branch 'master' into 5151/gdpr_modal
2019-01-30 21:05:34 +01:00
PCoder
d80b6cf490
Introduce UNGLEICH_BLOG_SITE_ID
...
- It should be initialized with the SITE_ID of the site that
hosts the blog
- Without this, django_parler is unhappy to show EN/DE options
when creating blog articles
See redmine issue #4465
2019-01-07 22:30:55 +01:00
PCoder
e230f2ac8c
Merge master into 5151/gdpr_modal
2018-08-22 23:25:11 +02:00
PCoder
48936ace51
Revert back commenting out unwanted templates
...
Todo in another pull request
2018-08-07 21:59:50 +02:00
PCoder
0ddbdb045f
Remove unused CMS templates
2018-08-07 21:48:25 +02:00
PCoder
93d489334f
Load cms_templates later
...
These templates are/were used in digitalglarus and hence are
obsolete now. Later can be removed after testing.
2018-08-07 21:44:57 +02:00
PCoder
44fb184436
Add templates/gdpr to the template path
2018-07-21 10:49:58 +02:00
PCoder
1291b49ec3
Reformat base.py
2018-07-18 21:49:11 +02:00
PCoder
4a19bd1971
Set X_FRAME_OPTIONS from env
2018-07-18 21:48:39 +02:00
PCoder
dcbb0c2d64
Add google analytics code for comic.ungleich.ch
2018-06-19 08:49:21 +02:00
Arvind Tiwari
7a72cc02ab
translations
2018-05-07 05:22:05 +05:30
Arvind Tiwari
3bf064a017
add calculator placeholder to cms_integration
2018-04-25 14:52:25 +05:30
Arvind Tiwari
2536f94058
django parler config fix
2018-04-13 17:44:00 +05:30
Arvind Tiwari
d52c061709
use humanize to add comma to numbers
2018-03-27 19:38:09 +05:30
Arvind Tiwari
c9ee9f6ec3
merge master
2018-03-21 01:09:47 +05:30
PCoder
d3faf94b4e
Add analytics codes for devuanhosting.com, ipv6onlyhosting.{com,net}
2018-03-14 21:51:43 +01:00
PCoder
44e913a744
Remove datacentelright_content placeholder conf
2018-03-11 21:24:24 +01:00
Arvind Tiwari
fc659cab9f
number localization format for de set same as en
2018-03-07 19:22:13 +05:30
Arvind Tiwari
819848c90c
why dcl plugin and id for each section
2018-03-02 02:05:42 +05:30
Arvind Tiwari
3cd89e244e
minor style fixes
2018-02-28 04:22:48 +05:30
Arvind Tiwari
d85e1c671b
All major DCL plugins added
2018-02-28 04:09:19 +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