lp:~mardy/ubuntu-system-settings-online-accounts/master

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-system-settings-online-accounts at revision 154

David Barth (community): Approve on 2014-07-28

PS Jenkins bot (community): Approve (continuous-integration) on 2014-07-02

Alexandre Abreu (community): Needs Information on 2014-06-04

Diff: 5466 lines (+3258/-754)

81 files modified

.bzrignore (+10/-8)
client/OnlineAccountsClient/OnlineAccountsClient.pro (+2/-2)
client/OnlineAccountsClient/setup.cpp (+3/-1)
common-project-config.pri (+3/-0)
debian/control (+1/-1)
debian/rules (+1/-0)
debian/ubuntu-system-settings-online-accounts.install (+1/-0)
online-accounts-service/com.ubuntu.OnlineAccountsUi.service.in (+1/-1)
online-accounts-service/main.cpp (+109/-0)
online-accounts-service/mir-helper-stub.cpp (+69/-0)
online-accounts-service/mir-helper.cpp (+192/-0)
online-accounts-service/mir-helper.h (+68/-0)
online-accounts-service/online-accounts-service.pro (+82/-0)
online-accounts-service/request-manager.cpp (+42/-6)
online-accounts-service/request-manager.h (+3/-1)
online-accounts-service/request.cpp (+214/-0)
online-accounts-service/request.h (+70/-0)
online-accounts-service/service.cpp (+3/-11)
online-accounts-service/signonui-service.cpp (+19/-33)
online-accounts-service/ui-proxy.cpp (+301/-0)
online-accounts-service/ui-proxy.h (+54/-0)
online-accounts-ui/application-manager.cpp (+10/-0)
online-accounts-ui/browser-request.cpp (+12/-24)
online-accounts-ui/browser-request.h (+2/-4)
online-accounts-ui/globals.h (+1/-0)
online-accounts-ui/ipc.cpp (+184/-0)
online-accounts-ui/ipc.h (+67/-0)
online-accounts-ui/main.cpp (+18/-68)
online-accounts-ui/module/OAuth.qml (+0/-1)
online-accounts-ui/module/WebView.qml (+1/-2)
online-accounts-ui/module/qmldir.in (+2/-0)
online-accounts-ui/notification.cpp (+8/-0)
online-accounts-ui/notification.h (+1/-0)
online-accounts-ui/online-accounts-ui-helper.pro (+5/-37)
online-accounts-ui/online-accounts-ui.pro (+1/-1)
online-accounts-ui/panel-request.cpp (+6/-7)
online-accounts-ui/panel-request.h (+4/-3)
online-accounts-ui/provider-request.cpp (+4/-3)
online-accounts-ui/provider-request.h (+3/-2)
online-accounts-ui/qml/ProviderRequest.qml (+12/-5)
online-accounts-ui/qml/SignOnUiPage.qml (+40/-0)
online-accounts-ui/request-handler.cpp (+6/-0)
online-accounts-ui/request.cpp (+65/-52)
online-accounts-ui/request.h (+12/-6)
online-accounts-ui/signonui-request.cpp (+114/-56)
online-accounts-ui/signonui-request.h (+6/-6)
online-accounts-ui/ui-server.cpp (+199/-0)
online-accounts-ui/ui-server.h (+57/-0)
online-accounts-ui/ui.qrc (+1/-10)
system-settings-plugin/AccountEditPage.qml (+4/-20)
system-settings-plugin/MainPage.qml (+29/-45)
system-settings-plugin/NewAccountPage.qml (+0/-2)
system-settings-plugin/ProviderPluginList.qml (+16/-12)
system-settings-plugin/online-accounts.settings (+1/-1)
system-settings-plugin/plugin.cpp (+0/-89)
system-settings-plugin/plugin.h (+0/-38)
system-settings-plugin/system-settings-plugin.pro (+16/-29)
tests/client/tst_client.cpp (+1/-1)
tests/client/tst_qml_client.cpp (+1/-1)
tests/online-accounts-service/online-accounts-service.pro (+4/-0)
tests/online-accounts-service/tst_inactivity_timer.pro (+7/-3)
tests/online-accounts-service/tst_service.cpp (+128/-104)
tests/online-accounts-service/tst_service.pro (+14/-11)
tests/online-accounts-ui/data/com.ubuntu.tests_application.application (+19/-0)
tests/online-accounts-ui/mock/notification-mock.cpp (+81/-0)
tests/online-accounts-ui/mock/notification-mock.h (+66/-0)
tests/online-accounts-ui/mock/request-mock.cpp (+139/-0)
tests/online-accounts-ui/mock/request-mock.h (+61/-0)
tests/online-accounts-ui/mock/ui-server-mock.cpp (+68/-0)
tests/online-accounts-ui/mock/ui-server-mock.h (+53/-0)
tests/online-accounts-ui/online-accounts-ui.pri (+18/-0)
tests/online-accounts-ui/online-accounts-ui.pro (+1/-2)
tests/online-accounts-ui/qml/Source/qmldir (+1/-1)
tests/online-accounts-ui/tst_access_model.pro (+8/-15)
tests/online-accounts-ui/tst_application_manager.pro (+8/-15)
tests/online-accounts-ui/tst_notification.cpp (+33/-0)
tests/online-accounts-ui/tst_notification.pro (+3/-11)
tests/online-accounts-ui/tst_signonui_request.cpp (+336/-0)
tests/online-accounts-ui/tst_signonui_request.pro (+48/-0)
tests/tests.pro (+1/-0)
ubuntu-system-settings-online-accounts.pro (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1346950: Failure to present app authorization UI window

Critical

Fix Released

Link a bug report

Related blueprints

135. By Alberto Mardegan on 2014-08-18

Make the Mir dependency optional

Mir is not yet available for all architectures.

Merged branch lp:~mardy/ubuntu-system-settings-online-accounts/optional-mir

134. By Alberto Mardegan on 2014-08-18

Avoid clicking multiple times

133. By Alberto Mardegan on 2014-08-14

Support Mir prompt sessions

Merged branch lp:~mardy/ubuntu-system-settings-online-accounts/trust-sessions

132. By Alberto Mardegan on 2014-08-14

This branch moves the OA settings back into the main settings application, as an inline plugin. This should help with the overall UX, and in particular some annoying bugs ("black window", etc.)

The functional scope covers:
- listing online accounts
- changing apps permissions for an account
- adding a new online account
- removing an online account

The branch has currently some limitations:
- only support OAuth providers
- the system-widw OAuth provider path is hardcoded
- doesn't support providers installed in the home directory

The limitations should be easy to lift once the general logic is reviewed.

Merged branch lp:~dbarth/ubuntu-system-settings-online-accounts/inline-plugin

131. By Alberto Mardegan on 2014-08-13

Move the UI into a separate process

Introduce online-accounts-service as a UI-less DBus service which acts as a
dispatcher for authentication and authorization requests; the requests
themselves are processed by a subprocess, online-accounts-ui, of which multiple
instances can exists (each instance having single window).

This is the first step towards implementing trust session support.

Merged branch lp:~mardy/ubuntu-system-settings-online-accounts/headless-service

130. By Alberto Mardegan on 2014-08-08

From trunk

* Add forgotten test-dep on ubuntu-ui-toolkit-autopilot.
[ Leo Arias ]
* Refactored the autopilot tests to use the page object pattern. Added
  the method go to add account to be used in UX tests.
[ Michał Sawicz ]
* New icon from suru theme.

129. By Alberto Mardegan on 2014-07-02

Implement account reauthentication and reauthorization

The need for a user interaction might arise at any time, depending on the remote service's policy. It will typically happen when an access token expires, or when an application requests new permissions or changes its key.
In order not to disrupt the user's activity, we preliminary implement this as a snap decision (as was suggested in https://docs.google.com/a/canonical.com/document/d/1puQ9Z0yKqzsQ1VQ1OOBkxgp78iWGnAhAkFXWJFTWIrE/edit#heading=h.topn0ejru38u). However, since design has not yet come up with a definitive approach, we keep the UI strings untranslated since they are not final.

Merged branch lp:~mardy/ubuntu-system-settings-online-accounts/snap-decisions

128. By Alberto Mardegan on 2014-07-02

Merge from trunk

127. By Alberto Mardegan on 2014-06-13

Remove signon-ui provides

126. By Alberto Mardegan on 2014-06-12

Add ApplicationManager::applicationFromProfile()

Merged branch lp:~mardy/ubuntu-system-settings-online-accounts/app-from-profile