Merge lp://staging/~dobey/ubuntu-sso-client/update-4-2 into lp://staging/ubuntu-sso-client/stable-4-2
Proposed by
dobey
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 1019 |
| Merged at revision: | 1019 |
| Proposed branch: | lp://staging/~dobey/ubuntu-sso-client/update-4-2 |
| Merge into: | lp://staging/ubuntu-sso-client/stable-4-2 |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~dobey/ubuntu-sso-client/update-4-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[Diego Sarmentero]
Update to use Ubuntu One branding and URLs.
[Rodney Dawes]
Add the version to constants.py as well.
Replace PROJECT_NAME as well to have a single location for it.
Generate the constants.py as a usable module from within tests.
Replace the prefix in constants.py only in the installed copy, and not local.
Use the correct variable for replacing the "prefix" in constants.py.
Update author information in setup().
To post a comment you must log in.
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
