lp:~canonical-isd-hackers/canonical-identity-provider/device-management

Branch merges

Propose for merging

No branches dependent on this one.

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

Canonical ISD hackers: Pending requested 2012-02-09

Diff: 865 lines (+279/-88)

14 files modified

identityprovider/decorators.py (+34/-0)
identityprovider/models/twofactor.py (+36/-0)
identityprovider/tests/acceptance/devices/_helpers.py (+1/-1)
identityprovider/tests/acceptance/devices/add_two_devices.py (+46/-0)
identityprovider/tests/acceptance/devices/login.py (+2/-2)
identityprovider/tests/acceptance/devices/prefs.py (+12/-2)
identityprovider/tests/acceptance/devices/remove_device.py (+2/-2)
identityprovider/tests/acceptance/devices/rename_device.py (+2/-2)
identityprovider/tests/unit/test_decorators.py (+74/-2)
identityprovider/tests/unit/test_views_ui.py (+13/-15)
identityprovider/views/account.py (+8/-9)
identityprovider/views/devices.py (+30/-17)
identityprovider/views/server.py (+2/-2)
identityprovider/views/ui.py (+17/-34)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

330. By Michael Foord on 2012-02-09

Fix for existing unit tests

329. By Michael Foord on 2012-02-09

Merge

328. By Michael Foord on 2012-02-09

Device addition and removal requires two factor authentication

327. By Michael Foord on 2012-02-09

Fixes for adding devices in acceptance tests

326. By Michael Foord on 2012-02-09

Merge

325. By Michael Foord on 2012-02-09

Skeleton test for adding multiple tests

324. By Simon Davy on 2012-02-08

Fixed prefs acceptance test, slight fix to redirect login in sso_login_required

323. By Simon Davy on 2012-02-07

fixed sso_login_required decorator to work in both invocation styles, with tests

322. By Simon Davy on 2012-02-07

Removing suspicious character from code base. Wait - are commit messages allowed character? ;P

321. By Simon Davy on 2012-02-07

Merged trunk