Merge lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master into lp://staging/ubuntu-system-settings-online-accounts
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 220 |
| Proposed branch: | lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master |
| Merge into: | lp://staging/ubuntu-system-settings-online-accounts |
| Diff against target: |
2361 lines (+1245/-359) 37 files modified
.bzrignore (+1/-0) common-vars.pri (+1/-1) debian/changelog (+9/-0) online-accounts-service/libaccounts-service.cpp (+257/-0) online-accounts-service/libaccounts-service.h (+69/-0) online-accounts-service/main.cpp (+9/-0) online-accounts-service/online-accounts-service.pro (+7/-2) online-accounts-service/request-manager.cpp (+5/-3) online-accounts-service/request.cpp (+12/-32) online-accounts-service/request.h (+1/-0) online-accounts-service/signonui-service.cpp (+19/-2) online-accounts-service/ui-proxy.cpp (+116/-26) online-accounts-service/ui-proxy.h (+4/-0) online-accounts-service/utils.cpp (+57/-0) online-accounts-service/utils.h (+34/-0) online-accounts-ui/browser-request.cpp (+5/-4) online-accounts-ui/globals.h (+2/-0) online-accounts-ui/main.cpp (+17/-3) online-accounts-ui/online-accounts-ui.pro (+0/-2) online-accounts-ui/signonui-request.cpp (+17/-107) online-accounts-ui/signonui-request.h (+1/-0) plugins/module/OAuth.qml (+1/-0) plugins/module/ServiceItem.qml (+1/-2) plugins/plugins.pro (+2/-1) tests/online-accounts-service/mock/request-mock.cpp (+10/-0) tests/online-accounts-service/mock/request-mock.h (+2/-0) tests/online-accounts-service/online-accounts-service.pro (+1/-0) tests/online-accounts-service/tst_libaccounts_service.cpp (+522/-0) tests/online-accounts-service/tst_libaccounts_service.pro (+38/-0) tests/online-accounts-service/tst_service.pro (+2/-0) tests/online-accounts-service/tst_signonui_service.pro (+2/-0) tests/online-accounts-service/tst_ui_proxy.pro (+1/-0) tests/online-accounts-ui/mock/signonui-request-mock.cpp (+6/-0) tests/online-accounts-ui/mock/signonui-request-mock.h (+3/-0) tests/online-accounts-ui/tst_browser_request.cpp (+11/-3) tests/online-accounts-ui/tst_signonui_request.cpp (+0/-168) tests/online-accounts-ui/tst_signonui_request.pro (+0/-3) |
| To merge this branch: | bzr merge lp://staging/~online-accounts/ubuntu-system-settings-online-accounts/master |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream release
- Make sure app items are not overlaid on top of each other (LP: #1384314)
- Remove snap decision fallback
- Make account plugins confinable
Testing instructions for plugin confinement:
1) Install http://
2) copy http://
3) run
cd /var/lib/
sudo apparmor_parser -r \
click_
4) Then try creating an Evernote account; it shoudl succeed.
Some apparmor denials (probably from oxide/chromium) appear in the syslog, they'll need to be investigated.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:222
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://