Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/uitk1.3 into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Pat McGowan | ||||||||
| Approved revision: | 301 | ||||||||
| Merged at revision: | 304 | ||||||||
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/uitk1.3 | ||||||||
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts | ||||||||
| Diff against target: |
533 lines (+70/-65) 25 files modified
client/OnlineAccountsClient/setup.cpp (+2/-2) client/examples/CreateFacebook.qml (+1/-1) debian/control (+1/-0) online-accounts-ui/qml/AccountCreationPage.qml (+2/-2) online-accounts-ui/qml/AuthorizationPage.qml (+3/-3) online-accounts-ui/qml/ProviderRequest.qml (+2/-3) online-accounts-ui/qml/SignOnUiDialog.qml (+3/-3) online-accounts-ui/qml/SignOnUiPage.qml (+2/-2) plugins/example/Main.qml (+2/-2) plugins/module/OAuth.qml (+3/-3) plugins/module/OAuthMain.qml (+2/-2) plugins/module/Options.qml (+4/-4) plugins/module/RemovalConfirmation.qml (+4/-4) plugins/module/ServiceItem.qml (+3/-3) plugins/module/ServiceSwitches.qml (+3/-3) plugins/module/WebView.qml (+1/-1) system-settings-plugin/AccountEditPage.qml (+2/-2) system-settings-plugin/AccountItem.qml (+3/-3) system-settings-plugin/AccountsPage.qml (+3/-3) system-settings-plugin/AddAccountLabel.qml (+3/-3) system-settings-plugin/MainPage.qml (+3/-3) system-settings-plugin/NewAccountPage.qml (+2/-2) system-settings-plugin/NoAccountsPage.qml (+3/-3) system-settings-plugin/ProviderPluginList.qml (+2/-2) system-settings-plugin/ProvidersList.qml (+11/-6) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/uitk1.3 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| David Barth (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Use version 1.3 of Ubuntu.Components
Description of the change
Use version 1.3 of Ubuntu.Components
To post a comment you must log in.
Revision history for this message
| David Barth (dbarth) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:299
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://