lp:~elopio/canonical-identity-provider/django-cancel_addition

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 2013-05-17

Diff: 55 lines (+13/-11)

2 files modified

acceptance/tests/devices/test_add_device.py (+0/-5)
webui/tests/test_devices.py (+13/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

861. By Leo Arias on 2013-05-17

Changed the default device test from SST to django.

860. By Leo Arias on 2013-05-17

Merged with trunk.

859. By Jonas G. Drange on 2013-05-15

[r=elopio,ricardokirkner] making u1 acceptance tests pass by using qa anchors

858. By Ricardo Kirkner on 2013-05-15

[r=bloodearnest] added django 1.5 compatible templates for nexus and gargoyle

857. By Ricardo Kirkner on 2013-05-15

[r=matiasb] added new forgot_password view that uses api internally

856. By James Tait on 2013-05-15

[r=ricardokirkner] Ensure that the attributes returned in the responses for AX and SReg were actually requested via that method, rather than returning all approved attributes in both responses.

855. By James Westby on 2013-05-14

[r=nataliabidart] Complete the skeleton for the oops config.

854. By Łukasz Czyżykowski on 2013-05-14

[r=ricardokirkner] Updated code to work with Django 1.5.1

853. By Jonas G. Drange on 2013-05-14

[r=ricardokirkner] consistent padding

852. By Simon Davy on 2013-05-13

[r=nataliabidart,jamestait,mfoord] Make scrips/acceptance-dev.sh more dev-friendly rather than jenkins-friendly