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
1feacc1770
Merge branch 'master' into 5151/gdpr_modal
2018-10-25 22:05:24 +02:00
PCoder
a4065c7e24
Handle product_slug
2018-10-03 07:55:56 +02:00
PCoder
e3bd963600
Test product_slug url (wip)
2018-10-02 10:02:44 +02: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
a51064448a
Merge pull request #644 from pcoder/remove_unused_comic_url
...
Remove unused ^comic/$ url
2018-07-18 22:03:49 +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
13e33cbb7a
Remove unused import
2018-07-16 20:44:09 +02:00
PCoder
15e435d220
Remove unused ^comic/$ url
2018-07-14 20:05:18 +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
1a692bc88f
merge master
2018-04-21 22:39:44 +05:30
M.Ravi
8b5b353e59
Reformat code and give proper name to comic urlconf
2018-04-17 17:15:55 +02:00
M.Ravi
80a568b2b3
Remove unwanted /comic/... urlconf
2018-04-17 17:14:39 +02:00
M.Ravi
ff1d4f1a6f
Rename tags to category, because thats how we filter posts by
2018-04-17 16:15:49 +02:00
PCoder
b218ee1662
Add urlconfs for comic
2018-04-17 11:47:56 +02:00
Arvind Tiwari
2536f94058
django parler config fix
2018-04-13 17:44:00 +05:30
Arvind Tiwari
5679289329
replaced cms_menu with static menu
2018-04-12 22:24:50 +05:30
M.Ravi
be72b9628c
Add djangocms_blog namespace and urls
2018-04-10 13:21:58 +02:00
PCoder
24a9b8ab78
Redirect multi-tenant urls to /cms also
2018-04-07 00:13:24 +02:00
PCoder
1aa8319feb
Change order of ungleich_page namespace
2018-04-04 01:05:05 +02:00
PCoder
035f5c39ae
Format code
2018-04-04 00:35:25 +02:00
PCoder
ae4a83bdb8
Remove name for cms.urls
2018-04-04 00:35:12 +02:00
PCoder
9b45b758c4
Add ungleich_page urlconf namespace again
2018-04-04 00:34:29 +02:00
PCoder
0ec29be4ec
Use /cms for redirection instead of incorrect namespaces
2018-04-03 23:28:47 +02:00
PCoder
e0df641dbd
Merge master into task/4362/fix_need_of_cms_dummy_page
2018-04-03 22:50:00 +02:00
PCoder
41d073da3b
Remove conflicting cms/ urlconf
2018-04-01 08:14:50 +02:00
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
PCoder
dafaa13fbc
Add devuanhosting.com to ALLOWED_HOSTS
2018-03-09 22:39:45 +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
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
