Merge lp://qastaging/~nataliabidart/ubuntu-sso-client/all-ui-from-code into lp://qastaging/ubuntu-sso-client
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 883 |
| Merged at revision: | 883 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntu-sso-client/all-ui-from-code |
| Merge into: | lp://qastaging/ubuntu-sso-client |
| Diff against target: |
4246 lines (+1955/-1959) 18 files modified
data/qt/choose_sign_in.ui (+163/-165) data/qt/current_user_sign_in.ui (+181/-184) data/qt/email_verification.ui (+113/-116) data/qt/error_message.ui (+28/-31) data/qt/forgotten_password.ui (+185/-188) data/qt/loadingoverlay.ui (+3/-6) data/qt/network_detection.ui (+139/-142) data/qt/proxy_credentials_dialog.ui (+12/-15) data/qt/reset_password.ui (+354/-357) data/qt/setup_account.ui (+697/-700) data/qt/success_message.ui (+32/-35) ubuntu_sso/qt/email_verification_page.py (+4/-0) ubuntu_sso/qt/loadingoverlay.py (+3/-0) ubuntu_sso/qt/network_detection_page.py (+5/-1) ubuntu_sso/qt/proxy_dialog.py (+1/-1) ubuntu_sso/qt/setup_account_page.py (+14/-6) ubuntu_sso/qt/tests/test_network_detection.py (+3/-1) ubuntu_sso/utils/ui.py (+18/-11) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu-sso-client/all-ui-from-code |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- No more strings coming up from the Designer ui files (LP: #938626).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1