lp:~michael.nelson/canonical-identity-provider/add-convoy-combo

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-04-10

Diff: 374 lines (+209/-9)

11 files modified

.bzrignore (+2/-0)
django_project/config_dev/config/devel.cfg (+1/-0)
django_project/config_dev/config/main.cfg (+4/-1)
identityprovider/schema.py (+1/-0)
requirements/install.txt (+1/-0)
webui/templates/ubuntuone/base.html (+3/-7)
webui/templatetags/combo.py (+71/-0)
webui/tests/test_templatetags.py (+75/-0)
webui/tests/test_views_ui.py (+21/-0)
webui/urls.py (+1/-1)
webui/views/ui.py (+29/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

783. By Michael Nelson on 2013-04-11

Merged trunk from prev.

782. By Michael Nelson on 2013-04-11

Use combo for js loading on login.

781. By Michael Nelson on 2013-04-11

Use combo tag on ubuntuone base template.

780. By Michael Nelson on 2013-04-11

Convert to django 1.3 valid tag :/

779. By Michael Nelson on 2013-04-10

REFACTOR: add prefx option to combo tag.

778. By Michael Nelson on 2013-04-10

REFACTOR: combo template tag uses combo when debug is false.

777. By Michael Nelson on 2013-04-10

REFACTOR: move combo template tag to webui app.

776. By Michael Nelson on 2013-04-10

GREEN: combo template tag uses static_url.

775. By Michael Nelson on 2013-04-10

Merged fix_static_url

774. By Michael Nelson on 2013-04-10

RED: combo template tag uses static_url