Merge lp://staging/~phablet-team/messaging-app/async_send_message into lp://staging/messaging-app

Proposed by Gustavo Pichorim Boiko
Status: Superseded
Proposed branch: lp://staging/~phablet-team/messaging-app/async_send_message
Merge into: lp://staging/messaging-app
Prerequisite: lp://staging/~phablet-team/messaging-app/group_chat_ui
Diff against target: 319 lines (+75/-92)
3 files modified
src/qml/Messages.qml (+33/-58)
tests/qml/tst_DualSim.qml (+30/-22)
tests/qml/tst_SingleSim.qml (+12/-12)
To merge this branch: bzr merge lp://staging/~phablet-team/messaging-app/async_send_message
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+296265@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-10-13.

Commit message

Use the new ChatEntry from telephony-service.

Description of the change

Use the new ChatEntry from telephony-service.

This MR needs the changes from:
lp:~phablet-team/telephony-service/async_send_message

To post a comment you must log in.
583. By Tiago Salem Herrmann

Fix qml tests

584. By Gustavo Pichorim Boiko

Try multiple times to find the messages view as in some cases it takes a bit longer to create.

585. By Gustavo Pichorim Boiko

Fix adding new threads to the filter.

586. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:586
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/659/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/659
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/622
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/622
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/622
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/614/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/614/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)
587. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:587
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/734/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/734
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/682
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/682
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/682
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/674/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/674/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)
588. By Tiago Salem Herrmann

merge parent branch

589. By Tiago Salem Herrmann

merge parent branch

590. By Tiago Salem Herrmann

merge parent branch

591. By Gustavo Pichorim Boiko

Update the title correctly.

592. By Gustavo Pichorim Boiko

Merge parent

593. By Gustavo Pichorim Boiko

Merge parent

594. By Tiago Salem Herrmann

merge parent branch

595. By Tiago Salem Herrmann

merge parent branch

596. By Tiago Salem Herrmann

merge parent branch

597. By Tiago Salem Herrmann

merge parent

598. By Tiago Salem Herrmann

merge parent branch

599. By Tiago Salem Herrmann

merge trunk

600. By Tiago Salem Herrmann

merge parent branch

601. By Tiago Salem Herrmann

merge parent branch

602. By Tiago Salem Herrmann

merge parent branch

603. By Tiago Salem Herrmann

merge parent branch

604. By Tiago Salem Herrmann

merge parent branch

Unmerged revisions

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: