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

Merge

parents dc785258 67aa01a1
......@@ -25,7 +25,6 @@ django_celery_beat = "==1.1.0"
Jinja2 = "==2.10"
WooCommerce = "==1.2.1"
django-simple-captcha = "==0.5.10"
woocommerce = "*"
[dev-packages]
twine = "==1.12.1"
......
......@@ -2,6 +2,7 @@ from django.contrib.auth import get_user_model
from django.contrib.auth.forms import AuthenticationForm as BaseAuthenticationForm
from django.utils.translation import ugettext_lazy as _
from registration.forms import RegistrationForm as BaseRegistrationForm
from captcha.fields import CaptchaField
User = get_user_model()
......@@ -15,7 +16,7 @@ class AuthenticationForm(BaseAuthenticationForm):
class RegistrationForm(BaseRegistrationForm):
captcha = CaptchaField()
email = None # override base definition to remove email field
def __init__(self, *args, **kwargs):
......
......@@ -44,7 +44,7 @@ ALLOWED_HOSTS = config("ALLOWED_HOSTS", cast=Csv())
#
INSTALLED_APPS += ["crispy_forms", "django_agpl", "django_celery_beat", "django_extensions", "ldapregister",
"limitmonitor", "purist", "captcha", "crowdfunding",]
"limitmonitor", "purist", "captcha"]
#
# AGPL APPLICATION
......
......@@ -44,7 +44,5 @@ urlpatterns = [
url(r'^download/', include('django_agpl.urls')),
url(r'^jslicense/$', purist.views.jslicense, name='jslicense'),
url(r'^captcha/', include('captcha.urls')),
url(r'^crowdfund/(?P<reward>\d+)/$', CrowdFundRegistrationView.as_view()),
]
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