messaging-app

Merge lp://staging/~tiagosh/messaging-app/grouped_threads into lp://staging/messaging-app

grouped_threads
Merge into trunk

Proposed by Tiago Salem Herrmann on 2015-09-17

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2015-10-09
Approved revision:	443
Merged at revision:	451
Proposed branch:	lp://staging/~tiagosh/messaging-app/grouped_threads
Merge into:	lp://staging/messaging-app
Prerequisite:	lp://staging/~tiagosh/messaging-app/updateFilters-binding
Diff against target:	207 lines (+59/-26) 6 files modified src/qml/MMSDelegate.qml (+4/-10) src/qml/MainPage.qml (+8/-3) src/qml/Messages.qml (+25/-3) src/qml/MessagesListView.qml (+1/-0) src/qml/ThreadDelegate.qml (+13/-1) src/qml/messaging-app.qml (+8/-9)
To merge this branch:	bzr merge lp://staging/~tiagosh/messaging-app/grouped_threads
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-09-17	Approve on 2015-10-09
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-06
Review via email: mp+271533@code.staging.launchpad.net

Commit message

Use groupedThreads role from the model to generate history event filters.

Description of the change

Use groupedThreads role from the model to generate history event filters.

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-09-17

431. By Tiago Salem Herrmann on 2015-09-17: Fix message search

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-17:

FAILED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/643/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23432

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/643/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-18:

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/644/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23439

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/644/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-09-18

432. By Tiago Salem Herrmann on 2015-09-18: Fix delete from header action

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-19:

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/645/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4262/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/158
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3473/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23490

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/645/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-09-23

433. By Tiago Salem Herrmann on 2015-09-23: revert back to use grouped model

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-23:

FAILED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/647/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/160
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4335
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23625

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/647/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-09-28

434. By Tiago Salem Herrmann on 2015-09-28: merge trunk
435. By Tiago Salem Herrmann on 2015-09-28: merge parent branch
436. By Tiago Salem Herrmann on 2015-09-28: fix empty header
437. By Tiago Salem Herrmann on 2015-09-28: use identifier only

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29:

FAILED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/651/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/164
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23720

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/651/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29:

FAILED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/652/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23728

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/652/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-09-29

438. By Tiago Salem Herrmann on 2015-09-29: add thread to filter if not there yet

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/653/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4420
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23777

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/653/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-10-01

439. By Tiago Salem Herrmann on 2015-10-01: Fix thread removal and messaging-menu acknowledgement
440. By Tiago Salem Herrmann on 2015-10-01: Use contact alias coming from history service

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/656/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/169
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23860

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/656/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/657/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/170
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4461
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4461/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23867

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/657/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~tiagosh/messaging-app/grouped_threads updated on 2015-10-02

441. By Tiago Salem Herrmann on 2015-10-02: check for unknown contacts
442. By Tiago Salem Herrmann on 2015-10-02: use same string as other components