ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

WIP: Docker updates #13

Draft
mravi wants to merge 19 commits from docker into master
pull from: docker
merge into: ungleich-public:master
Conversation 0 Commits 19 Files changed 11 +12 -11
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 934c1f98de - Show all commits

2
dynamicweb/settings/base.py
View file

@ -156,7 +156,7 @@ INSTALLED_APPS = (
'webhook', 'webhook',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'utils.middleware.MultipleProxyMiddleware', 'utils.middleware.MultipleProxyMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',

2
dynamicweb/settings/local.py
View file

@ -15,7 +15,7 @@ CACHES = {
} }
} }
MIDDLEWARE_CLASSES += ("debug_toolbar.middleware.DebugToolbarMiddleware",) MIDDLEWARE += ("debug_toolbar.middleware.DebugToolbarMiddleware",)
INSTALLED_APPS += ( INSTALLED_APPS += (
'django_extensions', 'django_extensions',

19
requirements.txt
View file

@ -1,3 +1,4 @@
setuptools<58.0.0
Babel==2.3.4 Babel==2.3.4
Django==1.11.18 Django==1.11.18
Django-Select2==4.3.2 Django-Select2==4.3.2
@ -15,7 +16,7 @@ aldryn-people==2.2.0
aldryn-search==0.2.11 aldryn-search==0.2.11
aldryn-translation-tools==0.3.0 aldryn-translation-tools==0.3.0
backport-collections==0.1 backport-collections==0.1
cmsplugin-filer==1.0.1 #cmsplugin-filer==1.1.3
django-appconf==1.0.2 django-appconf==1.0.2
django-appdata==0.2.1 django-appdata==0.2.1
django-bootstrap3==7.0.1 django-bootstrap3==7.0.1
@ -25,18 +26,18 @@ django-compressor==2.0
django-debug-toolbar==1.4 django-debug-toolbar==1.4
python-dotenv==0.10.3 python-dotenv==0.10.3
django-extensions==1.6.7 django-extensions==1.6.7
django-filer==1.7.0 django-filer==1.5.0
django-filter==0.13.0 django-filter==0.13.0
django-formtools>=2.1 django-formtools==2.1
django-guardian==1.4.4 django-guardian==1.4.4
django-haystack==2.4.1 django-haystack==2.4.1
django-meta==1.2 django-meta==1.2
django-meta-mixin==0.3.0 django-meta-mixin==0.3.0
django-model-utils==2.5 django-model-utils==2.5
django-mptt==0.8.4 django-mptt==0.11
django-parler==1.9.2 django-parler==1.9.2
django-phonenumber-field==1.1.0 django-phonenumber-field==1.1.0
django-polymorphic==0.8.1 django-polymorphic==2.0.2
django-reversion==1.10.2 django-reversion==1.10.2
django-sekizai==0.9.0 django-sekizai==0.9.0
django-sortedm2m==3.1.1 django-sortedm2m==3.1.1
@ -47,7 +48,7 @@ django-taggit==0.23.0
django-taggit-autosuggest==0.2.8 django-taggit-autosuggest==0.2.8
django-taggit-templatetags==0.2.5 django-taggit-templatetags==0.2.5
django-templatetag-sugar==1.0 django-templatetag-sugar==1.0
django-treebeard>=4.3 django-treebeard==4.3
djangocms-admin-style>=1.2 djangocms-admin-style>=1.2
djangocms-apphook-setup==0.1.2 djangocms-apphook-setup==0.1.2
djangocms-blog==0.8.13 djangocms-blog==0.8.13
@ -61,14 +62,14 @@ djangocms-picture==1.0.0
djangocms-teaser==0.2.0 djangocms-teaser==0.2.0
djangocms-text-ckeditor==3.7.0 djangocms-text-ckeditor==3.7.0
djangocms-video==1.0.0 djangocms-video==1.0.0
easy-thumbnails==2.3 easy-thumbnails==2.4.1
html5lib==0.999999999 html5lib==0.999999999
ldap3==2.6.1 ldap3==2.6.1
lxml lxml
model-mommy==1.2.6 model-mommy==1.2.6
phonenumbers==8.13.11 phonenumbers==8.13.11
psycopg2==2.8.4 psycopg2==2.8.4
pycryptodome==3.6.6 pycryptodome==3.8.0
pylibmc==1.6.3 pylibmc==1.6.3
python-dateutil==2.5.3 python-dateutil==2.5.3
python-slugify==1.2.6 python-slugify==1.2.6
@ -88,7 +89,7 @@ flake8==3.3.0
python-memcached==1.58 python-memcached==1.58
celery==4.4.7 celery==4.4.7
redis==2.10.5 redis==2.10.5
#django-celery-results>=2.5.1 django-celery-results==1.0.2
kombu>=4.6.10 kombu>=4.6.10
mccabe==0.6.1 mccabe==0.6.1
pycodestyle==2.3.1 pycodestyle==2.3.1