Merge lp:~mardy/ubuntu-system-settings-online-accounts/cancel-button into lp:ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 57 |
Merged at revision: | 57 |
Proposed branch: | lp:~mardy/ubuntu-system-settings-online-accounts/cancel-button |
Merge into: | lp:ubuntu-system-settings-online-accounts |
Diff against target: |
100 lines (+52/-3) 5 files modified
debian/ubuntu-system-settings-online-accounts.install (+1/-0) src/module/OAuth.qml (+8/-2) src/signon-ui/Page.qml (+28/-0) src/signon-ui/signon-ui.pro (+13/-0) src/src.pro (+2/-1) |
To merge this branch: | bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/cancel-button |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+189846@code.launchpad.net |
Commit message
Add a Cancel button to the OAuth authentication pages
Use signon-ui's new X-PageComponent key to specify a QML page to be used.
Description of the change
Add a Cancel button to the OAuth authentication pages
Use signon-ui's new X-PageComponent key to specify a QML page to be used.
To post a comment you must log in.
PASSED: Continuous integration, rev:57 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- ci/45/ jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- saucy-amd64- ci/45
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/ubuntu- system- settings- online- accounts- ci/45/rebuild
http://