Merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/request-by-service into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | 283 |
| Merged at revision: | 290 |
| Proposed branch: | lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/request-by-service |
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts |
| Diff against target: |
1016 lines (+596/-25) 28 files modified
.bzrignore (+1/-0) .qmake.conf (+2/-0) client/OnlineAccountsClient/setup.cpp (+37/-2) client/OnlineAccountsClient/setup.h (+11/-0) client/module/module.pro (+3/-9) client/module/plugin.cpp (+1/-0) common-project-config.pri (+4/-2) common-vars.pri (+1/-1) coverage.pri (+0/-1) debian/changelog (+9/-0) online-accounts-service/request.cpp (+21/-1) online-accounts-ui/globals.h (+3/-0) online-accounts-ui/provider-request.cpp (+15/-1) online-accounts-ui/request.cpp (+2/-7) tests/client/tst_qml_client.cpp (+58/-1) tests/online-accounts-service/tst_service.pro (+2/-0) tests/online-accounts-service/tst_signonui_service.pro (+1/-0) tests/online-accounts-ui/ProviderRequest.qml (+28/-0) tests/online-accounts-ui/mock/application-manager-mock.cpp (+71/-0) tests/online-accounts-ui/mock/application-manager-mock.h (+61/-0) tests/online-accounts-ui/mock/request-mock.cpp (+13/-0) tests/online-accounts-ui/mock/request-mock.h (+1/-0) tests/online-accounts-ui/online-accounts-ui.pro (+1/-0) tests/online-accounts-ui/qml/qml.pro (+1/-0) tests/online-accounts-ui/qml/tst_online_accounts_qml.cpp (+2/-0) tests/online-accounts-ui/tst_provider_request.cpp (+190/-0) tests/online-accounts-ui/tst_provider_request.pro (+52/-0) tests/online-accounts-ui/tst_provider_request.qrc (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntu-system-settings-online-accounts/request-by-service |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Alexandre Abreu (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Create version 0.2 of the Ubuntu.
Add a new "serviceId" property to the Ubuntu.
Description of the change
Create version 0.2 of the Ubuntu.
Add a new "serviceId" property to the Ubuntu.
To post a comment you must log in.
Revision history for this message
| Alexandre Abreu (abreu-alexandre) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
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:
Approve
(continuous-integration)
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:
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
FAILED: Continuous integration, rev:277
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://