← Back to branch summary

~mikemc/canonical-identity-provider/wip-fix-1169632

~mikemc/canonical-identity-provider/wip-fix-1169632

Viewing all changes in revision 1408.

Committer: Michael McCracken
Date: 2016-03-31 18:19:02 UTC
mfrom: (1406.2.13 canonical-identity-provider)
Revision ID: mike.mccracken@canonical.com-20160331181902-wmxn6hxp5hr17q9y

merge with trunk

files added:
rsakeys

src/api/v20/authorization.py

src/identityprovider/migrations/0007_auto_20160310_2013.py

src/identityprovider/migrations/0008_accountpassword_date_changed.py

src/identityprovider/tests/test_models_const.py

src/webui/templates/widgets/recaptcha-v2.html

files removed:
src/webui/templates/enter_token.html

files modified:
.bzrignore

README

dependencies.txt

django_project/settings_base.py

django_project/settings_devel.py

po/api/api.pot

po/identityprovider/identityprovider.pot

po/webui/webui.pot

requirements.txt

requirements_devel.txt

requirements_docs.txt

src/api/v20/auth.py

src/api/v20/decorators.py

src/api/v20/handlers.py

src/api/v20/tests/test_handlers.py

src/api/v20/urls.py

src/api/v20/utils.py

src/identityprovider/admin.py

src/identityprovider/auth.py

src/identityprovider/forms.py

src/identityprovider/gargoyle.py

src/identityprovider/models/account.py

src/identityprovider/models/authtoken.py

src/identityprovider/models/captcha.py

src/identityprovider/models/const.py

src/identityprovider/signals.py

src/identityprovider/templates/email/validate-email.txt

src/identityprovider/tests/test_auth.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_gargoyle.py

src/identityprovider/tests/test_models_account.py

src/identityprovider/tests/test_models_captcha.py

src/identityprovider/tests/utils.py

src/webui/templates/account/confirm_new_email.html

src/webui/templates/registration/email_sent.html

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/urls.py

src/webui/views/registration.py

src/webui/views/ui.py

uci-vms.conf

Show diffs side-by-side

added added

removed removed

dependencies.txt

django_project/settings_base.py

django_project/settings_devel.py

po/identityprovider/identityprovider.pot

po/webui/webui.pot

requirements.txt

requirements_devel.txt

requirements_docs.txt

src/api/v20/auth.py

src/api/v20/authorization.py

src/api/v20/decorators.py

src/api/v20/handlers.py

src/api/v20/tests/test_handlers.py

src/api/v20/urls.py

src/api/v20/utils.py

src/identityprovider/admin.py

src/identityprovider/auth.py

src/identityprovider/forms.py

src/identityprovider/gargoyle.py

src/identityprovider/migrations/0007_auto_20160310_2013.py

src/identityprovider/migrations/0008_accountpassword_date_changed.py

src/identityprovider/models/account.py

src/identityprovider/models/authtoken.py

src/identityprovider/models/captcha.py

src/identityprovider/models/const.py

src/identityprovider/signals.py

src/identityprovider/templates/email/validate-email.txt

src/identityprovider/tests/test_auth.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_gargoyle.py

src/identityprovider/tests/test_models_account.py

src/identityprovider/tests/test_models_captcha.py

src/identityprovider/tests/test_models_const.py

src/identityprovider/tests/utils.py

src/webui/templates/account/confirm_new_email.html

src/webui/templates/enter_token.html

src/webui/templates/registration/email_sent.html

src/webui/templates/widgets/recaptcha-v2.html

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/urls.py

src/webui/views/registration.py

src/webui/views/ui.py

Older »