Merge lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.90 into lp://qastaging/ubuntu-sso-client/stable-3-0
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 829 |
| Merged at revision: | 828 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.90 |
| Merge into: | lp://qastaging/ubuntu-sso-client/stable-3-0 |
| Diff against target: |
9631 lines (+3846/-3620) 64 files modified
bin/ubuntu-sso-proxy-creds-qt (+0/-4) bin/ubuntu-sso-ssl-certificate-qt (+25/-0) data/qt/choose_sign_in.ui (+0/-165) data/qt/current_user_sign_in.ui (+163/-184) data/qt/email_verification.ui (+105/-116) data/qt/error_message.ui (+28/-31) data/qt/forgotten_password.ui (+111/-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 (+348/-357) data/qt/setup_account.ui (+661/-700) data/qt/ssl_dialog.ui (+205/-0) data/qt/stylesheet.qss (+22/-30) data/qt/success_message.ui (+32/-35) run-tests.bat (+1/-1) setup.py (+1/-0) ubuntu_sso/credentials.py (+7/-0) ubuntu_sso/main/glib.py (+4/-2) ubuntu_sso/main/qt.py (+5/-3) ubuntu_sso/networkstate/linux.py (+3/-1) ubuntu_sso/networkstate/tests/test_linux.py (+3/-3) ubuntu_sso/qt/__init__.py (+5/-0) ubuntu_sso/qt/arrow.py (+68/-0) ubuntu_sso/qt/current_user_sign_in_page.py (+32/-49) ubuntu_sso/qt/email_verification_page.py (+39/-39) ubuntu_sso/qt/enhanced_check_box.py (+1/-1) ubuntu_sso/qt/error_page.py (+11/-4) ubuntu_sso/qt/expander.py (+115/-0) ubuntu_sso/qt/forgotten_password_page.py (+43/-113) ubuntu_sso/qt/loadingoverlay.py (+7/-11) ubuntu_sso/qt/main.py (+5/-0) ubuntu_sso/qt/network_detection_page.py (+20/-9) ubuntu_sso/qt/proxy_dialog.py (+6/-6) ubuntu_sso/qt/reset_password_page.py (+31/-52) ubuntu_sso/qt/setup_account_page.py (+95/-106) ubuntu_sso/qt/sign_in_page.py (+0/-97) ubuntu_sso/qt/ssl_dialog.py (+161/-0) ubuntu_sso/qt/sso_wizard_page.py (+111/-33) ubuntu_sso/qt/success_page.py (+13/-4) ubuntu_sso/qt/tests/__init__.py (+160/-45) ubuntu_sso/qt/tests/test_arrow.py (+90/-0) ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+53/-143) ubuntu_sso/qt/tests/test_email_verification.py (+34/-90) ubuntu_sso/qt/tests/test_enchanced_line_edit.py (+2/-5) ubuntu_sso/qt/tests/test_error_page.py (+26/-0) ubuntu_sso/qt/tests/test_expander.py (+119/-0) ubuntu_sso/qt/tests/test_forgotten_password.py (+38/-181) ubuntu_sso/qt/tests/test_loadingoverlay.py (+8/-8) ubuntu_sso/qt/tests/test_network_detection.py (+14/-34) ubuntu_sso/qt/tests/test_reset_password.py (+25/-52) ubuntu_sso/qt/tests/test_setup_account.py (+55/-105) ubuntu_sso/qt/tests/test_sign_in_page.py (+0/-69) ubuntu_sso/qt/tests/test_ssl_dialog.py (+199/-0) ubuntu_sso/qt/tests/test_sso_wizard_page.py (+61/-97) ubuntu_sso/qt/tests/test_success_page.py (+26/-0) ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py (+91/-37) ubuntu_sso/qt/ubuntu_sso_wizard.py (+95/-191) ubuntu_sso/tests/test_credentials.py (+35/-6) ubuntu_sso/utils/runner/__init__.py (+7/-9) ubuntu_sso/utils/runner/tests/test_glib.py (+0/-1) ubuntu_sso/utils/runner/tests/test_qt.py (+0/-1) ubuntu_sso/utils/runner/tests/test_runner.py (+3/-2) ubuntu_sso/utils/ui.py (+64/-37) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.90 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Updating from trunk up to revno 901:
[ Diego Sarmentero <email address hidden> ]
- Hide the errors label on refresh captcha (LP: #947202).
- Changed the name of the function assigned to the lambda that is called
on passwordChanged signal from reset_password_page (LP: #945080).
- Made on_user_validated also emit stopProcessing so callers can hide
any processing overlay they are showing (LP: #945094).
- Fixed: Qt UI: there is a Back button in the "Enter verification page"
(LP: #944769).
- Fixed: Qt UI: there is not loading overvaly while validating an
email address (LP: #944767).
- Fixed: Qt UI: clicking on the "Set Up Account" button takes me
instantly to the verification page, even if there are form errors
(LP: #934502).
- Fix: [UIFe] Improve the display of errors in the Qt UI (LP: #938604).
- Fix: Qt UI: center when first opening (LP: #934173).
- Fixed: The header in the pages is above the overlay (LP: #934523).
- Fixed: [UIFE] The padding of the wizard pages in the Qt UI is not
correct (LP: #934519).
[ Manuel de la Pena <email address hidden> ]
- Ensure that the strings used in sso do not have "ubuntu one" in them
(LP: #933729).
- Ensure that the strings used are the ones provided by design
(LP: #937905).
- Added the dialog that will be used to show that a certificate has issues
(LP: #933729).
[ Natalia B. Bidart <email address hidden> ]
- Add proper titles and subtitles for the Login and Forgot password
pages (LP: #945061).
- Made UI modules to setup the gui logging logger (LP: #947469).
- Fallback to the GTK+ UI when the specified ui_executable does
not exist (LP: #939821).
- Move the 'choose sign in page' to client code (U1 control panel
in this case) (LP: #933576).
- Make use of the 'login_only' parameter that is being passed to the
UbuntuSSOWizard (LP: #939558).
- Stop using is_reactor_
- Do not mask ImportError by importing inside a function (LP: #939173).
- No more strings coming up from the Designer ui files (LP: #938626).
[ Roberto Alsina <email address hidden> ]
- Made the network detection code return ONLINE if NM is not available
(but still UNKNOWN if it's available and fails) (LP: #939703).
+1