lp:~dobey/ubuntu-sso-client/update-4-2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-sso-client/stable-4-2 at revision 1019

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

Diff: 336 lines (+83/-48)

11 files modified

data/qt/network_detection.ui (+1/-1)
setup.py (+35/-12)
ubuntu_sso/constants.py.in (+2/-2)
ubuntu_sso/qt/main/__init__.py (+4/-0)
ubuntu_sso/qt/main/tests/test_main.py (+3/-0)
ubuntu_sso/qt/sso_wizard_page.py (+27/-5)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-1)
ubuntu_sso/qt/tests/test_email_verification.py (+1/-1)
ubuntu_sso/tests/__init__.py (+1/-1)
ubuntu_sso/utils/tests/test_parse_args.py (+0/-17)
ubuntu_sso/utils/ui.py (+8/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1019. By dobey on 2013-03-21

Merge changes from trunk for release.

1018. By dobey on 2013-02-20

[release] 4.1.91

1017. By Barry Warsaw on 2013-02-20

[Rodney Dawes]

    Don't pass in the query parameters to oauthlib twice.
    Pass the timestamp argument to oauthlib as a str to workaround a problem.
    Skip proxy tests failing due to ncsa_auth crashing.

[Barry Warsaw]

    Remove some unnecessary test code that still depended on python-oauth.
    Switch from python-oauth to python-oauthlib for using OAuth.

1016. By dobey on 2013-01-25

[release] 4.1.90

1015. By dobey on 2013-01-25

Fix a dependency on a re-export of a module in twisted.

1014. By Alejandro J. Cura on 2013-01-25

[Alejandro Cura]

    - Clean up timers that are sometimes slowing down all tests that follow.
    - Use a standard LC_CTYPE locale when the LANG is turkish. (LP: #997326).

[Rodney Dawes]

    - Fail the defer with an exception class like it's supposed to.

1013. By dobey on 2013-01-09

[release] 4.1.2

1012. By dobey on 2013-01-09

[Mike McCracken]

    - Add util func returning translation function for platform/pyversion/frozen status. (LP: #1074116)

[Rodney Dawes]

    - Ignore some new pep8 errors, and update code to fix others.

[Brian Curtin]

    - Use states from networkstates instead of re-defining them locally.

1011. By dobey on 2012-12-10

[release] 4.1.0

1010. By dobey on 2012-10-26

Switch to pyflakes.
Fix all the resulting issues from switching to pyflakes.