Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Marinello
django-password-reset
Commits
d033a52b
Commit
d033a52b
authored
Sep 28, 2015
by
Bruno Renié
Browse files
Remove use of url from future, stop testing Django 1.4
parent
53ea6952
Changes
4
Hide whitespace changes
Inline
Side-by-side
password_reset/templates/password_reset/recovery_email.txt
View file @
d033a52b
{% load i18n %}{%
load url from future %}{%
blocktrans %}Dear {{ username }},{% endblocktrans %}
{% load i18n %}{% blocktrans %}Dear {{ username }},{% endblocktrans %}
{% blocktrans with domain=site.domain %}You -- or someone pretending to be you -- has requested a password reset on {{ domain }}.{% endblocktrans %}
...
...
password_reset/templates/password_reset/recovery_form.html
View file @
d033a52b
{% extends "password_reset/base.html" %}
{% load i18n %}
{% load url from future %}
{% block title %}{% trans "Password recovery" %}{% endblock %}
...
...
password_reset/templates/password_reset/reset.html
View file @
d033a52b
{% extends "password_reset/base.html" %}{% load i18n %}
{% load url from future %}
{% extends "password_reset/base.html" %}{% load i18n %}
{% block content %}
{% if invalid %}{% url "password_reset_recover" as recovery_url %}
...
...
tox.ini
View file @
d033a52b
[tox]
envlist
=
py26-django1{4,5,6},
py27-django1{4,5,6,7,8},
py3{3,4}-django1{5,6,7,8},
py26-django1{5,6},
py{27,33,34}-django1{5,6,7,8},
docs,
lint
[testenv]
...
...
@@ -13,12 +12,11 @@ basepython =
py33:
python3.3
py34:
python3.4
deps
=
django
14:
Django>=1.4,<1.5
django
-discover-runner
django15:
Django>=1.5,<1.6
django16:
Django>=1.6,<1.7
django17:
Django>=1.7,<1.8
django18:
Django>=1.8,<1.9
django14,django15:
django-discover-runner
[testenv:docs]
basepython
=
python3.4
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment