Merge lp://staging/~boiko/dialer-app/notify_conference_and_holding_errors into lp://staging/dialer-app
Status: | Merged |
---|---|
Approved by: | Tiago Salem Herrmann |
Approved revision: | 344 |
Merged at revision: | 343 |
Proposed branch: | lp://staging/~boiko/dialer-app/notify_conference_and_holding_errors |
Merge into: | lp://staging/dialer-app |
Diff against target: |
170 lines (+42/-36) 4 files modified
src/qml/Dialogs/NotificationDialog.qml (+11/-13) src/qml/LiveCallPage/LiveCall.qml (+22/-2) src/qml/LiveCallPage/MultiCallDisplay.qml (+1/-1) src/qml/dialer-app.qml (+8/-20) |
To merge this branch: | bzr merge lp://staging/~boiko/dialer-app/notify_conference_and_holding_errors |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tiago Salem Herrmann (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+247483@code.staging.launchpad.net |
Commit message
Notify error when trying to create conference calls and when changing the call hold status.
Description of the change
Notify error when trying to create conference calls and when changing the call hold status.
== Checklist ==
== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
https:/
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes
Did you successfully run all tests found in your component's Test Plan (https:/
Yes
If you changed the UI, was the change specified/approved by design?
Yes
If you changed UI labels, did you update the pot file?
Will update after the merge
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A
FAILED: Continuous integration, rev:344 jenkins. qa.ubuntu. com/job/ dialer- app-ci/ 505/ jenkins. qa.ubuntu. com/job/ dialer- app-vivid- i386-ci/ 15 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 968 jenkins. qa.ubuntu. com/job/ generic- mediumtests- vivid/438 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 858 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 966 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 966/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17405 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-vivid/ 358 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 530 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 530/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/dialer- app-ci/ 505/rebuild
http://