Commit ee87d597 authored by Noe Nieto's avatar Noe Nieto 💬

Fixes for MR 118

parent 44e17a6b
......@@ -25,8 +25,8 @@ django_celery_beat = "==1.1.0"
Jinja2 = "==2.10"
WooCommerce = "==1.2.1"
django-simple-captcha = "==0.5.10"
djangorestframework = "*"
django-password-reset = "*"
djangorestframework = "==3.9.2"
django-password-reset = "==2.0"
[dev-packages]
# self:
......
......@@ -13,6 +13,7 @@ DEBUG_CHANGE_PASSWORD=False
DEBUG_REGISTER_STATUS = True
DEBUG_SKIP_ACTIVATION_COMMAND=True
DEBUG_SKIP_VALIDATE_ON_AUTHENTICATION = False
DEBUG_LOCAL_MAIL = False
# change to false after initial setup
ALLOWED_HOSTS=localhost
STATIC_ROOT=/var/opt/purist/middleware/static
......@@ -38,4 +39,6 @@ OVPN_PORT=22
OVPN_USERNAME=username
OVPN_FILEPATH="/path/to/{IDENTITY}/{IDENTITY}.ovpn"
TUNNEL_HOST=https://example.com
PASSWORD_RESET_TOKEN_EXPIRES=1800
\ No newline at end of file
PASSWORD_RESET_TOKEN_EXPIRES=1800
WOO_CART_BASIC
WOO_CART_COMPLETE
\ No newline at end of file
......@@ -252,7 +252,7 @@ REST_FRAMEWORK = {
PASSWORD_RESET_TOKEN_EXPIRES = secret_config('PASSWORD_RESET_TOKEN_EXPIRES')
if DEBUG:
if DEBUG_LOCAL_MAIL:
# Use Mailtrap for development (https://source.puri.sm/snippets/56)
EMAIL_HOST = '127.0.0.1'
EMAIL_HOST_USER = ''
......
......@@ -372,7 +372,7 @@ class User(AbstractUser):
return None
@property
def recovery_email(self):
def contact_email(self):
if self.account_type is AccountType.COMPLETE:
return self.username + '@' + settings.EMAIL_DOMAIN
return self.email
......
# do not modify manually
# generated with "pipenv run pip freeze > requirements.txt"
amqp==2.4.2
amqp==2.3.2
asn1crypto==0.24.0
astroid==2.1.0
bcrypt==3.1.6
billiard==3.5.0.5
bleach==3.1.0
bcrypt==3.1.4
billiard==3.5.0.4
celery==4.1.1
certifi==2019.3.9
cffi==1.12.2
certifi==2018.8.13
cffi==1.11.5
chardet==3.0.4
choicesenum==0.2.2
confusable-homoglyphs==3.0.0
cryptography==2.6.1
cryptography==2.3.1
dj-database-url==0.4.2
Django==1.11.18
Django==1.11.17
django-agpl==4.0.0
django-auth-ldap==1.3.0
django-celery-beat==1.1.0
django-crispy-forms==1.7.0
django-debug-toolbar==1.11
django-extensions==1.9.9
django-ipython==0.1.1
django-ldapdb==1.0.0
django-password-reset==2.0
django-ranged-response==0.2.0
django-ldapdb==0.9.0
django-registration==2.4.1
django-simple-captcha==0.5.10
djangorestframework==3.9.2
docutils==0.14
ephem==3.7.6.0
idna==2.8
isort==4.3.4
idna==2.7
Jinja2==2.10
jinja2-django-tags==0.5
kombu==4.5.0
lazy-object-proxy==1.3.1
MarkupSafe==1.1.1
mccabe==0.6.1
kombu==4.2.1
MarkupSafe==1.0
ordereddict==1.1
paramiko==2.4.1
Pillow==6.0.0
pkg-resources==0.0.0
pkginfo==1.5.0.1
pyasn1==0.4.2
pyasn1-modules==0.2.4
pycparser==2.19
Pygments==2.3.1
pyasn1-modules==0.2.2
pycparser==2.18
pyldap==3.0.0.post1
pylint==2.2.2
PyNaCl==1.3.0
python-dateutil==2.8.0
PyNaCl==1.2.1
python-dateutil==2.7.3
python-decouple==3.1
python-ldap==3.0.0
pytz==2018.9
readme-renderer==24.0
requests==2.21.0
requests-toolbelt==0.9.1
ruamel.yaml==0.15.89
six==1.12.0
sqlparse==0.3.0
pytz==2018.5
requests==2.19.1
ruamel.yaml==0.15.55
six==1.11.0
strictyaml==0.11.10
tqdm==4.31.1
twine==1.12.1
typing==3.6.6
urllib3==1.24.1
vine==1.3.0
webencodings==0.5.1
typing==3.6.4
urllib3==1.23
vine==1.1.4
WooCommerce==1.2.1
wrapt==1.11.1
djangorestframework==3.9.2
django-password-reset==2.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment