Online Accounts setup for Ubuntu Touch

Merge lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master into lp://staging/ubuntu-system-settings-online-accounts

  1. master
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 234
Merged at revision: 242
Proposed branch: lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master
Merge into: lp://staging/ubuntu-system-settings-online-accounts
Diff against target: 1002 lines (+687/-31)
19 files modified
.bzrignore (+1/-0)
click-hooks/main.cpp (+28/-6)
debian/changelog (+10/-0)
online-accounts-service/mir-helper-stub.cpp (+9/-0)
online-accounts-service/mir-helper.h (+2/-0)
online-accounts-service/ui-proxy.cpp (+14/-16)
online-accounts-ui/browser-request.cpp (+2/-0)
online-accounts-ui/signonui-request.cpp (+9/-0)
system-settings-plugin/online-accounts.settings (+2/-6)
system-settings-plugin/plugin.cpp (+116/-0)
system-settings-plugin/plugin.h (+36/-0)
system-settings-plugin/system-settings-plugin.pro (+24/-1)
tests/click-hooks/click-hooks.pro (+5/-1)
tests/click-hooks/tst_online_accounts_hooks.cpp (+63/-0)
tests/online-accounts-service/tst_ui_proxy.cpp (+39/-0)
tests/online-accounts-service/tst_ui_proxy.pro (+1/-0)
tests/system-settings-plugin/system-settings-plugin.pro (+32/-0)
tests/system-settings-plugin/tst_plugin.cpp (+292/-0)
tests/tests.pro (+2/-1)
To merge this branch: bzr merge lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+250095@code.staging.launchpad.net

Commit message

Merge from upstream

- Add account data as search keywords (LP: #1373279)
- Delete accounts when their plugin is removed (LP: #1413542)
- More fixes for plugin confinement (LP: #1219644)
- Fail initialization if trust session cannot be setup (LP: #1420847)

Description of the change

Merge from upstream

- Add account data as search keywords (LP: #1373279)
- Delete accounts when their plugin is removed (LP: #1413542)
- More fixes for plugin confinement (LP: #1219644)
- Fail initialization if trust session cannot be setup (LP: #1420847)

To post a comment you must log in.
lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master updated
232. By Alberto Mardegan

From trunk

[ CI Train Bot ]
* Fix tests with Qt 5.4
[ Timo Jyrinki ]
* Use qt_gl_set_global_share_context with Qt 5.4 (LP: #1398372) (LP:
  #1398372)

233. By Alberto Mardegan

fix version

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/198/rebuild

review: Approve (continuous-integration)
lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master updated
234. By Alberto Mardegan

Disconnect from signal

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1479
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18264

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/199/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: