Merge lp://qastaging/~online-accounts/ubuntu-system-settings-online-accounts/master into lp://qastaging/ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 182 |
| Proposed branch: | lp://qastaging/~online-accounts/ubuntu-system-settings-online-accounts/master |
| Merge into: | lp://qastaging/ubuntu-system-settings-online-accounts |
| Diff against target: |
461 lines (+150/-29) 16 files modified
click-hooks/main.cpp (+13/-0) client/OnlineAccountsClient/setup.cpp (+4/-1) client/OnlineAccountsClient/setup.h (+2/-1) debian/rules (+1/-0) online-accounts-ui/application-manager.cpp (+8/-0) online-accounts-ui/globals.h (+1/-0) online-accounts-ui/online-accounts-ui-helper.pro (+4/-0) online-accounts-ui/provider-request.cpp (+16/-2) online-accounts-ui/qml/ProviderRequest.qml (+1/-0) system-settings-plugin/NewAccountPage.qml (+3/-1) system-settings-plugin/NoAccountsPage.qml (+1/-6) system-settings-plugin/ProviderPluginList.qml (+5/-2) system-settings-plugin/ProvidersList.qml (+15/-9) tests/client/tst_client.cpp (+5/-5) tests/client/tst_qml_client.cpp (+2/-2) tests/online-accounts-ui/tst_application_manager.cpp (+69/-0) |
| To merge this branch: | bzr merge lp://qastaging/~online-accounts/ubuntu-system-settings-online-accounts/master |
| 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
- Don't go back to SystemSettings when creating the first account
- Keep listening to account model changes
- Set QML import path for click plugins
- Enable automatic orientation
Description of the change
- Don't go back to SystemSettings when creating the first account
- Keep listening to account model changes
- Set QML import path for click plugins
- Enable automatic orientation
To post a comment you must log in.
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
| 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
FAILED: Continuous integration, rev:172
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://