Merge lp:~mardy/ubuntu-system-settings-online-accounts/prompt-1544919 into lp:ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Approved by: | David Barth |
Approved revision: | 343 |
Merged at revision: | 335 |
Proposed branch: | lp:~mardy/ubuntu-system-settings-online-accounts/prompt-1544919 |
Merge into: | lp:ubuntu-system-settings-online-accounts |
Diff against target: |
251 lines (+130/-18) 6 files modified
online-accounts-ui/qml/AuthorizationPage.qml (+42/-2) plugins/OnlineAccountsPlugin/application-manager.cpp (+10/-0) plugins/module/ServiceItem.qml (+10/-12) plugins/module/ServiceItemBase.qml (+52/-0) plugins/module/module.pro (+1/-0) tests/online-accounts-ui/qml/tst_AuthorizationPage.qml (+15/-4) |
To merge this branch: | bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/prompt-1544919 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Online Accounts | Pending | ||
Review via email: mp+286021@code.launchpad.net |
Commit message
Update authorisation prompt
Show the application icon and package ID in the permission prompt, according to the design at https:/
Also, show the application package ID in the System Settings applet, under each application name.
Description of the change
Update authorisation prompt
Show the application icon and package ID in the permission prompt, according to the design at https:/
Also, show the application package ID in the System Settings applet, under each application name.
To post a comment you must log in.
FAILED: Continuous integration, rev:336 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- ci/274/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- wily-touch/ 984/console jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- wily-amd64- ci/62/console jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- wily-i386- ci/62/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- wily-armhf/ 984/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- online- accounts- ci/274/ rebuild
http://