← Back to branch summary

~vila/canonical-identity-provider/sso-dev

~vila/canonical-identity-provider/sso-dev

Viewing all changes in revision 1347.

Committer: Simon Davy
Date: 2015-10-23 16:08:33 UTC
mfrom: (1336.1.4 pythonpath)
Revision ID: simon.davy@canonical.com-20151023160833-wkzcjnhuj7r0hfu0

merging

files added:
docs/resources/email.txt

files removed:
src/identityprovider/middleware/raven.py

src/identityprovider/raven_processors.py

src/identityprovider/tests/test_raven_processors.py

files modified:
Makefile.common

Makefile.juju

django_project/settings_base.py

docs/api.txt

docs/conf.py

docs/resources/account.txt

docs/resources/index.txt

docs/resources/requests.txt

po/api/api.pot

po/identityprovider/identityprovider.pot

po/webui/webui.pot

requirements.txt

src/api/v10/handlers.py

src/api/v10/tests/test_handlers.py

src/api/v20/handlers.py

src/api/v20/tests/test_handlers.py

src/identityprovider/emailutils.py

src/identityprovider/tests/helpers.py

src/identityprovider/tests/openid_server/per_version/test_sso_workflow_reset_password.py

src/identityprovider/tests/sso_server/test_standalone_login.py

src/identityprovider/tests/test_emailutils.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_models_authtoken.py

src/identityprovider/tests/test_utils.py

src/identityprovider/utils.py

src/identityprovider/wsgi.py

Show diffs side-by-side

added added

removed removed

Makefile.common

django_project/settings_base.py

docs/resources/account.txt

docs/resources/email.txt

docs/resources/index.txt

docs/resources/requests.txt

po/identityprovider/identityprovider.pot

po/webui/webui.pot

requirements.txt

src/api/v10/handlers.py

src/api/v10/tests/test_handlers.py

src/api/v20/handlers.py

src/api/v20/tests/test_handlers.py

src/identityprovider/emailutils.py

src/identityprovider/middleware/raven.py

src/identityprovider/raven_processors.py

src/identityprovider/tests/helpers.py

src/identityprovider/tests/openid_server/per_version/test_sso_workflow_reset_password.py

src/identityprovider/tests/sso_server/test_standalone_login.py

src/identityprovider/tests/test_emailutils.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_models_authtoken.py

src/identityprovider/tests/test_raven_processors.py

src/identityprovider/tests/test_utils.py

src/identityprovider/utils.py

src/identityprovider/wsgi.py

Older »