lp:~mikemc/ubiquity/keyring-double-keynames

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mikemc/ubiquity/main-u1 at revision 5815

dobey (community): Approve on 2013-03-01

Roberto Alsina (community): Approve on 2013-03-01

Diff: 206 lines (+67/-44)

2 files modified

tests/test_ubi_ubuntuone.py (+58/-44)
ubiquity/plugins/ubi-ubuntuone.py (+9/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5817. By Mike McCracken on 2013-03-01

merge with main-u1

5816. By Mike McCracken on 2013-03-01

- duplicate some keys in stored token for compatibility with v1 clients

5815. By Mike McCracken on 2013-03-01

- patch all of Gtk to avoid assertion failures in tests

5814. By Mike McCracken on 2013-02-28

- duplicate some data in stored token for backwards compatibility with v1 clients

5813. By Mike McCracken on 2013-02-28

merge fix-cutnpaste-keyring

5812. By Mike McCracken on 2013-02-28

merge with keyring-wants-urlencoded

5811. By Mike McCracken on 2013-02-28

merge in replace-sso-cli

5810. By Mike McCracken on 2013-02-14

add connection watcher to test script to test online state handling

5809. By Michael Vogt on 2012-12-04

ubiquity/plugins/ubi-ubuntuone.py: do not create the page if in UBIQUITY_AUTOMATIC mode (or if the user has UBIQUITY_NO_SSO set). also skip if GnomeKeyring can not be imported

5808. By Michael Vogt on 2012-12-04

skip copy of the keyring if the target path is already there, thanks to Stephane