Merge lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.4 into lp://qastaging/ubuntu-sso-client/stable-3-0
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 825 |
Merged at revision: | 824 |
Proposed branch: | lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.4 |
Merge into: | lp://qastaging/ubuntu-sso-client/stable-3-0 |
Diff against target: |
18990 lines (+9079/-5903) 104 files modified
.bzrignore (+4/-11) bin/ubuntu-sso-login-gtk (+2/-1) bin/ubuntu-sso-login-qt (+32/-0) bin/ubuntu-sso-proxy-creds-qt (+33/-0) data/gtk/ui.glade (+314/-180) data/qt/choose_sign_in.ui (+105/-61) data/qt/loadingoverlay.ui (+103/-0) data/qt/network_detection.ui (+142/-0) data/qt/proxy_credentials_dialog.ui (+316/-0) data/qt/setup_account.ui (+640/-253) run-tests (+23/-19) setup.py (+29/-14) ubuntu_sso/__init__.py (+10/-6) ubuntu_sso/account.py (+95/-76) ubuntu_sso/constants.py.in (+28/-0) ubuntu_sso/credentials.py (+91/-203) ubuntu_sso/gtk/__init__.py (+1/-3) ubuntu_sso/gtk/gui.py (+134/-86) ubuntu_sso/gtk/main.py (+5/-25) ubuntu_sso/gtk/tests/__init__.py (+1/-3) ubuntu_sso/gtk/tests/test_gui.py (+110/-110) ubuntu_sso/gtk/tests/test_main.py (+39/-0) ubuntu_sso/keyring/__init__.py (+17/-9) ubuntu_sso/keyring/tests/test_common.py (+4/-5) ubuntu_sso/keyring/tests/test_linux.py (+1/-1) ubuntu_sso/logger.py (+22/-6) ubuntu_sso/main/__init__.py (+80/-67) ubuntu_sso/main/glib.py (+45/-0) ubuntu_sso/main/linux.py (+43/-38) ubuntu_sso/main/qt.py (+49/-0) ubuntu_sso/main/tests/__init__.py (+8/-3) ubuntu_sso/main/tests/test_clients.py (+8/-24) ubuntu_sso/main/tests/test_common.py (+274/-176) ubuntu_sso/main/windows.py (+21/-18) ubuntu_sso/qt/__init__.py (+59/-1) ubuntu_sso/qt/common.py (+7/-9) ubuntu_sso/qt/controllers.py (+0/-980) ubuntu_sso/qt/current_user_sign_in_page.py (+170/-0) ubuntu_sso/qt/email_verification_page.py (+140/-0) ubuntu_sso/qt/enhanced_check_box.py (+50/-0) ubuntu_sso/qt/error_page.py (+29/-0) ubuntu_sso/qt/forgotten_password_page.py (+182/-0) ubuntu_sso/qt/gui.py (+70/-397) ubuntu_sso/qt/loadingoverlay.py (+123/-0) ubuntu_sso/qt/main.py (+31/-0) ubuntu_sso/qt/network_detection_page.py (+79/-0) ubuntu_sso/qt/proxy_dialog.py (+155/-0) ubuntu_sso/qt/reset_password_page.py (+200/-0) ubuntu_sso/qt/setup_account_page.py (+524/-0) ubuntu_sso/qt/sign_in_page.py (+99/-0) ubuntu_sso/qt/success_page.py (+30/-0) ubuntu_sso/qt/tests/__init__.py (+294/-5) ubuntu_sso/qt/tests/login_u_p.py (+16/-5) ubuntu_sso/qt/tests/show_gui.py (+14/-13) ubuntu_sso/qt/tests/test_controllers.py (+0/-2113) ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+244/-0) ubuntu_sso/qt/tests/test_email_verification.py (+211/-0) ubuntu_sso/qt/tests/test_enchanced_line_edit.py (+3/-2) ubuntu_sso/qt/tests/test_enhanced_check_box.py (+49/-0) ubuntu_sso/qt/tests/test_forgotten_password.py (+239/-0) ubuntu_sso/qt/tests/test_loadingoverlay.py (+36/-0) ubuntu_sso/qt/tests/test_main.py (+42/-0) ubuntu_sso/qt/tests/test_network_detection.py (+95/-0) ubuntu_sso/qt/tests/test_proxy_dialog.py (+338/-0) ubuntu_sso/qt/tests/test_qt_views.py (+15/-101) ubuntu_sso/qt/tests/test_reset_password.py (+12/-6) ubuntu_sso/qt/tests/test_setup_account.py (+385/-0) ubuntu_sso/qt/tests/test_sign_in_page.py (+69/-0) ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py (+94/-0) ubuntu_sso/qt/ubuntu_sso_wizard.py (+367/-0) ubuntu_sso/qt/ui/__init__.py (+17/-0) ubuntu_sso/tests/__init__.py (+4/-4) ubuntu_sso/tests/bin/show_gui (+0/-58) ubuntu_sso/tests/bin/show_nm_state (+0/-41) ubuntu_sso/tests/test_account.py (+162/-134) ubuntu_sso/tests/test_credentials.py (+181/-401) ubuntu_sso/utils/__init__.py (+100/-4) ubuntu_sso/utils/ipc.py (+12/-6) ubuntu_sso/utils/runner/__init__.py (+99/-0) ubuntu_sso/utils/runner/glib.py (+76/-0) ubuntu_sso/utils/runner/qt.py (+71/-0) ubuntu_sso/utils/runner/tests/__init__.py (+17/-0) ubuntu_sso/utils/runner/tests/test_qt.py (+136/-0) ubuntu_sso/utils/runner/tests/test_runner.py (+81/-0) ubuntu_sso/utils/runner/tx.py (+93/-0) ubuntu_sso/utils/tcpactivation.py (+1/-3) ubuntu_sso/utils/tests/test_common.py (+209/-6) ubuntu_sso/utils/tests/test_ipc.py (+4/-3) ubuntu_sso/utils/tests/test_parse_args.py (+9/-18) ubuntu_sso/utils/tests/test_txsecrets.py (+3/-0) ubuntu_sso/utils/ui.py (+63/-38) ubuntu_sso/utils/webclient/__init__.py (+2/-4) ubuntu_sso/utils/webclient/common.py (+34/-7) ubuntu_sso/utils/webclient/gsettings.py (+19/-4) ubuntu_sso/utils/webclient/libsoup.py (+2/-1) ubuntu_sso/utils/webclient/qtnetwork.py (+5/-0) ubuntu_sso/utils/webclient/restful.py (+6/-1) ubuntu_sso/utils/webclient/tests/__init__.py (+60/-0) ubuntu_sso/utils/webclient/tests/test_gsettings.py (+108/-0) ubuntu_sso/utils/webclient/tests/test_restful.py (+16/-2) ubuntu_sso/utils/webclient/tests/test_timestamp.py (+16/-32) ubuntu_sso/utils/webclient/tests/test_webclient.py (+145/-94) ubuntu_sso/utils/webclient/timestamp.py (+16/-10) ubuntu_sso/utils/webclient/txweb.py (+12/-2) |
To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.4 |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Review via email: mp+93089@code.qastaging.launchpad.net |
Commit message
- Updating from trunk up to revno 874:
[ Alejandro J. Cura <email address hidden> ]
- Use parameters set in the url for the OAuth signature (LP: #927664).
- libsoup bindings need flattening to work around nul bytes in content
(LP: #921822).
- Replace urllib2.Request with common web-client (LP: #884972).
- Replace urllib2.urlopen with common web-client (LP: #884975).
- Fix tests failing in sso with test_webclient (LP: #920591).
[ Diego Sarmentero <email address hidden> ]
- Fixed: Qt UI: after clicking on "I've forgotten my password",
and entering an email, nothing happens (LP: #931577).
- Fixed: Qt UI must return ubuntu_
ubuntu_
- Fixed: Qt UI: congratulations page is empty (LP: #930720).
- Fixed: Qt UI: "I've forgotten my password" button can not be
clicked (LP: #930722)
- Fixed: Qt UI must return ubuntu_
ubuntu_
- Fixed: Qt UI: when calling login or validate_email,
should pass the ping_url (LP: #930724).
- Added signals for the different pages, letting the wizard decide
what to do in each case.
- Refactor the pages and controller in sso (LP: #929686).
- Migrate SSO Pages from the Wizard to SSO (LP: #925531).
[ Manuel de la Pena <email address hidden> ]
- Adds the code that will load the creds from the keyring when we retry.
- Adds the script that allows to launch the creds dialog.
Adds tests for main.
- Allows the creds dialog to store the credentials in the keyring
(LP: #929451).
- Adds the credentials dialog with nearly no functionality to the project
(LP: #916029).
- Adds support for username:
of the webclient.
[ Natalia B. Bidart <email address hidden> ]
- Proper name in setup.py for the proxy credentials executable
(LP: #932328).
- No more 'Congratulations, app_name has installed' message since
we're not installing (LP: #931574).
- Refactored logic on setup_account_
privacy links properly (LP: #931589).
- Unified UI parse_args and have them accepting a policy_url param
(LP: #931464).
- Make the UI runner use the absolute path to the UI executables
(LP: #930651).
- Allow callers pass a 'policy_url' parameter to use in the UIs
(LP: #930142).
- Execute the UI as a separated process from the sso main thread
(LP: #919330).
- Hold on to the Qprocess instance to avoid garbage collection
(LP: #930140).
- Move the ping method from the credentials module to the
UserManagement interface (LP: #929670).
- The Gtk UI must handle errors from dbus when calling the backend
(LP: #929820).
- Provide a helper to spawn programs from the main loop that is being
used by the SSO Service (LP: #920949).
- Install ui files consitently between Gtk and Qt (part of LP: #927994).
- Remove unused "thread_execute" function (LP: #928581).
- Delay twisted.
ReactorAlre
- Added a dedicated logger for the gui module.
- Migrated the GTK UI to use GI bindings (LP: #801111).
- Enabled libsoup backend for webclient so the GTK UI will work.
- Enabled the running of all the tests using the single command
./run-tests.
- Added an initial version of GLib and Qt mainloop integration
(needed to run all the tests).
- Provide a QT UI executable (LP: #925073).
- Add a method to obtain an OAuth signed uri.
[ Rodney Dawes <email address hidden> ]
- Connect the activate-link button by hand to avoid Gtk-WARNING messages.
+1