diff --git a/dependencies/pip/dev.txt b/dependencies/pip/dev.txt index 17fb248ad..d9913d66b 100644 --- a/dependencies/pip/dev.txt +++ b/dependencies/pip/dev.txt @@ -10,8 +10,6 @@ # via -r dependencies/pip/requirements.in -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest # via -r dependencies/pip/requirements.in --e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client - # via -r dependencies/pip/requirements.in -e git+https://github.com/kobotoolbox/ssrf-protect@755efe16694273ce66060a51e04f973dc034ca4e#egg=ssrf_protect # via -r dependencies/pip/requirements.in amqp==2.6.0 diff --git a/dependencies/pip/prod.txt b/dependencies/pip/prod.txt index b1f7022ff..2ac0260ab 100644 --- a/dependencies/pip/prod.txt +++ b/dependencies/pip/prod.txt @@ -10,8 +10,6 @@ # via -r dependencies/pip/requirements.in -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest # via -r dependencies/pip/requirements.in --e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client - # via -r dependencies/pip/requirements.in -e git+https://github.com/kobotoolbox/ssrf-protect@755efe16694273ce66060a51e04f973dc034ca4e#egg=ssrf_protect # via -r dependencies/pip/requirements.in amqp==2.6.0 diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in index 3e8da9ca3..f1e4691ea 100644 --- a/dependencies/pip/requirements.in +++ b/dependencies/pip/requirements.in @@ -10,9 +10,6 @@ # ToDo Remove when `kobokitten-remove-ui-CUD-actions-unicode is merged. git+https://github.com/kobotoolbox/formpack.git@52f77e3519fd1079ce3451f9a5c7c27002e9f3f0#egg=formpack -# captcha --e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client - # spss https://bitbucket.org/fomcl/savreaderwriter/downloads/savReaderWriter-3.3.0.zip#egg=savreaderwriter diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt index 563a1643b..745f4ba93 100644 --- a/dependencies/pip/requirements.txt +++ b/dependencies/pip/requirements.txt @@ -10,8 +10,6 @@ # via -r dependencies/pip/requirements.in -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest # via -r dependencies/pip/requirements.in --e git+https://github.com/dresiu/recaptcha-client-1.0.6-py3@48078f8131e2f3c2054d2099ef48cfe9a5745d0c#egg=recaptcha-client - # via -r dependencies/pip/requirements.in -e git+https://github.com/kobotoolbox/ssrf-protect@755efe16694273ce66060a51e04f973dc034ca4e#egg=ssrf_protect # via -r dependencies/pip/requirements.in amqp==2.6.0 diff --git a/onadata/libs/templates/registration/activate.html b/onadata/libs/templates/registration/activate.html deleted file mode 100644 index e35e2db59..000000000 --- a/onadata/libs/templates/registration/activate.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Account Activated" %}

-
- -
-
-

- {% url "auth_login" as login_url %} - {% blocktrans %} - Your account has been successfully activated. You may log in - here.{% endblocktrans %} -

-
-
-
-{% endblock %} diff --git a/onadata/libs/templates/registration/activation_complete.html b/onadata/libs/templates/registration/activation_complete.html deleted file mode 100644 index e35e2db59..000000000 --- a/onadata/libs/templates/registration/activation_complete.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Account Activated" %}

-
- -
-
-

- {% url "auth_login" as login_url %} - {% blocktrans %} - Your account has been successfully activated. You may log in - here.{% endblocktrans %} -

-
-
-
-{% endblock %} diff --git a/onadata/libs/templates/registration/activation_email.txt b/onadata/libs/templates/registration/activation_email.txt deleted file mode 100644 index 488e98dc5..000000000 --- a/onadata/libs/templates/registration/activation_email.txt +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} -{% url "registration_activate" activation_key as register_url %} -{% blocktrans with site_name=site.name site_domain=site.domain expiration_days=expiration_days expiration_days_p=expiration_days|pluralize %}You have registered on {{ site_name }}. To activate your account -please click on the link below: - -http://{{ site_domain }}{{ register_url }} - -The link above is valid for {{ expiration_days }} day{{ expiration_days_p }}. -{% endblocktrans %} diff --git a/onadata/libs/templates/registration/activation_email_subject.txt b/onadata/libs/templates/registration/activation_email_subject.txt deleted file mode 100644 index a4dd57524..000000000 --- a/onadata/libs/templates/registration/activation_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% blocktrans with site_name=site.name %}Account activation on {{ site_name }}{% endblocktrans %} diff --git a/onadata/libs/templates/registration/login.html b/onadata/libs/templates/registration/login.html deleted file mode 100644 index 8ac923f2c..000000000 --- a/onadata/libs/templates/registration/login.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} -{% block content %} - -
-
-

{% trans "Sign in" %}

-
- -
-
-
- - {{ form.as_table }} - - - - - - -
 
- {% csrf_token %} - -
- {% url "auth_password_reset" as reset_url %} -

{% blocktrans %}Can't access your account? Reset your password.{% endblocktrans %}

- {% url "registration_register" as registration_url %} -

{% blocktrans %}New to ona.io? Create an account.{% endblocktrans %}

-
-
-
- -{% endblock %} diff --git a/onadata/libs/templates/registration/password_change_done.html b/onadata/libs/templates/registration/password_change_done.html deleted file mode 100644 index 7506f8a9b..000000000 --- a/onadata/libs/templates/registration/password_change_done.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -

- {% trans "Password changed" %} -

-{% endblock %} diff --git a/onadata/libs/templates/registration/password_change_form.html b/onadata/libs/templates/registration/password_change_form.html deleted file mode 100644 index 48c0691a8..000000000 --- a/onadata/libs/templates/registration/password_change_form.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Change Password" %}

-
- -
-
-
- {% csrf_token %} - - {{ form.as_table }} -
- -
-
-
-
-{% endblock %} diff --git a/onadata/libs/templates/registration/password_reset_complete.html b/onadata/libs/templates/registration/password_reset_complete.html deleted file mode 100644 index 3a2902f8f..000000000 --- a/onadata/libs/templates/registration/password_reset_complete.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block page_title %}{% trans "Log In" %}{% endblock %} - -{% block content %} - -

{% trans "Password reset successfully" %}

- -

{% trans "Log in" %}

- -{% endblock %} diff --git a/onadata/libs/templates/registration/password_reset_confirm.html b/onadata/libs/templates/registration/password_reset_confirm.html deleted file mode 100644 index ee4ebe534..000000000 --- a/onadata/libs/templates/registration/password_reset_confirm.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -{% if validlink %} - -
- {{ form.as_p }} - {% csrf_token %} - - -
- -{% else %} - -

{% trans "Password reset failed" %}

- -{% endif %} - -{% endblock %} diff --git a/onadata/libs/templates/registration/password_reset_done.html b/onadata/libs/templates/registration/password_reset_done.html deleted file mode 100644 index f7b05282d..000000000 --- a/onadata/libs/templates/registration/password_reset_done.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Email Sent" %}

-
- -

{% trans "An email with password reset instructions has been sent." %}

-
-{% endblock %} diff --git a/onadata/libs/templates/registration/password_reset_email.html b/onadata/libs/templates/registration/password_reset_email.html deleted file mode 100644 index 463b1ca85..000000000 --- a/onadata/libs/templates/registration/password_reset_email.html +++ /dev/null @@ -1,16 +0,0 @@ -{% load i18n %} - -{% blocktrans %} - Hi {{ user }}, - - You recently requested a link to reset your {{ site_name }} password for the username {{ user }}. - Please set a new password by following the link below: -{% endblocktrans %} -{% block reset_link %} - {{ protocol }}://{{ domain }}{% url "auth_password_reset_confirm" uidb64=uid token=token %} -{% endblock %} - -{% blocktrans %} - Thanks, - - The {{ site_name }} Team. -{% endblocktrans %} diff --git a/onadata/libs/templates/registration/password_reset_form.html b/onadata/libs/templates/registration/password_reset_form.html deleted file mode 100644 index ba0da3ca8..000000000 --- a/onadata/libs/templates/registration/password_reset_form.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Password Reset" %}

-
- -

- {% blocktrans %}To reset your password please enter your email address below. A - message will be sent to your email address with a link for you to - reset your password.{% endblocktrans %} -

- -
-
-
- {% csrf_token %} - - {{ form.as_table }} - -
-
-
-
-
-{% endblock %} diff --git a/onadata/libs/templates/registration/registration_closed.html b/onadata/libs/templates/registration/registration_closed.html deleted file mode 100644 index 1b445fdfc..000000000 --- a/onadata/libs/templates/registration/registration_closed.html +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/onadata/libs/templates/registration/registration_complete.html b/onadata/libs/templates/registration/registration_complete.html deleted file mode 100644 index a093dc47e..000000000 --- a/onadata/libs/templates/registration/registration_complete.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Registration Email Sent" %}

-
-

- {% blocktrans %}A user account has been created for you and an email message has - been sent to the email address you provided.{% endblocktrans %} -

-

- {% blocktrans %}To activate your account and complete the registration process, - you must click the activation link provided in the email.{% endblocktrans %} -

-
-{% endblock %} diff --git a/onadata/libs/templates/registration/registration_form.html b/onadata/libs/templates/registration/registration_form.html deleted file mode 100644 index 47226b7cb..000000000 --- a/onadata/libs/templates/registration/registration_form.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{% trans "Register" %}

-
- -
-
-
- {% csrf_token %} -

{% trans "Fields marked wth an asterisk (*) are required." %}

- - {% for field in form %} - {% if not field.name == "recaptcha_challenge_field" and not field.name == "recaptcha_response_field" %} - - - - - {% endif %} - {% endfor %} -
- {{ field.label_tag }} - - {{ field.errors }} - {{ field }} - {% if field.field.required %}*{% endif %} -
- {% if form.REGISTRATION_REQUIRE_CAPTCHA %} - {% if form.non_field_errors %} -

{{ form.non_field_errors.0 }}

- {% endif %} - {{ form.RECAPTCHA_HTML|safe }} - {% endif %} -

{% blocktrans %}By clicking the button, you agree to our privacy policy and terms of service.{% endblocktrans %}

- -
-
-
-
-{% endblock %} diff --git a/onadata/libs/templates/registration/test_template_name.html b/onadata/libs/templates/registration/test_template_name.html deleted file mode 100644 index 2a4a0477f..000000000 --- a/onadata/libs/templates/registration/test_template_name.html +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/onadata/settings/base.py b/onadata/settings/base.py index 052bbb135..c3da47542 100644 --- a/onadata/settings/base.py +++ b/onadata/settings/base.py @@ -504,13 +504,6 @@ def skip_suspicious_operations(record): # default content length for submission requests DEFAULT_CONTENT_LENGTH = 10000000 -# TODO pass these variables from `kobo-docker` envfiles -# re-captcha in registrations -REGISTRATION_REQUIRE_CAPTCHA = False -RECAPTCHA_USE_SSL = False -RECAPTCHA_PRIVATE_KEY = '' -RECAPTCHA_PUBLIC_KEY = '6Ld52OMSAAAAAJJ4W-0TFDTgbznnWWFf0XuOSaB6' - # Use 1 or 0 for multiple selects instead of True or False for csv, xls exports BINARY_SELECT_MULTIPLES = False