← Back to branch summary

~nataliabidart/canonical-identity-provider/better-preferredemail

~nataliabidart/canonical-identity-provider/better-preferredemail

« back to all changes in this revision

Viewing changes to src/webui/templates/ubuntuone/registration/login.html

Committer: Natalia B. Bidart
Date: 2013-11-05 23:27:25 UTC
mfrom: (1069.1.9 remove-flag-allow-unverified)
Revision ID: natalia.bidart@canonical.com-20131105232725-1j24wko6950p6op6

Merged remove-flag-allow-unverified into better-preferredemail.

files added:
src/identityprovider/management/commands/cypher_performance.py

src/identityprovider/migrations/0015_add_account_indexes_for_admin.py

src/webui/templates/launchpad/email/desktop-newuser.txt

src/webui/templates/ubuntu/email/desktop-newuser.txt

files modified:
config-manager.txt

src/api/v10/forms.py

src/api/v10/handlers.py

src/api/v10/tests/test_forms.py

src/api/v10/tests/test_handlers.py

src/identityprovider/emailutils.py

src/identityprovider/tests/test_emailutils.py

src/identityprovider/tests/test_models_account.py

src/webui/templates/ubuntuone/registration/login.html

src/webui/tests/test_views_ui.py

src/webui/views/ui.py

Show diffs side-by-side

added added

removed removed

14

14

{% endblock %}

15

15

16

16

{% block messages %}

17

{{ block.super }}

17

18

{% if form.email.errors or form.password.errors or form.oath_token.errors or form.non_field_errors %}

18

19

<div class="message error notopbar"><p>There were some problems with the information you gave us. Please check below and try again.</div>

19

20

{% endif %}

Older »