lp://qastaging/~thomir-deactivatedaccount/canonical-identity-provider/trunk-add-gpg-key-management

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/canonical-identity-provider/release

Natalia Bidart (community): Needs Fixing on 2016-04-20

Michael Nelson (community): Approve on 2016-04-20

Diff: 1793 lines (+1363/-32)

30 files modified

README (+14/-7)
django_project/settings_base.py (+2/-0)
django_project/settings_devel.py (+1/-0)
requirements.txt (+1/-0)
requirements_devel.txt (+2/-0)
src/identityprovider/emailutils.py (+77/-1)
src/identityprovider/migrations/0009_authtoken_gpg_columns.py (+19/-0)
src/identityprovider/models/account.py (+4/-0)
src/identityprovider/models/authtoken.py (+23/-0)
src/identityprovider/static/css/all.css (+1/-1)
src/identityprovider/static_src/css/ubuntuone.css (+18/-0)
src/identityprovider/templates/email/gpg-cleartext-instructions.txt (+17/-0)
src/identityprovider/templates/email/validate-gpg.txt (+18/-0)
src/identityprovider/tests/factory.py (+11/-2)
src/identityprovider/tests/test_models_authtoken.py (+46/-1)
src/identityprovider/tests/utils.py (+17/-0)
src/webui/forms.py (+102/-0)
src/webui/gpg.py (+15/-0)
src/webui/templates/account/confirm_new_gpg.html (+33/-0)
src/webui/templates/account/confirm_new_signonly_gpg.html (+47/-0)
src/webui/templates/account/gpg_keys.html (+97/-0)
src/webui/templates/widgets/personal-menu.html (+4/-0)
src/webui/tests/test_views_account_gpg.py (+460/-0)
src/webui/urls.py (+7/-1)
src/webui/utils.py (+10/-0)
src/webui/views/account.py (+57/-0)
src/webui/views/gpg_messages.py (+100/-0)
src/webui/views/registration.py (+0/-1)
src/webui/views/ui.py (+115/-18)
src/webui/views/utils.py (+45/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1432. By Thomi Richards on 2016-04-28

Fix translation error.

1431. By Thomi Richards on 2016-04-28

Several fixes from code review.

1430. By Thomi Richards on 2016-04-27

Fix lint errors.

1429. By Thomi Richards on 2016-04-27

Yet more changes from the code review.

1428. By Thomi Richards on 2016-04-27

Several fixes from code review.

1427. By Thomi Richards on 2016-04-26

Clean up generation of unknown_key message text generation.

1426. By Thomi Richards on 2016-04-26

Fixes from code review.

1425. By Thomi Richards on 2016-04-22

Don't derive from testtools.TestCase either.

1424. By Thomi Richards on 2016-04-22

Remove use of testtools matchers from gpg unit tests.

1423. By Thomi Richards on 2016-04-21

Merged trunk.