From afdb834daf4302c947a63293f731abb0eceb5d2b Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Sat, 6 Jan 2018 21:11:58 +0000 Subject: [PATCH] Disable django wiki login pages and use the default django pages --- config/settings/common.py | 1 + requirements/base.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/settings/common.py b/config/settings/common.py index 4ffa3a4..f43627a 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -369,6 +369,7 @@ AUTH_USER_MODEL = 'users.User' LOGIN_REDIRECT_URL = 'users:redirect' #LOGIN_URL = 'account_login' WIKI_SIGNUP_URL = 'account_login' +WIKI_ACCOUNT_HANDLING = False #WIKI_EDITOR = 'wiki.editors.martor.Martor' # SLUGLIFIER AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' diff --git a/requirements/base.txt b/requirements/base.txt index 7ded03b..cfeabc2 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -58,7 +58,8 @@ braintree==3.37.2 django-autofixture==0.12.1 git+https://github.com/olymk2/scaffold.git -git+git://github.com/olymk2/django-wiki.git +#git+git://github.com/olymk2/django-wiki.git +git+git://github.com/django-wiki/django-wiki.git djangorestframework==3.6.3 djangorestframework-jwt